Step 10.1 of modified README

Author: anshumandas

README.md

@@ -57,8 +57,10 @@ Step 9: Add User Roles using Custom Claims. This requires upgrade of plan as we
 1. In Emulator we can add user via http://127.0.0.1:4000/auth and add custom claim via UI as  {"role":"admin"}. The effect is shown via Product page in Nav instead of Cart page for admin user.
 2. Add Function to add the custom claim to make the first user the admin using the Admin SDK
 3. Registeration form to collect some data post signUp and enforce email verification from Client side.
+
    * Note! for Emulator check the console to verify using the link provided as email is not sent.
 4. Enforcing verify email using a button which appears when SignIn fails due to non verification.
+
    * Fixed the error handling message during login.
    * Coverted server side to Typescript
    * Enabled Resend verification mail button
@@ -70,14 +72,24 @@ Step 9: Add User Roles using Custom Claims. This requires upgrade of plan as we
        * Note that the Server side beforeCreate function can also bypass user creation till verification but the user record (esp password) needs to be stored anyways, so bypassing user creation is not a good idea. Instead, we should use the verified tag in subsequent processing
        * Sending emails from server side is possible but by using the web client SDK.
 5. TODO: Other Items
+
    * TODO: Using autocomplete for emails is throwing error log in terminal. No impact but need to fix when all is done.
    * TODO: Add a job that removes all unverified users after a while automatically. This could be useful if you were victim of bot attacks, but adding the Recaptcha is better precaution. See [https://stackoverflow.com/questions/67148672/how-to-delete-unverified-e-mail-addresses-in-firebase-authentication-flutter/67150606#67150606]
 6. Added Roles of Buyer and Seller.
+
    1. Added Access level in increasing order of role order => Buyer then Seller then Admin
    2. Created Navigation for each of Admin, Buyer, Seller screens
    3. Allowed switch from lower role Navigation to Navigation view till the given role of the user
 
-Step 10: TODO: CRUD
+Step 10: TODO: Firebase Remote Config for A/B testing
+
+1. Complete the Screen enum based Navigation framework
+2. Config for Navigation element change
+   * A: Drawer for Account, Settings, Sign Out
+   * B: Hamburger that opens BottomSheet (Context Menu in larger screen) for the same options
+3. Config for adding Search Bar at the Top vs a Bottom Navigation button
+
+Step 11: TODO: CRUD
 
 * Users request role upgrade
 * Add this request data to Firebase Datastore
@@ -86,24 +98,18 @@ Step 10: TODO: CRUD
   * Allow a Plan attribute via Custome Claims (e.g. Premium user flag) for Buyer and Seller, to add features which are not Navigation linked. Add a button Upgrade to Plan in Drawer that leads to Payment screen. Also certain aspects of premium plan can be visible that leads to upgrade plan screen via middleware
 * Nested Category, Sub-Category tree creation
 
-Step 11: TODO: Theming and Custom Settings
+Step 12: TODO: Theming and Custom Settings
 
 * Add Persona (like that in Netflix) and create a Persona selection only for Buyer Role
 * Add Minimal (Three Color Gradient Pallette) Material Theme. Align it with Persona Templates (like Kids Template in Netflix)
 * Dark theme toggle setting based on each Persona of the logged in User
 
-Step 12: TODO: Firebase Remote Config for A/B testing
-
-1. Config for Navigation element change
-   * A: Drawer for Account, Settings, Sign Out
-   * B: Hamburger that opens BottomSheet (Context Menu in larger screen) for the same options
-2. Config for adding Search Bar at the Top vs a Bottom Navigation button
-
 Step 13: TODO: Large vs Small screen responsiveness
 
 * Drawer: Triggered by Top Left Icon (App Logo). For iOS this icon changes to back button when required. Contains allowed Role List, Screens specified as Drawer. Becomes Left Side Navigation for Horizontal Screens. Can have additional extreme left vertical Navigation Strip. Bottom Navigation Bar also folds into this strip in Horizontal Screens.
 * Top Right Icon: used for Login and post Login triggers BottomSheet/Context Menu for Persona Change, Profile, Settings, Change Password, Logout
 * Search Bar (Toggle Button for phones) on Top Center with Title
 * Status Bottom Bar for desktops only instead of SnackBars
+* FAB vs Main Menu
 
 Step 14: TODO: Make own login flow screens. Remove firebase library reference from all but auth_service

assets/icons/logo.png

@@ -1,9 +1,8 @@
 // ignore_for_file: avoid_print
 import 'package:get/get.dart';
 import 'package:get_flutter_fire/models/role.dart';
-
-import '../../services/auth_service.dart';
-import '../routes/app_pages.dart';
+import 'package:get_flutter_fire/services/auth_service.dart';
+import 'package:get_flutter_fire/app/routes/app_pages.dart';
 
 Future<GetNavConfig?> loginVerify(bool check, GetNavConfig route,
     Future<GetNavConfig?> Function(GetNavConfig) redirector) async {

lib/app/middleware/auth_middleware.dart

@@ -1,34 +1,27 @@
 import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
-import 'package:get_flutter_fire/services/auth_service.dart';
-
-import '../../../../models/screens.dart';
+import 'package:get_flutter_fire/app/routes/app_pages.dart';
+import '../../../widgets/screen_widget.dart';
+import '../../../../services/auth_service.dart';
 import '../controllers/cart_controller.dart';
 
 class CartView extends GetView<CartController> {
   const CartView({super.key});
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ScreenWidget(
       appBar: AppBar(
         title: Text('${AuthService.to.userName} Cart'),
         centerTitle: true,
       ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: () => Get.rootDelegate.toNamed(Screen.CHECKOUT.route),
-        backgroundColor: Colors.blue,
-        child: const Icon(
-          Icons.check_outlined,
-          color: Colors.white,
-        ),
-      ),
       body: const Center(
         child: Text(
           'CartView is working',
           style: TextStyle(fontSize: 20),
         ),
       ),
+      screen: screen!,
     );
   }
 }

lib/app/modules/cart/views/cart_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import '../../../../models/screens.dart';
+import '../../../routes/app_pages.dart';
+import '../../../widgets/screen_widget.dart';
 import '../controllers/home_controller.dart';
 
 class HomeView extends GetView<HomeController> {
@@ -16,26 +17,16 @@ class HomeView extends GetView<HomeController> {
         }
         var route = controller.chosenRole.value.tabs[0].route;
         //This router outlet handles the appbar and the bottom navigation bar
-        int currentIndex =
-            controller.chosenRole.value.getCurrentIndexFromRoute(currentRoute);
-        return Scaffold(
+        return ScreenWidget(
+          screen: screen!,
           body: GetRouterOutlet(
             initialRoute: route,
             // anchorRoute: Routes.HOME,
             key: Get.nestedKey(route),
           ),
-          bottomNavigationBar: BottomNavigationBar(
-            currentIndex: currentIndex,
-            onTap: (value) {
-              controller.chosenRole.value.routeTo(value, delegate);
-            },
-            items: controller.chosenRole.value.tabs
-                .map((Screen tab) => BottomNavigationBarItem(
-                      icon: Icon(tab.icon),
-                      label: tab.label,
-                    ))
-                .toList(),
-          ),
+          role: controller.chosenRole.value,
+          delegate: delegate,
+          currentRoute: currentRoute,
         );
       },
     );

lib/app/modules/home/views/home_view.dart

@@ -17,11 +17,4 @@ class LoginController extends GetxController {
 
   bool get isRegistered =>
       AuthService.to.registered.value || AuthService.to.isEmailVerified;
-
-  // @override
-  // onInit() {
-  //   super.onInit();
-  //   showReverificationButton
-  //       .listen((value) => print("$value showReverificationButton set"));
-  // }
 }

lib/app/modules/login/controllers/login_controller.dart

@@ -70,6 +70,9 @@ class LoginView extends GetView<LoginController> {
             );
     } else if (controller.isAnon) {
       ui = RegisterScreen(
+        providers: [
+          MyEmailAuthProvider(),
+        ],
         showAuthActionSwitch: !controller.isAnon, //if Anon only SignUp
         showPasswordVisibilityToggle: true,
         headerBuilder: LoginWidgets.headerBuilder,
@@ -108,17 +111,12 @@ class LoginView extends GetView<LoginController> {
   List<FirebaseUIAction> getActions() {
     return [
       // AuthStateChangeAction<CredentialReceived>((context, state) {
-      //   print("***********Not Reaching*************");
-      //   print(state);
-      // }),
       AuthStateChangeAction<AuthFailed>((context, state) => LoginController.to
           .errorMessage(context, state, showReverificationButton)),
       // AuthStateChangeAction<SignedIn>((context, state) {
-      //   // print("signed In");
       //   // This is not required due to the AuthMiddleware
       // }),
       // EmailLinkSignInAction((context) {
-      //   // print("signed in by link");
       //   final thenTo = Get.rootDelegate.currentConfiguration!.currentPage!
       //       .parameters?['then'];
       //   Get.rootDelegate.offNamed(thenTo ?? Routes.PROFILE);

lib/app/modules/login/views/login_view.dart

@@ -56,7 +56,6 @@ class ProfileController extends GetxController {
 
   Future<void> updatePhotoURL(String dest) async {
     _photoURL.value = await storage.ref().child(dest).getDownloadURL();
-    // print(pic);
     await currentUser?.updatePhotoURL(_photoURL.value);
     Get.snackbar('Success', 'Picture stored and linked');
   }

lib/app/modules/profile/controllers/profile_controller.dart

@@ -97,7 +97,7 @@ class ProfileView extends GetView<ProfileController> {
                       icon: const Icon(Icons.password_rounded),
                     )
                   : const SizedBox.shrink(),
-              ImagePickerButton((String? path) async {
+              ImagePickerButton(callback: (String? path) async {
                 if (path != null) {
                   //Upload to Store
                   String? dest = await controller.uploadFile(path);

lib/app/modules/profile/views/profile_view.dart

@@ -29,18 +29,21 @@ class RootView extends GetView<RootController> {
                     onPressed: () =>
                         Get.rootDelegate.popRoute(), //Navigator.pop(context),
                   )
-                : AuthService.to.isLoggedInValue
-                    ? IconButton(
-                        icon: const Icon(Icons.person),
-                        onPressed: () => controller.openDrawer(),
-                      )
-                    : null,
+                : IconButton(
+                    icon: ImageIcon(
+                      const AssetImage("icons/logo.png"),
+                      color: Colors.grey.shade800,
+                    ),
+                    onPressed: () => AuthService.to.isLoggedInValue
+                        ? controller.openDrawer()
+                        : {Screen.HOME.doAction()},
+                  ),
             actions: [
               Container(
                   margin: const EdgeInsets.only(right: 15),
-                  child: Screen.LOGIN.widget)
+                  child: Screen.LOGIN.widget(current))
             ],
-            automaticallyImplyLeading: false, //removes drawer icon
+            // automaticallyImplyLeading: false, //removes drawer icon
           ),
           body: GetRouterOutlet(
             initialRoute: AppPages.INITIAL,