Merge branch 'we-kode:develop' into customization

ecg-media · Dec 28, 2024 · 68cae78 · 68cae78
2 parents 4aefaa4 + 2b61cc7
commit 68cae78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/lib/view_models/register.dart b/lib/view_models/register.dart
@@ -53,12 +53,12 @@ class RegisterViewModel extends ChangeNotifier {
     return Future<bool>.microtask(() async {
       if (await _storage.has(SecureStorageService.accessTokenStorageKey)) {
         try {
-          print("DEBUG:::RegisterViewModel:56");
+          print("DEBUG:::RegisterViewModel:init:56");
           var isRegistered = await _clientService.isClientRegistered();
-          print("DEBUG:::RegisterViewModel:58:$isRegistered");
+          print("DEBUG:::RegisterViewModel:init:58:$isRegistered");
           if (isRegistered) {
             Future.microtask(() async {
-              print("DEBUG:::RegisterViewModel:61");
+              print("DEBUG:::RegisterViewModel:init:61");
               await afterRegistration();
             });
 
@@ -67,9 +67,9 @@ class RegisterViewModel extends ChangeNotifier {
         } catch (e) {
           if (e is! DioException ||
               e.response?.statusCode != HttpStatus.unauthorized) {
-            print("DEBUG:::RegisterViewModel:70");
+            print("DEBUG:::RegisterViewModel:init:70");
             Future.microtask(() async {
-              print("DEBUG:::RegisterViewModel:72");
+              print("DEBUG:::RegisterViewModel:init:72");
               await afterRegistration();
             });
 
@@ -78,7 +78,7 @@ class RegisterViewModel extends ChangeNotifier {
         }
       }
 
-      print("DEBUG:::RegisterViewModel:81");
+      print("DEBUG:::RegisterViewModel:init:81");
       if (Platform.isAndroid) {
         deviceIdentifier = (await DeviceInfoPlugin().androidInfo).model;
       }
@@ -130,7 +130,7 @@ class RegisterViewModel extends ChangeNotifier {
   /// Sets the registration state of the process to the passed [state].
   set state(RegistrationState state) {
     _state = state;
-    print("DEBUG:::RegisterViewModel:132:changingState:$state");
+    print("DEBUG:::RegisterViewModel:state:132:changingState:$state");
     switch (_state) {
       case RegistrationState.rsa:
         infoMessage = locales.registrationRSA;

diff --git a/lib/views/main.dart b/lib/views/main.dart
@@ -16,17 +16,20 @@ class MainScreen extends StatelessWidget {
   /// Builds the screen.
   @override
   Widget build(BuildContext context) {
+    print("DEBUG:::MainScreen:19:build");
     return ChangeNotifierProvider<MainViewModel>(
       create: (context) => MainViewModel(),
       builder: (context, _) {
         var vm = Provider.of<MainViewModel>(context, listen: false);
+        print("DEBUG:::MainScreen:24:build:builder");
         return FutureBuilder(
           future: vm.init(context),
           builder: (BuildContext context, AsyncSnapshot<bool> snapshot) {
             if (!snapshot.hasData) {
               return const Center(child: CircularProgressIndicator());
             }
 
+            print("DEBUG:::MainScreen:32:build:beforePopScope");
             return PopScope(
               canPop: false,
               onPopInvoked: (_) => vm.popNestedRoute(context),
@@ -48,6 +51,7 @@ class MainScreen extends StatelessWidget {
                           initialRoute: RecordsViewModel.route,
                           observers: [_NestedRouteObserver(vm: vm)],
                           onGenerateRoute: (settings) {
+                            print("DEBUG:::MainScreen:54:build:Navigator.onGenerateRoute");
                             return RouterService.getInstance().getNestedRoutes(
                               args: settings.arguments,
                             )[settings.name];
@@ -59,6 +63,7 @@ class MainScreen extends StatelessWidget {
                 ),
                 bottomNavigationBar: Consumer<MainViewModel>(
                   builder: (context, vm, _) {
+                    print("DEBUG:::MainScreen:66:build:bottomNavigationBar.builder");
                     return BottomNavigationBar(
                       backgroundColor: Theme.of(context).colorScheme.surface,
                       showUnselectedLabels: false,

diff --git a/lib/views/register.dart b/lib/views/register.dart
@@ -15,20 +15,22 @@ class RegisterScreen extends StatelessWidget {
   /// Builds the screen.
   @override
   Widget build(BuildContext context) {
+    print("DEBUG:::RegisterScreen:build:18");
     return Scaffold(
       body: SafeArea(
         child: ChangeNotifierProvider<RegisterViewModel>(
           create: (context) => RegisterViewModel(),
           builder: (context, _) {
             var vm = Provider.of<RegisterViewModel>(context, listen: false);
-
+            print("DEBUG:::RegisterScreen:build:25:builder");
             return FutureBuilder(
               future: vm.init(context),
               builder: (BuildContext context, AsyncSnapshot<bool> snapshot) {
                 if (!snapshot.hasData || !snapshot.data!) {
                   return const Center(child: CircularProgressIndicator());
                 }
 
+                print("DEBUG:::RegisterScreen:build:33:beforeColumn");
                 return Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   crossAxisAlignment: CrossAxisAlignment.center,
@@ -58,6 +60,7 @@ class RegisterScreen extends StatelessWidget {
                     Center(
                       child: Consumer<RegisterViewModel>(
                         builder: (context, vm, _) {
+                          print("DEBUG:::RegisterScreen:build:63:stateConsumer");
                           switch (vm.state) {
                             case RegistrationState.rsa:
                               return const SizedBox(