Merge branch 'master' into refactored-error-handling

icapps · Sep 28, 2023 · f71427f · f71427f
2 parents 4d8ef1c + a2e651b
commit f71427f
Show file tree

Hide file tree

Showing 15 changed files with 118 additions and 53 deletions.
diff --git a/.github/workflows/rename_project.yml b/.github/workflows/rename_project.yml
@@ -7,7 +7,7 @@ on:
     branches: [ "master" ]
 
 jobs:
-  check_analyzer:
+  check_rename_project:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/strip_boilerplate_project.yaml b/.github/workflows/strip_boilerplate_project.yaml
@@ -7,7 +7,7 @@ on:
     branches: [ "master" ]
 
 jobs:
-  check_analyzer:
+  check_strip_boilerplate_project:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/strip_boilerplate_project_remove_tests.yaml b/.github/workflows/strip_boilerplate_project_remove_tests.yaml
@@ -7,7 +7,7 @@ on:
     branches: [ "master" ]
 
 jobs:
-  check_analyzer:
+  check_strip_boilerplate_project_remove_tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/lib/repository/shared_prefs/local/local_storage.dart b/lib/repository/shared_prefs/local/local_storage.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/repository/secure_storage/auth/auth_storage.dart';
+import 'package:flutter_template/util/extension/theme_mode_extension.dart';
 import 'package:icapps_architecture/icapps_architecture.dart';
 import 'package:injectable/injectable.dart';
 
@@ -39,14 +40,15 @@ class _LocalStorage implements LocalStorage {
   }
 
   @override
-  Future<void> updateThemeMode(ThemeMode themeMode) async {
-    await _sharedPreferences.saveString(key: _appearanceThemeKey, value: themeMode.toString());
-  }
+  Future<void> updateThemeMode(ThemeMode themeMode) async => _sharedPreferences.saveString(
+        key: _appearanceThemeKey,
+        value: themeMode.stringValue,
+      );
 
   @override
   ThemeMode? getThemeMode() {
     final themeString = _sharedPreferences.getString(_appearanceThemeKey);
-    return ThemeMode.values.find((element) => element.toString() == themeString);
+    return ThemeMode.values.find((element) => element.stringValue == themeString);
   }
 
   @override

diff --git a/lib/util/extension/theme_mode_extension.dart b/lib/util/extension/theme_mode_extension.dart
@@ -0,0 +1,9 @@
+import 'package:flutter/material.dart';
+
+extension ThemeModeExtension on ThemeMode {
+  String get stringValue => switch (this) {
+      ThemeMode.dark => 'dark',
+      ThemeMode.light => 'light',
+      ThemeMode.system => 'system',
+    };
+}
diff --git a/lib/widget/general/text_scale_factor.dart b/lib/widget/general/text_scale_factor.dart
@@ -15,7 +15,7 @@ class TextScaleFactor extends StatelessWidget {
     FlavorConfig.instance.devicePixelRatio = mediaQuery.devicePixelRatio;
     if (FlavorConfig.isInTest()) return child;
     return MediaQuery(
-      data: mediaQuery.copyWith(textScaleFactor: mediaQuery.textScaleFactor.clamp(0, 1.6)),
+      data: mediaQuery.copyWith(textScaleFactor: mediaQuery.textScaleFactor.clamp(0.8, 1.4)),
       child: child,
     );
   }

diff --git a/test/util/test_util.mocks.dart b/test/util/test_util.mocks.dart
@@ -245,15 +245,35 @@ class MockErrorUtil extends _i2.Mock implements _i8.ErrorUtil {
   }
 
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  String? showError({
+    required dynamic error,
+    required _i1.BuildContext? context,
+  }) =>
+      (super.noSuchMethod(Invocation.method(
+        #showError,
+        [],
+        {
+          #error: error,
+          #context: context,
+        },
+      )) as String?);
+  @override
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    required _i1.BuildContext? context,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #context: context,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );
@@ -286,15 +306,20 @@ class MockMainNavigator extends _i2.Mock implements _i9.MainNavigator {
         returnValueForMissingStub: _i5.Future<void>.value(),
       ) as _i5.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/debug/debug_platform_selector_viewmodel_test.mocks.dart b/test/viewmodel/debug/debug_platform_selector_viewmodel_test.mocks.dart
@@ -60,15 +60,20 @@ class MockMainNavigator extends _i2.Mock implements _i3.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/debug/debug_viewmodel_test.mocks.dart b/test/viewmodel/debug/debug_viewmodel_test.mocks.dart
@@ -65,15 +65,20 @@ class MockMainNavigator extends _i2.Mock implements _i3.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/license/license_viewmodel_test.mocks.dart b/test/viewmodel/license/license_viewmodel_test.mocks.dart
@@ -60,15 +60,20 @@ class MockMainNavigator extends _i2.Mock implements _i3.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/login/login_viewmodel_test.mocks.dart b/test/viewmodel/login/login_viewmodel_test.mocks.dart
@@ -99,15 +99,20 @@ class MockMainNavigator extends _i2.Mock implements _i5.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/theme_selector/theme_selector_viewmodel_test.mocks.dart b/test/viewmodel/theme_selector/theme_selector_viewmodel_test.mocks.dart
@@ -262,15 +262,20 @@ class MockMainNavigator extends _i2.Mock implements _i8.MainNavigator {
         returnValueForMissingStub: _i5.Future<void>.value(),
       ) as _i5.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/todo/todo_add/todo_add_viewmodel_test.mocks.dart b/test/viewmodel/todo/todo_add/todo_add_viewmodel_test.mocks.dart
@@ -114,15 +114,20 @@ class MockMainNavigator extends _i2.Mock implements _i6.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/test/viewmodel/todo/todo_list/todo_list_viewmodel_test.mocks.dart b/test/viewmodel/todo/todo_list/todo_list_viewmodel_test.mocks.dart
@@ -114,15 +114,20 @@ class MockMainNavigator extends _i2.Mock implements _i6.MainNavigator {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void showErrorWithLocaleKey(
-    String? errorKey, {
+  void showErrorWithLocaleKey({
+    required String? messageKey,
+    String? titleKey,
     List<dynamic>? args,
   }) =>
       super.noSuchMethod(
         Invocation.method(
           #showErrorWithLocaleKey,
-          [errorKey],
-          {#args: args},
+          [],
+          {
+            #messageKey: messageKey,
+            #titleKey: titleKey,
+            #args: args,
+          },
         ),
         returnValueForMissingStub: null,
       );

diff --git a/tool/dart_tool/strip_boilerplate_project.dart b/tool/dart_tool/strip_boilerplate_project.dart
@@ -123,15 +123,9 @@ void replaceBoilerplateReferences(Directory dir) {
 
 void _replaceHomeScreenLine() {
   _replaceInFile(
-    'lib/screen/home/home_screen.dart',
-    '''        children: const [
-          TodoListScreen(),
-          DebugScreen(),
-        ],''',
-    '''        children: const [
-          SizedBox(),
-          DebugScreen(),
-        ],''',
+    'lib/model/bottom_navigation/bottom_navigation_tab.dart',
+    'BottomNavigationTab.todo => const TodoListScreen(),',
+    'BottomNavigationTab.todo => const SizedBox.shrink(),',
   );
 }