Merge pull request #228 from Shreya-Bhatia/main

inkwell, color, minor changes
TSEC-MAD-Club · Jul 26, 2024 · 8dc43de · 8dc43de
2 parents 7ce3056 + 658e8e6
commit 8dc43de
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 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
@@ -75,7 +75,7 @@ class _BugReportScreenState extends ConsumerState<BugReportScreen> {
                 "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/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart
@@ -787,15 +787,15 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                       },
                     ),
                     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<MainScreen> {
                                 .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(

diff --git 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
                   ),
@@ -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,),
                         ),
                       ],
                     ),
@@ -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",