bug fix code

This commit is contained in:
Juki-shiba 2025-02-11 16:09:30 +05:30
parent fb69475fe4
commit eb4bfaf4da
6 changed files with 29 additions and 4 deletions

View File

@ -297,7 +297,9 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:uae_stat/config/sessionCheckScreen.dart'; import 'package:uae_stat/config/sessionCheckScreen.dart';
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/UAE_Numbers/Social/marriages.dart'; import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/UAE_Numbers/Social/marriages.dart';
import 'package:uae_stat/presentation/Screens/auth_verification/privacy_policy.dart';
import 'package:uae_stat/presentation/Screens/auth_verification/registration.dart'; import 'package:uae_stat/presentation/Screens/auth_verification/registration.dart';
import 'package:uae_stat/presentation/Screens/auth_verification/terms&conditions.dart';
import 'package:uae_stat/presentation/Screens/charts/chart.dart'; import 'package:uae_stat/presentation/Screens/charts/chart.dart';
import 'package:uae_stat/presentation/Screens/charts/screens/chart_screen.dart'; import 'package:uae_stat/presentation/Screens/charts/screens/chart_screen.dart';
import 'package:uae_stat/presentation/Screens/demo_home2.dart'; import 'package:uae_stat/presentation/Screens/demo_home2.dart';
@ -361,8 +363,8 @@ final GoRouter router = GoRouter(
GoRoute( GoRoute(
path: '/', path: '/',
//builder: (context, state) => LoginRoute(), //builder: (context, state) => LoginRoute(),
// builder: (context, state) => SessionCheckScreen(), builder: (context, state) => SessionCheckScreen(),
builder: (context, state) => MyHomePage(),
), ),
// GoRoute( // GoRoute(
// path: '/', // path: '/',
@ -462,6 +464,16 @@ final GoRouter router = GoRouter(
userId: '', userId: '',
), ),
), ),
GoRoute(
path: '/terms&conditions',
builder: (context, state) => TermsOfUse(),
//builder: (context, state) => LoginRoute(),
),
GoRoute(
path: '/privacy_policy',
builder: (context, state) => PrivacyPolicy(),
//builder: (context, state) => LoginRoute(),
),
// Drawer Routers // Drawer Routers
GoRoute( GoRoute(

View File

@ -1138,7 +1138,8 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
'ar' 'ar'
? 12 ? 12
: 14, : 14,
color: Colors.grey[600]), color: Color(0xFF898C81),
),
), ),
SizedBox(height: 15), SizedBox(height: 15),
Padding( Padding(

View File

@ -644,6 +644,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
hintText: _showHints[2] ? 'Enter the name' : null, hintText: _showHints[2] ? 'Enter the name' : null,
hintStyle: TextStyle(color: Colors.grey), hintStyle: TextStyle(color: Colors.grey),
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide:BorderSide(color: Color(0xFF7296BE),
),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
counterText: '', counterText: '',
@ -671,6 +673,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
focusNode: _focusNodes[3], focusNode: _focusNodes[3],
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide:BorderSide(color: Color(0xFF7296BE),
),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
hintText: _showHints[3] ? 'DD/MM/YYYY' : null, hintText: _showHints[3] ? 'DD/MM/YYYY' : null,
@ -712,6 +716,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
value: _selectedCountry, value: _selectedCountry,
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide:BorderSide(color: Color(0xFF7296BE),
),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
labelText: 'Select', labelText: 'Select',

View File

@ -578,6 +578,7 @@ class LoginRoute extends HookConsumerWidget {
'سجل الان', 'سجل الان',
), ),
style: TextStyle( style: TextStyle(
fontSize: locale?.languageCode == 'ar' ? 12 : 14,
color: Color(0xFF985400), color: Color(0xFF985400),
), ),
), ),

View File

@ -778,6 +778,8 @@ class _EditProfileState extends State<EditProfile> {
value: _selectedCountry, value: _selectedCountry,
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide:BorderSide(color: Color(0xFF7296BE),
),
borderRadius: borderRadius:
BorderRadius.circular(8), BorderRadius.circular(8),
), ),

View File

@ -299,6 +299,9 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
), ),
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
labelStyle:TextStyle(
color:Color(0xFFC3C6CB),
),
hintText: AppLocalizations.of(context)!.search, hintText: AppLocalizations.of(context)!.search,
prefixIcon: Image.asset( prefixIcon: Image.asset(
MiscIconAssetPath.search, MiscIconAssetPath.search,