From cc3ff0bfa7459a6102ec3448e3efa333ba881794 Mon Sep 17 00:00:00 2001 From: Shreya Bhatia Date: Fri, 26 Jul 2024 21:30:18 +0530 Subject: [PATCH 1/3] inkwell part --- .../screens/main_screen/main_screen.dart | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/new_ui/screens/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart index 76ec106..7b04f11 100644 --- a/lib/new_ui/screens/main_screen/main_screen.dart +++ b/lib/new_ui/screens/main_screen/main_screen.dart @@ -787,15 +787,15 @@ class _MainScreenState extends ConsumerState { }, ), SizedBox(height: 10,), - Container( - alignment: Alignment.center, - width: size.width, - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - color: Color(0xff383838), - ), - child: InkWell( + InkWell( + child: Container( + alignment: Alignment.center, + width: size.width, + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Color(0xff383838), + ), child: Text( data != null ? 'Logout' : 'Login', style: Theme @@ -812,16 +812,16 @@ class _MainScreenState extends ConsumerState { .error, ), ), - onTap: () { - if (data != null) { - ref.watch(authProvider.notifier).signout(); - GoRouter.of(context).go('/login'); - // Navigator.pop(context); - } else { - GoRouter.of(context).go('/login'); - } - }, ), + onTap: () { + if (data != null) { + ref.watch(authProvider.notifier).signout(); + GoRouter.of(context).go('/login'); + // Navigator.pop(context); + } else { + GoRouter.of(context).go('/login'); + } + }, ), const SizedBox(height: 10,), Row( From 8406456fb588a7c7c339e54b28bb1c6e11e939fc Mon Sep 17 00:00:00 2001 From: Shreya Bhatia Date: Fri, 26 Jul 2024 21:32:51 +0530 Subject: [PATCH 2/3] color part --- lib/new_ui/screens/bug_report_screen/bug_report_screen.dart | 2 +- lib/new_ui/screens/railway_screen/railway_screen.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/new_ui/screens/bug_report_screen/bug_report_screen.dart b/lib/new_ui/screens/bug_report_screen/bug_report_screen.dart index 0badf39..34413a6 100644 --- a/lib/new_ui/screens/bug_report_screen/bug_report_screen.dart +++ b/lib/new_ui/screens/bug_report_screen/bug_report_screen.dart @@ -75,7 +75,7 @@ class _BugReportScreenState extends ConsumerState { "Please provide a detailed description of the bug. This will help us understand the issue better. Provide steps to reproduce the bug if possible.", style: TextStyle( fontSize: 16, - color: Colors.grey + color: Colors.white ), ), const SizedBox(height: 20), diff --git a/lib/new_ui/screens/railway_screen/railway_screen.dart b/lib/new_ui/screens/railway_screen/railway_screen.dart index e41f627..f06fd61 100644 --- a/lib/new_ui/screens/railway_screen/railway_screen.dart +++ b/lib/new_ui/screens/railway_screen/railway_screen.dart @@ -546,7 +546,7 @@ class _RailwayConcessionScreenState ), TextSpan( text: "${concessionDetails!.statusMessage}", - style: TextStyle(color: Colors.white,fontSize: 16.0,), + style: TextStyle(color: Colors.black,fontSize: 16.0,), ), ], ), From 658e8e612fc40ba1fe7322acfa20c4de030c0f76 Mon Sep 17 00:00:00 2001 From: Shreya Bhatia Date: Fri, 26 Jul 2024 22:19:10 +0530 Subject: [PATCH 3/3] minor change --- lib/new_ui/screens/railway_screen/railway_screen.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/new_ui/screens/railway_screen/railway_screen.dart b/lib/new_ui/screens/railway_screen/railway_screen.dart index f06fd61..7596513 100644 --- a/lib/new_ui/screens/railway_screen/railway_screen.dart +++ b/lib/new_ui/screens/railway_screen/railway_screen.dart @@ -531,7 +531,7 @@ class _RailwayConcessionScreenState color: Colors.red[50], // Light red background border: Border.all( color: Colors.red, // Red border - width: 2.0, + width: 1.0, ), borderRadius: BorderRadius.circular(8.0), // Rounded corners ), @@ -771,7 +771,7 @@ class _RailwayConcessionScreenState ), ] else if(concessionDetails!.status == 'rejected')...[ Text("Rejected Pass", - style: TextStyle(fontSize: 20, color: Colors.red[200], fontWeight: FontWeight.bold), + style: TextStyle(fontSize: 20, color: Colors.white, fontWeight: FontWeight.bold), ), ] else...[ Text("Ongoing Pass",