Merge pull request #191 from 12fahed/main

images change, bear min chnages in ui
TSEC-MAD-Club · Jul 11, 2024 · 90ef496 · 90ef496
2 parents 6cc42af + 9356ea1
commit 90ef496
Show file tree

Hide file tree

Showing 9 changed files with 181 additions and 115 deletions.
diff --git a/assets/images/app_bar/notification.png b/assets/images/app_bar/notification.png
diff --git a/assets/images/railway.png b/assets/images/railway.png
diff --git a/lib/new_ui/screens/committees_screen/old_committees_screen.dart b/lib/new_ui/screens/committees_screen/old_committees_screen.dart
@@ -96,7 +96,7 @@ class _OldCommittessScreenState extends State<OldCommittessScreen> {
                             children: [
                               Text(
                                 data[_currentPage].name,
-                                style: Theme.of(context).textTheme.headlineSmall!.copyWith(fontSize: 4),
+                                style: Theme.of(context).textTheme.headlineSmall!.copyWith(fontSize: 20),
                                 textAlign: TextAlign.center,
                               ),
                               const SizedBox(height: 15),
@@ -124,6 +124,7 @@ class _OldCommittessScreenState extends State<OldCommittessScreen> {
     );
   }
 
+
   double _getScale(int index, double page) {
     return 1 - (lerpDouble(0, .4, index - page) ?? 0).abs();
   }

diff --git a/lib/new_ui/screens/railway_screen/railway_screen.dart b/lib/new_ui/screens/railway_screen/railway_screen.dart
@@ -884,11 +884,23 @@ class _RailwayConcessionScreenState
                     width: size.width * 0.8,
                     height: size.height * 0.4,
                     alignment: Alignment.center,
-                    child: Text(
-                      "You Dont have any ongoing pass",
-                      style: TextStyle(fontSize: 18, color: Colors.white),
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Image.asset(
+                          'assets/images/railway.png',
+                          width: 300,
+                        ),
+                        SizedBox(height: 10),
+                        Text(
+                          "You don't have any ongoing pass",
+                          style: TextStyle(fontSize: 15, color: Colors.yellow, fontWeight: FontWeight.bold),
+                        ),
+                      ],
                     ),
                   ),
+
+
                 ],
               ),
           ],

diff --git a/lib/screens/notification_screen/notification_screen.dart b/lib/screens/notification_screen/notification_screen.dart
@@ -37,7 +37,7 @@ class _NotificationScreenState extends ConsumerState<NotificationScreen> {
           SliverToBoxAdapter(
             child: CustomAppBar(
               title: "Notifications",
-              image: Image.asset(ImageAssets.committes),
+              image: Image.asset(ImageAssets.notification),
             ),
           ),
         ],
@@ -95,6 +95,10 @@ class _NotificationScreenState extends ConsumerState<NotificationScreen> {
     _lastDate = notificationTime;
     return Center(
       child: Chip(
+        backgroundColor: Colors.white,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20.0),
+        ),
         labelStyle: const TextStyle(fontSize: 12),
         label: Text(
           DateFormat("dd MMMM,yyyy").format(notificationTime),

diff --git a/lib/utils/image_assets.dart b/lib/utils/image_assets.dart
@@ -8,7 +8,7 @@ class ImageAssets {
   static const tsecImg = "$_root/app_bar/tsec.png";
   static const tpo = "$_root/app_bar/tpo.png";
   static const notes = "$_root/app_bar/notes.png";
-
+  static const notification = "$_root/app_bar/notification.png";
   // icons
   static const _iconRoot = "$_root/icons";
 

diff --git a/lib/widgets/custom_app_bar.dart b/lib/widgets/custom_app_bar.dart
@@ -17,7 +17,7 @@ class CustomAppBar extends ConsumerWidget implements PreferredSizeWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return SafeArea(
       child: Container(
-        height: 235,
+        height: 200,
         decoration: BoxDecoration(
           color: commonbgLightblack,
           borderRadius: const BorderRadius.only(