From f79f095d08385186cdb2db5172525e2a675805d8 Mon Sep 17 00:00:00 2001
From: Alaa Elattar <alaamahmoud.1223@gmail.com>
Date: Thu, 22 May 2025 14:46:58 +0300
Subject: [PATCH] update styling

---
 app/lib/screens/dao_screen.dart        |  2 +-
 app/lib/screens/farm_screen.dart       |  5 +++--
 app/lib/screens/registered_screen.dart | 10 ++++-----
 app/lib/widgets/layout_drawer.dart     | 28 +++++++++++++-------------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/lib/screens/dao_screen.dart b/app/lib/screens/dao_screen.dart
index ab7513ba..3b1d1cb3 100644
--- a/app/lib/screens/dao_screen.dart
+++ b/app/lib/screens/dao_screen.dart
@@ -163,7 +163,7 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
                 indicatorColor: Theme.of(context).colorScheme.primary,
                 unselectedLabelColor: Theme.of(context).colorScheme.onSurface,
                 dividerColor: Theme.of(context).scaffoldBackgroundColor,
-                labelStyle: Theme.of(context).textTheme.titleLarge,
+                labelStyle: Theme.of(context).textTheme.titleMedium,
                 unselectedLabelStyle: Theme.of(context).textTheme.titleMedium,
                 tabs: const [
                   Tab(text: 'Active'),
diff --git a/app/lib/screens/farm_screen.dart b/app/lib/screens/farm_screen.dart
index 3c84a552..8d2eae73 100644
--- a/app/lib/screens/farm_screen.dart
+++ b/app/lib/screens/farm_screen.dart
@@ -72,7 +72,8 @@ class _FarmScreenState extends ConsumerState<FarmScreen>
 
       _handleSuccess();
     } on TimeoutException catch (e) {
-      _handleFailure('Loading farms timed out. Please check your network.', error: e);
+      _handleFailure('Loading farms timed out. Please check your network.',
+          error: e);
     } on Exception catch (e) {
       _handleFailure('Failed to load farms due to an unexpected error.',
           error: e);
@@ -303,7 +304,7 @@ class _FarmScreenState extends ConsumerState<FarmScreen>
                 indicatorColor: Theme.of(context).colorScheme.primary,
                 unselectedLabelColor: Theme.of(context).colorScheme.onSurface,
                 dividerColor: Theme.of(context).scaffoldBackgroundColor,
-                labelStyle: Theme.of(context).textTheme.titleLarge,
+                labelStyle: Theme.of(context).textTheme.titleMedium,
                 unselectedLabelStyle: Theme.of(context).textTheme.titleMedium,
                 tabs: const [
                   Tab(text: 'V3'),
diff --git a/app/lib/screens/registered_screen.dart b/app/lib/screens/registered_screen.dart
index 221d5076..78c55446 100644
--- a/app/lib/screens/registered_screen.dart
+++ b/app/lib/screens/registered_screen.dart
@@ -93,12 +93,14 @@ class _RegisteredScreenState extends State<RegisteredScreen>
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
+                    HomeCardWidget(
+                        name: 'Market',
+                        icon: Icons.show_chart_sharp,
+                        pageNumber: 6),
                     HomeCardWidget(
                         name: 'Dao',
                         icon: Icons.how_to_vote_outlined,
                         pageNumber: 4),
-                    HomeCardWidget(
-                        name: 'Sign', icon: Icons.draw_sharp, pageNumber: 9),
                   ],
                 ),
                 const Row(
@@ -106,9 +108,7 @@ class _RegisteredScreenState extends State<RegisteredScreen>
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     HomeCardWidget(
-                        name: 'Market',
-                        icon: Icons.show_chart_sharp,
-                        pageNumber: 6),
+                        name: 'Sign', icon: Icons.draw_sharp, pageNumber: 9),
                     HomeCardWidget(
                         name: 'News', icon: Icons.article, pageNumber: 1),
                   ],
diff --git a/app/lib/widgets/layout_drawer.dart b/app/lib/widgets/layout_drawer.dart
index c51b7e7d..45746776 100644
--- a/app/lib/widgets/layout_drawer.dart
+++ b/app/lib/widgets/layout_drawer.dart
@@ -106,17 +106,6 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
                   globals.tabController.animateTo(0);
                 },
               ),
-              ListTile(
-                minLeadingWidth: 10,
-                leading: const Padding(
-                    padding: EdgeInsets.only(left: 10),
-                    child: Icon(Icons.article, size: 18)),
-                title: const Text('News'),
-                onTap: () {
-                  Navigator.pop(context);
-                  globals.tabController.animateTo(1);
-                },
-              ),
               ListTile(
                 minLeadingWidth: 10,
                 leading: const Padding(
@@ -142,6 +131,17 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
                 )
               else
                 Container(),
+              ListTile(
+                minLeadingWidth: 10,
+                leading: const Padding(
+                    padding: EdgeInsets.only(left: 10),
+                    child: Icon(Icons.show_chart_sharp, size: 18)),
+                title: const Text('Market'),
+                onTap: () {
+                  Navigator.pop(context);
+                  globals.tabController.animateTo(6);
+                },
+              ),
               ListTile(
                 minLeadingWidth: 10,
                 leading: const Padding(
@@ -168,11 +168,11 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
                 minLeadingWidth: 10,
                 leading: const Padding(
                     padding: EdgeInsets.only(left: 10),
-                    child: Icon(Icons.show_chart_sharp, size: 18)),
-                title: const Text('Market'),
+                    child: Icon(Icons.article, size: 18)),
+                title: const Text('News'),
                 onTap: () {
                   Navigator.pop(context);
-                  globals.tabController.animateTo(6);
+                  globals.tabController.animateTo(1);
                 },
               ),
               ListTile(