Merge pull request #44 from wednesday-solutions/update_lib_and_configs

Update lib and configs. Remove deprecated code.

.metadata

@@ -1,10 +1,36 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 77d935af4db863f6abd0b9c31c7e6df2a13de57b
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: linux
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: macos
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: windows
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

.vscode/launch.json

@@ -4,17 +4,74 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-
     {
-      "name": "flutter_template",
+      "name": "dev",
       "request": "launch",
-      "type": "dart"
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=dev"],
+      "args": ["--flavor=dev"]
+    },
+    {
+      "name": "dev-profile",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=dev"],
+      "args": ["--flavor=dev"],
+      "flutterMode": "profile"
+    },
+    {
+      "name": "dev-release",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=dev"],
+      "args": ["--flavor=dev"],
+      "flutterMode": "release"
+    },
+    {
+      "name": "qa",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=qa"],
+      "args": ["--flavor=qa"]
     },
     {
-      "name": "flutter_template (profile mode)",
+      "name": "qa-profile",
       "request": "launch",
       "type": "dart",
+      "toolArgs": ["--dart-define=flavor=qa"],
+      "args": ["--flavor=qa"],
       "flutterMode": "profile"
+    },
+    {
+      "name": "qa-release",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=qa"],
+      "args": ["--flavor=qa"],
+      "flutterMode": "release"
+    },
+    {
+      "name": "prod",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=prod"],
+      "args": ["--flavor=prod"]
+    },
+    {
+      "name": "prod-profile",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=prod"],
+      "args": ["--flavor=prod"],
+      "flutterMode": "profile"
+    },
+    {
+      "name": "prod-release",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": ["--dart-define=flavor=prod"],
+      "args": ["--flavor=prod"],
+      "flutterMode": "release"
     }
   ]
-}
+}

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip

lib/foundation/logger/logger.dart

@@ -12,7 +12,7 @@ class LogHelper {
       final logger = Logger(
         filter: _FlutterTemplateLogFilter(),
         printer: PrettyPrinter(printEmojis: false),
-        level: Level.verbose,
+        level: Level.trace,
       );
 
       _instance = logger;

lib/navigation/base/app_router.dart

@@ -14,10 +14,7 @@ part 'app_router.gr.dart';
 class AppRouter extends _$AppRouter {
   @override
   List<AutoRoute> get routes => [
-        AutoRoute(
-          path: HomeScreen.path,
-          page: HomeRoute.page,
-        ),
+        AutoRoute(path: HomeScreen.path, page: HomeRoute.page, initial: true),
         AutoRoute(
           path: SearchScreen.path,
           page: SearchRoute.page,

lib/presentation/destinations/weather/home/home_page.dart

@@ -17,7 +17,7 @@ class HomePage extends ConsumerWidget {
 
   const HomePage({
     Key? key,
-    required this.homeScreen,
+    this.homeScreen = const HomeScreen(),
   }) : super(key: key);
 
   @override

lib/presentation/intl/translations/translation_loader.dart

@@ -10,7 +10,7 @@ class CodegenLoader extends AssetLoader {
   const CodegenLoader();
 
   @override
-  Future<Map<String, dynamic>> load(String fullPath, Locale locale) {
+  Future<Map<String, dynamic>?> load(String path, Locale locale) {
     return Future.value(mapLocales[locale.toString()]);
   }
 

lib/presentation/template_app.dart

@@ -1,15 +1,11 @@
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_template/flavors/flavor.dart';
-import 'package:flutter_template/flavors/flavor_config.dart';
 import 'package:flutter_template/navigation/base/app_router.dart';
 import 'package:flutter_template/presentation/base/theme/theme_data/template_app_theme_data.dart';
 import 'package:flutter_template/presentation/base/widgets/snackbar/snackbar.dart';
 import 'package:flutter_template/presentation/base/widgets/theme/theme_listener.dart';
-import 'package:flutter_template/presentation/destinations/weather/home/home_screen.dart';
 import 'package:get_it/get_it.dart';
 
 class TemplateApp extends StatelessWidget {
@@ -19,11 +15,6 @@ class TemplateApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    const enableDevicePreview =
-        String.fromEnvironment("enableDevicePreview") == "true";
-    final useDevicePreview =
-        enableDevicePreview && kDebugMode && FlavorConfig.flavor == Flavor.dev;
-
     return ProviderScope(
       child: ThemeStateListener(
         builder: (themeState) => DynamicColorBuilder(
@@ -35,13 +26,10 @@ class TemplateApp extends StatelessWidget {
                 ? buildTheme(darkDynamic.harmonized())
                 : material3DarkTheme;
             return MaterialApp.router(
-              useInheritedMediaQuery: useDevicePreview,
               theme: lightTheme,
               darkTheme: darkTheme,
               themeMode: themeState.themeMode,
-              routerDelegate: _appRouter.delegate(
-                initialRoutes: [HomeRoute(homeScreen: const HomeScreen())],
-              ),
+              routerDelegate: _appRouter.delegate(),
               routeInformationParser: _appRouter.defaultRouteParser(),
               localizationsDelegates: context.localizationDelegates,
               supportedLocales: context.supportedLocales,