Adjustments for flutter 2.8+

Author: leoafarias

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.5.3",
+  "flutterSdkVersion": "stable",
   "flavors": {}
 }

.vscode/settings.json

@@ -1,6 +1,11 @@
 {
-  "dart.flutterSdkPath":"/Users/leofarias/fvm/versions/stable",
+  "dart.flutterSdkPath": ".fvm/flutter_sdk",
+  // Remove .fvm files from search
   "search.exclude": {
     "**/.fvm": true
+  },
+  // Remove from file watching
+  "files.watcherExclude": {
+    "**/.fvm": true
   }
 }

lib/src/components/atoms/console.dart

@@ -66,13 +66,13 @@ class Console extends HookWidget {
                     children: [
                       Container(
                           width: MediaQuery.of(context).size.width - 100,
-                          child: ConsoleText(lines.value.first)
-                      ),
+                          child: ConsoleText(lines.value.first)),
                     ],
                   ),
                 ),
                 secondChild: CupertinoScrollbar(
                   child: ListView.builder(
+                    primary: false,
                     shrinkWrap: true,
                     reverse: true,
                     padding: const EdgeInsets.fromLTRB(20, 10, 20, 10),

lib/src/components/organisms/shortcut_manager.dart

@@ -33,7 +33,8 @@ class SkShortcutManager extends StatelessWidget {
       context.read(navigationProvider.notifier).goTo(route);
     }
 
-    return Shortcuts(
+    return FocusableActionDetector(
+      autofocus: true,
       shortcuts: <LogicalKeySet, Intent>{
         LogicalKeySet(
           LogicalKeyboardKey.metaLeft,
@@ -52,17 +53,11 @@ class SkShortcutManager extends StatelessWidget {
           LogicalKeyboardKey.keyF,
         ): const NavigationIntent(route: NavigationRoutes.searchScreen),
       },
-      child: Actions(
-        actions: <Type, Action<Intent>>{
-          NavigationIntent: CallbackAction<NavigationIntent>(
-              onInvoke: (intent) => handleRouteChange(intent.route)),
-        },
-        child: Focus(
-          autofocus: true,
-          focusNode: focusNode,
-          child: child,
-        ),
-      ),
+      actions: <Type, Action<Intent>>{
+        NavigationIntent: CallbackAction<NavigationIntent>(
+            onInvoke: (intent) => handleRouteChange(intent.route)),
+      },
+      child: child,
     );
   }
 }

lib/src/modules/common/app_shell.dart

@@ -5,8 +5,10 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:i18next/i18next.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:sidekick/src/components/organisms/app_bottom_bar.dart';
 import 'package:sidekick/src/modules/common/utils/indexed_transition_switcher.dart';
 import 'package:sidekick/src/modules/search/components/search_bar.dart';
+import 'package:sidekick/src/modules/selected_detail/components/info_drawer.dart';
 
 import '../../components/molecules/top_app_bar.dart';
 import '../../components/organisms/shortcut_manager.dart';
@@ -85,8 +87,8 @@ class AppShell extends HookWidget {
       focusNode: focusNode,
       child: Scaffold(
         appBar: const SkAppBar(),
-        // bottomNavigationBar: const AppBottomBar(),
-        // endDrawer: const SelectedDetailDrawer(),
+        bottomNavigationBar: const AppBottomBar(),
+        endDrawer: const SelectedDetailDrawer(),
         backgroundColor: platformBackgroundColor(context),
         key: _scaffoldKey,
         body: Row(

lib/src/modules/fvm/fvm.provider.dart

@@ -59,7 +59,6 @@ class FvmCacheProvider extends StateNotifier<List<CacheVersion>> {
     // Load State again while listening to directory
     directoryWatcher = Watcher(
       FVMClient.context.cacheDir.path,
-      pollingDelay: Duration(seconds: 20),
     ).events.listen((event) {
       if (event.type == ChangeType.ADD || event.type == ChangeType.REMOVE) {
         _debouncer.run(reloadState);

lib/src/modules/releases/releases.screen.dart

@@ -25,6 +25,7 @@ class ReleasesScreen extends HookWidget {
       extendBody: false,
       title: I18Next.of(context).t('modules:releases.releases'),
       child: CustomScrollView(
+        primary: false,
         slivers: [
           SliverToBoxAdapter(
             child: AnimatedContainer(
@@ -143,9 +144,12 @@ class ReleasesScreen extends HookWidget {
             ),
           ),
           SliverList(
-            delegate: SliverChildBuilderDelegate((context, index) {
-              return ReleaseListItem(versions[index]);
-            }, childCount: versions.length),
+            delegate: SliverChildBuilderDelegate(
+              (context, index) {
+                return ReleaseListItem(versions[index]);
+              },
+              childCount: versions.length,
+            ),
           ),
         ],
       ),

pubspec.lock

@@ -492,13 +492,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.2"
   material_design_icons_flutter:
     dependency: "direct main"
     description:
@@ -832,7 +825,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.3"
   timing:
     dependency: transitive
     description: