SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back button UserGuide,and open project bux fix

Browse Source
This commit is contained in:
Kalonkarthik 2025-02-14 16:14:22 +05:30
parent dafc089ae9
commit 21c4525db3
26 changed files with 1082 additions and 1005 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/icons/uae_numbers/share.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.9999 4V8C6.42494 9.028 3.97994 14.788 2.99994 20C2.96294 20.206 8.38394 14.038 12.9999 14V18L20.9999 11L12.9999 4Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 313 B

7
lib/infrastructure/services/img_asset_paths/icons/uae_numbers_asset_path.dart
View File

@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
abstract class UaeNumbersAssetPath { abstract class UaeNumbersAssetPath {
static const _basePath = 'assets/icons/uae_numbers'; static const _basePath = 'assets/icons/uae_numbers';
static const bookmarksUae = '$_basePath/bookmarks.png'; // static const bookmarksUae = '$_basePath/bookmarks.png';
static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png'; // static const bookmarksSelectedUae = '$_basePath/bookmarksSelectedUae.png';
static const shareUae = '$_basePath/share.png'; // static const shareUae = '$_basePath/share.png';
static const share = '$_basePath/share.svg';
static const filterUae = '$_basePath/filters.png'; static const filterUae = '$_basePath/filters.png';
} }

2
lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart
View File

@ -288,7 +288,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
final encodedTitle = Uri.encodeComponent(title); final encodedTitle = Uri.encodeComponent(title);
// Pass mainTopic and title as query parameters // Pass mainTopic and title as query parameters
context.go( context.push(
'/chartScreen/$data_set?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle'); '/chartScreen/$data_set?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle');
// context.go('/chartScreen/$data_set'); // context.go('/chartScreen/$data_set');
}, },

40
lib/presentation/Screens/auth_verification/create_new_pw.dart
View File

@ -14,7 +14,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import '../../../config/my_theme.dart'; import '../../../config/my_theme.dart';
class CreateNewPw extends StatefulWidget { class CreateNewPw extends ConsumerStatefulWidget {
final String userId; final String userId;
final String email; final String email;
final String? keyParam; final String? keyParam;
@ -22,10 +22,10 @@ class CreateNewPw extends StatefulWidget {
const CreateNewPw({Key? key, required this.userId, required this.email, required this.keyParam}); const CreateNewPw({Key? key, required this.userId, required this.email, required this.keyParam});
@override @override
State<CreateNewPw> createState() => _CreateNewPwState(); ConsumerState<CreateNewPw> createState() => _CreateNewPwState();
} }
class _CreateNewPwState extends State<CreateNewPw> { class _CreateNewPwState extends ConsumerState<CreateNewPw> {
final _pb = PocketBase('https://pb.venbait.in'); final _pb = PocketBase('https://pb.venbait.in');
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
bool _obscureOldPassword = true; bool _obscureOldPassword = true;
@ -188,9 +188,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext contextx) {
double screenHeight = MediaQuery.of(context).size.height; double screenHeight = MediaQuery.of(context).size.height;
double screenWidth = MediaQuery.of(context).size.width; double screenWidth = MediaQuery.of(context).size.width;
final passwordLocale = ref.watch(localeProvider);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -198,13 +199,14 @@ class _CreateNewPwState extends State<CreateNewPw> {
child: SafeArea( child: SafeArea(
child: _isPasswordUpdated child: _isPasswordUpdated
? _buildSuccessContent(screenHeight, screenWidth) ? _buildSuccessContent(screenHeight, screenWidth)
: _buildPasswordForm(screenHeight, screenWidth), : _buildPasswordForm(ref,screenHeight, screenWidth),
), ),
), ),
); );
} }
Widget _buildPasswordForm(double screenHeight, double screenWidth) { Widget _buildPasswordForm(WidgetRef ref ,double screenHeight, double screenWidth) {
final passwordLocale = ref.watch(localeProvider);
return Form( return Form(
key: _formKey, key: _formKey,
child: Padding( child: Padding(
@ -231,7 +233,7 @@ class _CreateNewPwState extends State<CreateNewPw> {
child: Icon( child: Icon(
// Icons.close, // Icons.close,
Icons.arrow_back_ios, Icons.arrow_back_ios,
size: 28, // Icon size size: 24, // Icon size
color: Colors.black, // Icon color color: Colors.black, // Icon color
), ),
), ),
@ -259,7 +261,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
// "Create New Password", // "Create New Password",
AppLocalizations.of(context)!.create_new_password, AppLocalizations.of(context)!.create_new_password,
style: TextStyle( style: TextStyle(
fontSize: 26, fontSize: passwordLocale?.languageCode ==
'ar'
? 24
:26,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
), ),
), ),
@ -269,12 +274,18 @@ class _CreateNewPwState extends State<CreateNewPw> {
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: 'Your New Password Must Be Different\n', text: context.translate('Your New Password Must Be Different\n','يجب أن تكون كلمة المرور الجديدة مختلفة\n',),
style: TextStyle(fontSize: 15,fontWeight: FontWeight.w700, color: Color(0xFF898C81)), style: TextStyle(fontSize: passwordLocale?.languageCode ==
'ar'
? 14
:15,fontWeight: FontWeight.w700, color: Color(0xFF898C81)),
), ),
TextSpan( TextSpan(
text: 'from Previously Used Password', text: context.translate('from Previously Used Password','عن كلمة المرور المستخدمة سابقًا'),
style: TextStyle(fontSize: 15, color: Color(0xFF898C81), fontWeight: FontWeight.w700), style: TextStyle(fontSize: passwordLocale?.languageCode ==
'ar'
? 14
:15, color: Color(0xFF898C81), fontWeight: FontWeight.w700),
), ),
], ],
), ),
@ -590,7 +601,10 @@ class _CreateNewPwState extends State<CreateNewPw> {
children: [ children: [
Text( Text(
AppLocalizations.of(context)!.save, AppLocalizations.of(context)!.save,
style: TextStyle(fontSize: 18, color: Colors.white), style: TextStyle(fontSize: passwordLocale?.languageCode ==
'ar'
? 14
:18, color: Colors.white),
), ),
SizedBox(width: 2), SizedBox(width: 2),
Icon( Icon(

1
lib/presentation/Screens/auth_verification/privacy_policy.dart
View File

@ -17,6 +17,7 @@ class PrivacyPolicy extends StatelessWidget {
), ),
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
scrolledUnderElevation: 0,
title:Text(context.translate( title:Text(context.translate(
'Privacy Policy', 'Privacy Policy',
'الشروط والأحكام', 'الشروط والأحكام',

31
lib/presentation/Screens/auth_verification/registration.dart
View File

@ -118,7 +118,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
String? _validateUsername(String? value) { String? _validateUsername(String? value) {
if (value == null || value.isEmpty) { if (value == null || value.isEmpty) {
return 'Required'; return context.translate('Required', 'مطلوب');
} else if (value.length > 40) { } else if (value.length > 40) {
return 'Must not exceed 40 characters'; return 'Must not exceed 40 characters';
} else if (!RegExp(r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF]+$") } else if (!RegExp(r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF]+$")
@ -136,7 +136,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
r'^[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+@[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+\.[a-zA-Z]{2,}$'; r'^[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+@[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+\.[a-zA-Z]{2,}$';
if (value == null || value.isEmpty) { if (value == null || value.isEmpty) {
return 'Required'; return context.translate('Required', 'مطلوب');
} else if (!RegExp(emailRegex).hasMatch(value)) { } else if (!RegExp(emailRegex).hasMatch(value)) {
return 'Invalid Email'; return 'Invalid Email';
} }
@ -155,7 +155,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
final hasSpecialCharacter = RegExp(r'[~!@#$%^&*()_+=[\]{}|;:,.<>?/-]'); final hasSpecialCharacter = RegExp(r'[~!@#$%^&*()_+=[\]{}|;:,.<>?/-]');
if (value == null || value.isEmpty) { if (value == null || value.isEmpty) {
return 'Required'; return context.translate('Required', 'مطلوب');
} else if (value.length < 8) { } else if (value.length < 8) {
return 'Password must be at least 8characters'; return 'Password must be at least 8characters';
} }
@ -201,7 +201,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
r'^[A-Za-z0-9~!@#$%^&*()_+=[\]{}|;:,.<>?/-àèìòùáéíóúÀÈÌÒÙÁÉÍÓÚ]*$'); r'^[A-Za-z0-9~!@#$%^&*()_+=[\]{}|;:,.<>?/-àèìòùáéíóúÀÈÌÒÙÁÉÍÓÚ]*$');
if (value == null || value.isEmpty) { if (value == null || value.isEmpty) {
return 'Required'; return context.translate('Required', 'مطلوب');
} else if (value.length < 8 || value.length > 40) { } else if (value.length < 8 || value.length > 40) {
return 'Password must be at least 8characters'; return 'Password must be at least 8characters';
} else if (!regex.hasMatch(value)) { } else if (!regex.hasMatch(value)) {
@ -359,7 +359,8 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
child: SafeArea( child: SafeArea(
child: Scaffold( child: Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Column( body: SingleChildScrollView(
child: Column(
children: [ children: [
Align( Align(
alignment: AlignmentDirectional.topEnd, alignment: AlignmentDirectional.topEnd,
@ -382,10 +383,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
), ),
), ),
), ),
Container( Column(children: [
height: MediaQuery.of(context).size.height / 1.2,
child: SingleChildScrollView(
child: Column(children: [
registrationSuccess registrationSuccess
? Padding( ? Padding(
padding: const EdgeInsets.all(20.0), padding: const EdgeInsets.all(20.0),
@ -989,11 +987,11 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
Expanded( Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
top: 13.0), top: 14.0,),
child: Text.rich( child: Text.rich(
TextSpan( TextSpan(
text: AppLocalizations.of( text: AppLocalizations.of(
context)! context,)!
.agree, .agree,
// text: 'I agree to ', // text: 'I agree to ',
style: TextStyle( style: TextStyle(
@ -1103,10 +1101,10 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
right: registerLocale right: registerLocale
?.languageCode == ?.languageCode ==
'ar' 'ar'
? 30 ? 40
: 0.0,), : 0.0,),
child: Text( child: Text(
'Required', context.translate('Required', 'مطلوب'),
style: TextStyle( style: TextStyle(
color: Color(0xFFb22222), color: Color(0xFFb22222),
fontSize: registerLocale fontSize: registerLocale
@ -1245,12 +1243,15 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
), ),
), ),
]), ]),
), // Container(
), // height: MediaQuery.of(context).size.height / 1.2,
// child:
// ),
], ],
), ),
), ),
), ),
),
); );
} }
} }

1
lib/presentation/Screens/auth_verification/terms&conditions.dart
View File

@ -17,6 +17,7 @@ class TermsOfUse extends StatelessWidget {
), ),
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
scrolledUnderElevation: 0,
title:Text(context.translate( title:Text(context.translate(
'Terms & Conditions', 'Terms & Conditions',
'الشروط والأحكام', 'الشروط والأحكام',

46
lib/presentation/Screens/charts/screens/chart_screen.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:pocketbase/pocketbase.dart'; import 'package:pocketbase/pocketbase.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -2038,16 +2039,17 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
// color: Colors.white), // color: Colors.white),
// ), // ),
// const SizedBox(width: 5), // const SizedBox(width: 5),
Image.asset( // Image.asset(
isBookmarked // isBookmarked
? UaeNumbersAssetPath // ? UaeNumbersAssetPath
.bookmarksSelectedUae // Filled bookmark image // .bookmarksSelectedUae // Filled bookmark image
: UaeNumbersAssetPath // : UaeNumbersAssetPath
.bookmarksUae, // Default bookmark image // .bookmarksUae, // Default bookmark image
// color: Colors.white, // // color: Colors.white,
width: 24, // width: 24,
height: 24, // height: 24,
), // ),
Icon(Icons.bookmarks_rounded, color:isBookmarked ? Colors.black:Colors.white ,),
], ],
), ),
), ),
@ -2069,15 +2071,21 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
SizedBox(width: 5), SizedBox(width: 5),
Stack( Stack(
children: [ children: [
Image.asset( // Image.asset(
UaeNumbersAssetPath.shareUae, // UaeNumbersAssetPath.shareUae,
color: Colors.white, // Outline color // color: Colors.white, // Outline color
width: 24, // Slightly larger // width: 24, // Slightly larger
height: 24, // height: 24,
), // ),
Image.asset( // Image.asset(
UaeNumbersAssetPath.shareUae, // UaeNumbersAssetPath.shareUae,
color: Colors.white, // color: Colors.white,
// width: 24,
// height: 24,
// ),
SvgPicture.asset(
UaeNumbersAssetPath.share,
semanticsLabel: 'share',
width: 24, width: 24,
height: 24, height: 24,
), ),

121
lib/presentation/Screens/profilepage.dart
View File

@ -5,6 +5,7 @@ import 'package:external_repos/external_repos.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
@ -15,6 +16,8 @@ import 'package:uae_stat/config/my_theme.dart';
import 'package:uae_stat/domain/use_cases/language.dart'; import 'package:uae_stat/domain/use_cases/language.dart';
import 'package:uae_stat/infrastructure/data/p_auth_repo.dart'; import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart'; import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/components/my_toggle.dart';
import 'package:uae_stat/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart'; import 'package:uae_stat/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -22,15 +25,15 @@ import '../components/my_bottom_nav_bar.dart';
import 'auth_verification/changepassword.dart'; import 'auth_verification/changepassword.dart';
import 'demo_home.dart'; import 'demo_home.dart';
class ProfileScreen extends StatefulWidget { class ProfileScreen extends ConsumerStatefulWidget {
final String userId; // Add this field to hold the user ID final String userId; // Add this field to hold the user ID
const ProfileScreen({Key? key, required this.userId}) : super(key: key); const ProfileScreen({Key? key, required this.userId}) : super(key: key);
@override @override
State<ProfileScreen> createState() => _ProfileScreenState(); ConsumerState<ProfileScreen> createState() => _ProfileScreenState();
} }
class _ProfileScreenState extends State<ProfileScreen> { class _ProfileScreenState extends ConsumerState<ProfileScreen> {
final _pb = PocketBase('https://pb.venbait.in'); final _pb = PocketBase('https://pb.venbait.in');
// final _pb = PocketBase('http://127.0.0.1:8090'); // final _pb = PocketBase('http://127.0.0.1:8090');
@ -461,6 +464,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
}, },
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
scrolledUnderElevation: 0,
backgroundColor: Colors.white, backgroundColor: Colors.white,
elevation: 0, elevation: 0,
leading: IconButton( leading: IconButton(
@ -473,6 +477,23 @@ class _ProfileScreenState extends State<ProfileScreen> {
AppLocalizations.of(context)!.my_profile, AppLocalizations.of(context)!.my_profile,
style: TextStyle(color: Color(0xFF985400)), style: TextStyle(color: Color(0xFF985400)),
), ),
actions: [
Consumer(
builder: (context, ref, _) {
final locale = ref.watch(localeProvider); // Current locale
return MyToggle(
isOn: locale?.languageCode == 'en',
knobTextWhenOn: 'ع',
knobTextWhenOff: 'EN',
pathColorWhenOn: Colors.grey.shade300,
pathColorWhenOff: Colors.grey.shade300,
onTap: () {
ref.read(localeProvider.notifier).toggleLocale();
},
);
},
),
],
// actions: [ // actions: [
// TextButton( // TextButton(
// onPressed: () { // onPressed: () {
@ -788,74 +809,86 @@ class _ProfileScreenState extends State<ProfileScreen> {
), ),
), ),
Expanded( Expanded(
child: Column( child: Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: const EdgeInsets.only(
crossAxisAlignment: CrossAxisAlignment.start, top: 14.0,),
children: [ child: Text.rich(
SizedBox(
height: 10,
),
Text.rich(
TextSpan( TextSpan(
text: AppLocalizations.of(context)!.agree, text: AppLocalizations.of(
style: TextStyle(color: Color(0xFF898C81)), context)!
.agree,
// text: 'I agree to ',
style: TextStyle(
fontWeight: FontWeight.w500,
fontSize: 14,
color: Color(
0xFF898C81,), // Change to your desired color
),
children: [ children: [
TextSpan( TextSpan(
recognizer:TapGestureRecognizer() recognizer:TapGestureRecognizer()
..onTap = () => context.push('/terms&conditions'), ..onTap = () => context.push('/terms&conditions'),
text: AppLocalizations.of( text: AppLocalizations.of(
context, context)!
)!
.terms_conditions, .terms_conditions,
// text: 'Terms & Conditions',
style: TextStyle( style: TextStyle(
color: Color(0xFF985400), fontSize: 14,
// decoration: TextDecoration.underline, fontWeight:
fontWeight: FontWeight FontWeight.bold,
.w600, // Makes the text bold color:
decorationColor: Color(0xFF985400), Color(0xFF985400),
decorationThickness: 1, // Makes the text bold
), // decoration:
// TextDecoration.underline,
decorationColor:
Color(0xFF985400),
decorationThickness:
1),
), ),
TextSpan( TextSpan(
text: AppLocalizations.of( text: AppLocalizations.of(
context, context)!
)!
.t_and, .t_and,
style: TextStyle(color: Color(0xFF898C81)), style: TextStyle(
color: Color(
0xFF898C81), // Change to your desired color
),
), ),
TextSpan( TextSpan(
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () => context.push('/privacy_policy'), ..onTap = () => context.push('/privacy_policy'),
text: AppLocalizations.of( text: AppLocalizations.of(
context, context)!
)!
.privacy_policy, .privacy_policy,
style: TextStyle( style: TextStyle(
color: Color(0xFF985400), fontWeight:
// decoration: TextDecoration.underline, FontWeight.bold,
fontWeight: FontWeight fontSize: 14,
.w600, // Makes the text bold fontFamily: 'Roboto',
decorationColor: Color(0xFF985400), color:
decorationThickness: 1, Color(0xFF985400),
), // decoration:
// TextDecoration.underline,
decorationColor:
Color(0xFF648CBA),
decorationThickness:
1),
), ),
TextSpan( TextSpan(
text: AppLocalizations.of( text: AppLocalizations.of(
context, context)!
)!
.conditions, .conditions,
style: TextStyle(color: Color(0xFF898C81)), style: TextStyle(
fontWeight: FontWeight.w500,
fontSize: 14,
color: Color(
0xFF898C81), // Change to your desired color
),
), ),
], ],
), ),
textAlign: TextAlign.start,
maxLines: 2,
overflow: TextOverflow.visible,
softWrap: true,
), ),
],
), ),
), ),
], ],

4
lib/presentation/routes/auth_routes/login_route.dart
View File

@ -449,8 +449,8 @@ class LoginRoute extends HookConsumerWidget {
'Roboto', 'Roboto',
'Roboto', 'Roboto',
), ),
fontSize: locale?.languageCode == 'ar' ? 14: 18, fontSize: locale?.languageCode == 'ar' ? 12: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
) )
), ),
6.horizontalSpace, 6.horizontalSpace,

2
lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart
View File

@ -1266,7 +1266,7 @@ class InfoCard extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
context.go( context.push(
'/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey'); '/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey');
}, },
child: Container( child: Container(

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/AboutFCSC.dart
View File

@ -16,6 +16,7 @@ class aboutFCSC extends StatelessWidget {
); );
return BaseScaffold( return BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/getStarted.dart
View File

@ -23,6 +23,7 @@ class GetStarted extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/AppFeatures.dart
View File

@ -21,6 +21,7 @@ class AppFeatures extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
bottomColor: Colors.white, bottomColor: Colors.white,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/ChangeMyPassword.dart
View File

@ -21,6 +21,7 @@ class ChangeMyPassword extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
bottomColor: Colors.white, bottomColor: Colors.white,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart
View File

@ -21,6 +21,7 @@ class EditMyProfile extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
bottomColor: Colors.white, bottomColor: Colors.white,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/howUseTheApp.dart
View File

@ -21,6 +21,7 @@ class HowUseTheApp extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/purpose.dart
View File

@ -24,6 +24,7 @@ class Purpose extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/stayUpdate.dart
View File

@ -24,6 +24,7 @@ class StayUpdate extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/useTheApp.dart
View File

@ -21,6 +21,7 @@ class WhoUseTheApp extends StatelessWidget {
), ),
child: BaseScaffold( child: BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/aboutApp.dart
View File

@ -16,6 +16,7 @@ class aboutTheApp extends StatelessWidget {
); );
return BaseScaffold( return BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
bottomColor: Colors.white, bottomColor: Colors.white,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
appbarColor: Colors.white, appbarColor: Colors.white,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/faq_page.dart
View File

@ -20,6 +20,7 @@ class _FAQPageState extends State<FAQPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseScaffold( return BaseScaffold(
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
showBackButton: true,
appbarColor: Colors.white, appbarColor: Colors.white,
bottomColor: Colors.white, bottomColor: Colors.white,
mycenterTitle: true, mycenterTitle: true,

1
lib/presentation/routes/drawer_routes/Drawer Items/user_guide/features.dart
View File

@ -17,6 +17,7 @@ class UsingFeatures extends StatelessWidget {
); );
return BaseScaffold( return BaseScaffold(
showDivider: true, showDivider: true,
showBackButton: true,
dividerColor: Colors.grey[300], dividerColor: Colors.grey[300],
bottomColor: Colors.white, bottomColor: Colors.white,
appbarColor: Colors.white, appbarColor: Colors.white,

15
lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
View File

@ -698,14 +698,15 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
child: IconButton( child: IconButton(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
constraints: BoxConstraints(), constraints: BoxConstraints(),
color: Colors.white, color: widget.colorChange ? Colors.white : Colors.black,
icon: const Icon(Icons.arrow_back_ios_new, size: 24), icon: const Icon(Icons.arrow_back_ios_new, size: 24),
onPressed: () { onPressed: () {
if ((widget.navBackArrow as Text).data == 'home') { // if ((widget.navBackArrow as Text).data == 'home') {
context.go('/myhomepage'); // context.go('/myhomepage');
} else { // } else {
context.go('/uaenumbers'); // context.go('/uaenumbers');
} // }
context.pop();
}, },
), ),
), ),
@ -755,7 +756,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
), ),
], ],
), ),
Divider(), // Divider(),
InkWell( InkWell(
onTap: () { onTap: () {
if (userId != 'guest') context.go('/editProfile'); if (userId != 'guest') context.go('/editProfile');

2
pubspec.lock
View File

@ -568,7 +568,7 @@ packages:
source: hosted source: hosted
version: "0.7.0" version: "0.7.0"
flutter_svg: flutter_svg:
dependency: transitive dependency: "direct main"
description: description:
name: flutter_svg name: flutter_svg
sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b

2
pubspec.yaml
View File

@ -63,6 +63,7 @@ dependencies:
connectivity_plus: ^6.1.2 connectivity_plus: ^6.1.2
tutorial_coach_mark: ^1.2.12 tutorial_coach_mark: ^1.2.12
package_info_plus: ^8.2.0 package_info_plus: ^8.2.0
flutter_svg: ^2.0.17
dependency_overrides: dependency_overrides:
fading_edge_scrollview: ^4.1.1 fading_edge_scrollview: ^4.1.1
@ -136,6 +137,7 @@ flutter:
- assets/icons/misc/group.png - assets/icons/misc/group.png
- assets/icons/misc/search.png - assets/icons/misc/search.png
fonts: fonts:
- family: Segoe - family: Segoe
fonts: fonts: