Remove layout drawer and include base, include layout in home screen and apply changes in all screens, create app_bar_provider

Author: zaelgohary

app/lib/apps/chatbot/chatbot_widget.dart

@@ -3,7 +3,6 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:threebotlogin/apps/chatbot/chatbot_config.dart';
 import 'package:threebotlogin/browser.dart';
 import 'package:threebotlogin/helpers/logger.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 
 class ChatbotWidget extends StatefulWidget {
   final String email;
@@ -85,15 +84,13 @@ class _ChatbotState extends State<ChatbotWidget>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return LayoutDrawer(
-        titleText: 'Support',
-        content: Column(
+    return Column(
           children: <Widget>[
             Expanded(
               child: Container(child: iaWebview),
             ),
           ],
-        ));
+        );
   }
 
   @override

app/lib/apps/farmers/farmers_widget.dart

@@ -14,7 +14,6 @@ import 'package:threebotlogin/helpers/logger.dart';
 import 'package:threebotlogin/models/wallet_data.dart';
 import 'package:threebotlogin/screens/scan_screen.dart';
 import 'package:threebotlogin/services/shared_preference_service.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 
 bool created = false;
 
@@ -153,15 +152,13 @@ class _FarmersState extends State<FarmersWidget>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return LayoutDrawer(
-        titleText: 'Farming',
-        content: Column(
+    return Column(
           children: <Widget>[
             Expanded(
               child: Container(child: iaWebView),
             ),
           ],
-        ));
+        );
   }
 
   @override

app/lib/apps/news/news_screen.dart

@@ -4,7 +4,6 @@ import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
 import 'package:http/http.dart' as http;
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:threebotlogin/helpers/globals.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 import 'package:xml2json/xml2json.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:timeago/timeago.dart' as timeago;
@@ -16,7 +15,8 @@ class NewsScreen extends StatefulWidget {
   State<NewsScreen> createState() => _NewsScreenState();
 }
 
