@@ -2,18 +2,19 @@ import 'package:flutter/material.dart';
22import 'package:flutter_github_connect/helper/GIcons.dart' ;
33import 'package:flutter_github_connect/helper/shared_prefrence_helper.dart' ;
44import 'package:flutter_github_connect/ui/page/common/under_development.dart' ;
5+ import 'package:flutter_github_connect/ui/page/settings/about_us.dart' ;
56import 'package:flutter_github_connect/ui/page/splash.dart' ;
67import 'package:flutter_github_connect/ui/theme/custom_theme.dart' ;
78import 'package:flutter_github_connect/ui/theme/export_theme.dart' ;
9+ import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart' ;
810import 'package:flutter_github_connect/ui/widgets/g_card.dart' ;
911import 'package:get_it/get_it.dart' ;
1012
1113class SettingsPage extends StatelessWidget {
12- final GlobalKey <ScaffoldState > scaffoldKey = GlobalKey <ScaffoldState >();
14+ final GlobalKey <ScaffoldState > scaffoldKey = GlobalKey <ScaffoldState >();
1315 SettingsPage ({Key key}) : super (key: key);
1416 Widget _getUtilRos (context, String text,
1517 {Function onPressed,
16- Color color,
1718 IconData icon = GIcons .chevron_right_24,
1819 String selectedText = "" }) {
1920 return Row (
@@ -48,21 +49,22 @@ class SettingsPage extends StatelessWidget {
4849 child: Column (
4950 crossAxisAlignment: CrossAxisAlignment .start,
5051 children: < Widget > [
51- _getUtilRos (context, "Appearence" ,
52- color: GColors .green, selectedText: CustomTheme .instanceOf (context).isDarkMode ? "Dark Mode" : "Light Mode" , onPressed: () {
53- _changeTheme (
54- context,
55- CustomTheme .instanceOf (context).toggle);
52+ _getUtilRos (context, "About us" , onPressed: () {
53+ Navigator .push (
54+ context, MaterialPageRoute (builder: (_) => AboutUsPage ()));
5655 }),
5756 Divider (height: 0 ),
58- _getUtilRos (context, "App Icon" ,
59- color: GColors .blue, selectedText: " " ),
57+ _getUtilRos (context, "Share App" , selectedText: " " ),
58+ Divider (height: 0 ),
59+ _getUtilRos (context, "Appearence" ,
60+ selectedText: CustomTheme .instanceOf (context).isDarkMode
61+ ? "Dark Mode"
62+ : "Light Mode" , onPressed: () {
63+ _changeTheme (context, CustomTheme .instanceOf (context).toggle);
64+ }),
6065 Divider (height: 0 ),
6166 _getUtilRos (context, "Push Notifications" ,
62- color: GColors .purple,
6367 selectedText: "Direct mention" ),
64- Divider (height: 0 ),
65- _getUtilRos (context, "Swipe Options" , color: GColors .orange),
6668 ],
6769 ),
6870 );
@@ -77,7 +79,6 @@ class SettingsPage extends StatelessWidget {
7779 _getUtilRos (
7880 context,
7981 "Share Feedback" ,
80- color: GColors .green,
8182 icon: GIcons .pencil_24,
8283 ),
8384 ],
@@ -91,9 +92,9 @@ class SettingsPage extends StatelessWidget {
9192 child: Column (
9293 crossAxisAlignment: CrossAxisAlignment .start,
9394 children: < Widget > [
94- _getUtilRos (context, "Privacy Policy" , color : GColors .green ),
95+ _getUtilRos (context, "Privacy Policy" ),
9596 Divider (height: 0 ),
96- _getUtilRos (context, "Terms of Service" , color : GColors .blue ),
97+ _getUtilRos (context, "Terms of Service" ),
9798 ],
9899 ),
99100 );
@@ -105,8 +106,7 @@ class SettingsPage extends StatelessWidget {
105106 child: Column (
106107 crossAxisAlignment: CrossAxisAlignment .start,
107108 children: < Widget > [
108- _getUtilRos (context, "Sign out" , color: GColors .green, icon: null ,
109- onPressed: () {
109+ _getUtilRos (context, "Sign out" , icon: null , onPressed: () {
110110 /// [Todo] Temprary workaround for logout
111111 final getIt = GetIt .instance;
112112 final prefs = getIt <SharedPrefrenceHelper >();
@@ -134,7 +134,9 @@ class SettingsPage extends StatelessWidget {
134134 backgroundColor: Theme .of (context).backgroundColor,
135135 appBar: AppBar (
136136 elevation: 0 ,
137- title: Text ("Settings" ),
137+ title: GAppBarTitle (
138+ title: "Settings" ,
139+ ),
138140 backgroundColor: Theme .of (context).colorScheme.surface,
139141 ),
140142 body: Container (
0 commit comments