Simplify template

lib/app.dart

@@ -50,7 +50,7 @@ class _AppState extends State<App> {
     super.didChangeDependencies();
     postAppConfig();
     if (!FlavorConfig.isProduction()) {
-      WidgetsBinding.instance?.addPostFrameCallback((_) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
         debugOverlay(context);
       });
     }

lib/config/flavor_config.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_template/util/enum_util.dart';
 
-enum Flavor { MOCK, DEV, STAGING, PRODUCTION }
+enum Flavor { DEV, STAGING, PRODUCTION }
 
 /// App specific flavor values.
 class FlavorValues {
@@ -29,8 +29,6 @@ abstract class FlavorConfig {
 
   static bool isInitialized() => _flavor != null; //in tests it's not
 
-  static bool isMock() => _flavor! == Flavor.MOCK;
-
   static bool isDev() => _flavor! == Flavor.DEV;
 
   static bool isStaging() => _flavor! == Flavor.STAGING;

lib/config/pre_app_config.dart

@@ -4,7 +4,6 @@ import 'package:flutter_template/config/logger_config.dart';
 import 'package:flutter_template/di/service_locator.dart';
 import 'package:flutter_template/di/service_locator.dart' as serviceLocatorConf;
 import 'package:flutter_template/feature/settings/preferences_helper.dart';
-import 'package:flutter_template/notifications/local/local_notification_manager.dart';
 import 'package:flutter_template/user/user_manager.dart';
 
 /// Configuration that needs to be done before the Flutter app starts goes here.

lib/data/repository/tasks/tasks_data_source.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter_template/model/task/task.dart';
 import 'package:flutter_template/model/task/task_group.dart';
 

lib/data/repository/tasks/tasks_repository.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/material.dart';
 import 'package:flutter_template/data/repository/tasks/tasks_data_source.dart';
 import 'package:flutter_template/feature/home/task_list/bloc/task_list_state.dart';
 import 'package:flutter_template/log/log.dart';

lib/di/service_locator.dart

@@ -2,8 +2,6 @@ import 'package:connectivity/connectivity.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter_template/config/firebase_config.dart';
 import 'package:flutter_template/config/flavor_config.dart';
-import 'package:flutter_template/data/mock/mock_tasks_api_service.dart';
-import 'package:flutter_template/data/mock/mock_user_api_service.dart';
 import 'package:flutter_template/di/user_scope_hook.dart';
 import 'package:flutter_template/feature/settings/preferences_helper.dart';
 import 'package:flutter_template/model/user/user_credentials.dart';
@@ -69,11 +67,6 @@ Future<void> setupGlobalDependencies() async {
   final UserAuthApiService userAuthApi = apiProvider.getUserAuthApiService();
   TasksApiService tasksApi = apiProvider.getTasksApiService();
 
-  if (FlavorConfig.isMock()) {
-    userApi = MockUserApiService();
-    tasksApi = MockTasksApiService();
-  }
-
   // Notifications
 
   //// DataNotificationManager

lib/feature/auth/login/ui/login_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_template/di/service_locator.dart';
 import 'package:flutter_template/feature/auth/login/bloc/login_cubit.dart';

lib/feature/auth/login/ui/login_view.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_template/feature/auth/login/bloc/login_cubit.dart';
 import 'package:flutter_template/feature/auth/router/auth_router_delegate.dart';
 import 'package:flutter_template/resources/localization/localization_notifier.dart';
-import 'package:provider/provider.dart';
 
 class LoginView extends StatelessWidget {
   final bool sessionExpiredRedirect;
@@ -80,8 +78,8 @@ class LoginView extends StatelessWidget {
                       child: Text('Sign up'),
                       onPressed: () => _onSignUpPressed(context),
                       style: ElevatedButton.styleFrom(
-                        onPrimary: Colors.black,
-                        primary: Colors.grey[300],
+                        foregroundColor: Colors.grey[300],
+                        disabledForegroundColor: Colors.black,
                       ),
                     ),
                   ],

lib/feature/auth/router/auth_router_delegate.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_template/feature/auth/login/ui/login_page.dart';
 import 'package:flutter_template/feature/auth/router/auth_nav_state.dart';

lib/feature/auth/signup/ui/password/password_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_template/feature/auth/signup/ui/password/password_view.dart';
 
 class PasswordPage extends Page {

lib/feature/auth/signup/ui/password/password_view.dart

@@ -1,13 +1,10 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_template/feature/auth/signup/bloc/signup_cubit.dart';
 
 class PasswordView extends StatelessWidget {
   final bool sessionExpiredRedirect;
   final TextEditingController _passwordController = TextEditingController();
-  final TextEditingController _confirmPasswordController =
-      TextEditingController();
 
   PasswordView({Key? key, this.sessionExpiredRedirect = false})
       : super(key: key);

lib/feature/auth/signup/ui/username/username_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_template/feature/auth/signup/ui/username/username_view.dart';
 
 class UsernamePage extends Page {

lib/feature/auth/signup/ui/username/username_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_template/feature/auth/router/auth_router_delegate.dart';
 import 'package:flutter_template/feature/auth/signup/bloc/signup_cubit.dart';

lib/feature/home/router/home_router_delegate.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_template/feature/home/router/home_nav_state.dart';
 import 'package:flutter_template/feature/home/task_detail/ui/task_detail_page.dart';

lib/feature/home/task_detail/ui/task_detail_page.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+
 import 'package:flutter_template/feature/home/task_detail/ui/task_detail_view.dart';
 import 'package:flutter_template/model/task/task.dart';
 

lib/feature/home/task_list/ui/task_list_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_template/data/repository/tasks/tasks_repository.dart';
 import 'package:flutter_template/di/service_locator.dart';

lib/feature/home/task_list/ui/task_list_view.dart

@@ -9,13 +9,9 @@ import 'package:flutter_template/feature/home/create_task/ui/create_task_view.da
 import 'package:flutter_template/feature/home/router/home_router_delegate.dart';
 import 'package:flutter_template/feature/home/task_list/bloc/task_list_bloc.dart';
 import 'package:flutter_template/log/log.dart';
-import 'package:flutter_template/model/task/task.dart';
-import 'package:flutter_template/model/task/task_group.dart';
-import 'package:flutter_template/model/task/task_status.dart';
 import 'package:flutter_template/resources/colors/color_palette.dart';
 import 'package:flutter_template/resources/styles/text_styles.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
-import 'package:provider/provider.dart';
 
 class TaskListView extends StatelessWidget {
   @override
@@ -219,7 +215,7 @@ class _TaskListItem extends StatelessWidget {
       child: ListTile(
         leading: Checkbox(
             checkColor: ColorPalette.black,
-            activeColor: Theme.of(context).accentColor,
+            activeColor: Theme.of(context).colorScheme.secondary,
             value: task.status == TaskStatus.done,
             onChanged: (newState) => onStatusChange(task, newState!)),
         trailing: Icon(Icons.reorder),

lib/feature/settings/preferences_helper.dart

@@ -31,7 +31,7 @@ class PreferencesHelper {
   }
 
   Future<String> _getPreferredLanguage() async {
-    final systemLocale = WidgetsBinding.instance!.window.locales.first;
+    final systemLocale = WidgetsBinding.instance.window.locales.first;
     final storedLanguageCode = await serviceLocator
         .get<Storage<String>>(instanceName: preferredLocalizationKey)
         .get();

lib/feature/settings/ui/widget/settings_language_widget.dart

@@ -21,20 +21,20 @@ class _SettingsLanguageWidgetState extends State<SettingsLanguageWidget>
 
   @override
   void initState() {
-    WidgetsBinding.instance?.addObserver(this); // Subscribe to changes
+    WidgetsBinding.instance.addObserver(this); // Subscribe to changes
     super.initState();
     selectedLanguage = widget.selectedLanguage;
   }
 
   @override
   void didChangeLocales(List<Locale>? locales) {
     setUpSelectedLanguage(
-        context, WidgetsBinding.instance!.window.locales.first.languageCode);
+        context, WidgetsBinding.instance.window.locales.first.languageCode);
   }
 
   @override
   void dispose() {
-    WidgetsBinding.instance?.removeObserver(this);
+    WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
 
@@ -58,7 +58,7 @@ class _SettingsLanguageWidgetState extends State<SettingsLanguageWidget>
                   ),
                   Radio<String>(
                     activeColor: Theme.of(context).brightness == Brightness.dark
-                        ? Theme.of(context).accentColor
+                        ? Theme.of(context).colorScheme.secondary
                         : Theme.of(context).primaryColorDark,
                     value: EN.languageCode,
                     groupValue: selectedLanguage,
@@ -86,7 +86,7 @@ class _SettingsLanguageWidgetState extends State<SettingsLanguageWidget>
                   ),
                   Radio<String>(
                     activeColor: Theme.of(context).brightness == Brightness.dark
-                        ? Theme.of(context).accentColor
+                        ? Theme.of(context).colorScheme.secondary
                         : Theme.of(context).primaryColorDark,
                     value: MK.languageCode,
                     groupValue: selectedLanguage,

lib/feature/settings/ui/widget/settings_theme_switch_widget.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_template/resources/theme/theme_change_notifier.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -39,7 +38,7 @@ class _SettingsThemeSwitchState extends State<SettingsThemeSwitch> {
               ),
             ),
             Switch.adaptive(
-              activeColor: Theme.of(context).accentColor,
+              activeColor: Theme.of(context).colorScheme.secondary,
               value: isDarkTheme,
               onChanged: (val) => toggleBrightness(context, val),
             ),

lib/log/file_logger.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:core';
 import 'dart:io';