-class _NewsScreenState extends State<NewsScreen> {
+class _NewsScreenState extends State<NewsScreen>
+    with AutomaticKeepAliveClientMixin {
   final Xml2Json xml2json = Xml2Json();
   static const int articlesPerPage = 20;
   final PagingController<int, Map<String, dynamic>> _pagingController =
@@ -60,27 +60,25 @@ class _NewsScreenState extends State<NewsScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return LayoutDrawer(
-      titleText: 'News',
-      content: RefreshIndicator(
-        onRefresh: () async => _pagingController.refresh(),
-        child: PagedListView<int, Map<String, dynamic>>(
-          pagingController: _pagingController,
-          builderDelegate: PagedChildBuilderDelegate<Map<String, dynamic>>(
-            itemBuilder: (context, entry, index) =>
-                buildArticleCard(entry, context),
-            firstPageProgressIndicatorBuilder: (context) => Center(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const CircularProgressIndicator(),
-                  const SizedBox(height: 8),
-                  Text('Loading Articles...',
-                      style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontWeight: FontWeight.bold)),
-                ],
-              ),
+    super.build(context);
+    return RefreshIndicator(
+      onRefresh: () async => _pagingController.refresh(),
+      child: PagedListView<int, Map<String, dynamic>>(
+        pagingController: _pagingController,
+        builderDelegate: PagedChildBuilderDelegate<Map<String, dynamic>>(
+          itemBuilder: (context, entry, index) =>
+              buildArticleCard(entry, context),
+          firstPageProgressIndicatorBuilder: (context) => Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const CircularProgressIndicator(),
+                const SizedBox(height: 8),
+                Text('Loading Articles...',
+                    style: Theme.of(context).textTheme.bodyLarge!.copyWith(
+                        color: Theme.of(context).colorScheme.onSurface,
+                        fontWeight: FontWeight.bold)),
+              ],
             ),
           ),
         ),
@@ -186,4 +184,7 @@ class _NewsScreenState extends State<NewsScreen> {
       await launchUrl(uri);
     }
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }

app/lib/apps/news/news_widget.dart

@@ -6,7 +6,6 @@ import 'package:threebotlogin/clipboard_hack/clipboard_hack.dart';
 import 'package:threebotlogin/events/events.dart';
 import 'package:threebotlogin/events/go_home_event.dart';
 import 'package:threebotlogin/helpers/logger.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 bool created = false;
@@ -83,15 +82,13 @@ class _NewsState extends State<NewsWidget> with AutomaticKeepAliveClientMixin {
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return LayoutDrawer(
-        titleText: 'News',
-        content: Column(
+    return Column(
           children: <Widget>[
             Expanded(
               child: Container(child: iaWebView),
             ),
           ],
-        ));
+        );
   }
 
   @override

app/lib/apps/wallet/wallet_widget.dart

@@ -16,7 +16,6 @@ import 'package:threebotlogin/models/wallet_data.dart';
 import 'package:threebotlogin/screens/scan_screen.dart';
 import 'package:threebotlogin/services/crypto_service.dart';
 import 'package:threebotlogin/services/shared_preference_service.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 
 bool created = false;
 
@@ -184,15 +183,13 @@ class _WalletState extends State<WalletWidget>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return LayoutDrawer(
-        titleText: 'Wallet',
-        content: Column(
-          children: <Widget>[
-            Expanded(
-              child: Container(child: iaWebView),
-            ),
-          ],
-        ));
+    return Column(
+      children: <Widget>[
+        Expanded(
+          child: Container(child: iaWebView),
+        ),
+      ],
+    );
   }
 
   @override

app/lib/providers/app_bar_provider.dart

@@ -0,0 +1,4 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final appBarActionsBuilderProvider = StateProvider<List<Widget> Function(BuildContext context)?>((ref) => null);

app/lib/screens/council_screen.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:threebotlogin/widgets/council/councils.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 import 'package:validators/validators.dart';
 
 class CouncilScreen extends StatefulWidget {
@@ -11,7 +10,7 @@ class CouncilScreen extends StatefulWidget {
   State<CouncilScreen> createState() => _CouncilScreenState();
 }
 
-class _CouncilScreenState extends State<CouncilScreen> {
+class _CouncilScreenState extends State<CouncilScreen> with AutomaticKeepAliveClientMixin {
   final urlController = TextEditingController();
   String? errorMessage;
   String? selectedNetwork = '';
@@ -57,6 +56,7 @@ class _CouncilScreenState extends State<CouncilScreen> {
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     final content = Padding(
         padding: const EdgeInsets.all(16.0),
         child: KeyboardVisibilityBuilder(builder: (context, isKeyboardVisible) {
@@ -157,6 +157,9 @@ class _CouncilScreenState extends State<CouncilScreen> {
                 ],
               ));
         }));
-    return LayoutDrawer(titleText: 'Council', content: content);
+    return content;
   }
+  
+  @override
+  bool get wantKeepAlive => true;
 }

app/lib/screens/dao_screen.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:tfchain_client/models/dao.dart';
 import 'package:threebotlogin/helpers/logger.dart';
-import 'package:threebotlogin/widgets/layout_drawer.dart';
 import 'package:threebotlogin/widgets/dao/proposals.dart';
 import 'package:threebotlogin/services/tfchain_service.dart';
 
@@ -12,7 +11,7 @@ class DaoPage extends StatefulWidget {
   State<DaoPage> createState() => _DaoPageState();
 }
 
-class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
+class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   final List<Proposal> activeList = [];
   final List<Proposal> inactiveList = [];
   bool loading = true;
@@ -67,6 +66,7 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     Widget content;
     if (loading) {
       content = Center(
@@ -149,6 +149,9 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
         ),
       );
     }
-    return LayoutDrawer(titleText: 'Dao', content: content);
+    return content;
   }
+  
+  @override
+  bool get wantKeepAlive => true;
 }