Version 0.9.9

Bump FCS package and deprecated Flutter SDK updates.
rydmike · Jul 20, 2023 · 6316cb7 · 6316cb7
1 parent 26a85bf
commit 6316cb7
Show file tree

Hide file tree

Showing 12 changed files with 1,361 additions and 925 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to the **ThemeDemo** application are documented here.
 
+## 0.9.9
+
+**July 20, 2023**
+
+* Chore: Bump all dependencies, now using FlexColorScheme 7.2.0
+* Chore: Fix deprecated Flutter SDK APIs.
+* Chore: Bump MaterialShowcase to the same version as the one used by Themes Playground in FlexColorScheme 7.2.0.
+
 ## 0.9.8
 
 **May 17, 2023**

diff --git a/lib/bottomsheet/views/bottom_sheet_settings.dart b/lib/bottomsheet/views/bottom_sheet_settings.dart
@@ -62,8 +62,8 @@ class BottomSheetSettings extends ConsumerWidget {
                 // Hide the extra dark mode controls in light theme mode.
                 AnimatedHide(
                   hide: isLight,
-                  child: Column(
-                    children: const <Widget>[
+                  child: const Column(
+                    children: <Widget>[
                       DarkIsTrueBlackSwitch(),
                       DarkComputeThemeSwitch(),
                       DarkLevelSlider(),

diff --git a/lib/core/constants/app_const.dart b/lib/core/constants/app_const.dart
@@ -8,13 +8,13 @@ class AppConst {
   static const String appName = 'ThemeDemo';
 
   /// Current app version.
-  static const String version = '0.9.8';
+  static const String version = '0.9.9';
 
   /// Used version of FlexColorScheme package.
-  static const String packageVersion = '7.1.2';
+  static const String packageVersion = '7.2.0';
 
   /// Build with Flutter version.
-  static const String flutterVersion = 'Channel stable v3.10.0';
+  static const String flutterVersion = 'Channel stable v3.10.6';
 
   /// Copyright years notice.
   static const String copyright = '© 2021-2023';

diff --git a/lib/core/utils/drawer_width.dart b/lib/core/utils/drawer_width.dart
@@ -8,8 +8,11 @@ import 'package:flutter/material.dart';
 /// * Is never less than 244 dp wide.
 /// * Will fill max width if screen is less than 244 dp wide.
 double drawerWidth() {
-  final double screenWidth =
-      MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width;
+  final double physicalWidth =
+      WidgetsBinding.instance.platformDispatcher.views.first.physicalSize.width;
+  final double devicePixelRatio =
+      WidgetsBinding.instance.platformDispatcher.views.first.devicePixelRatio;
+  final double screenWidth = physicalWidth / devicePixelRatio;
 
   /// Drawer, minimum none covered space when screen width is > 300 dp .
   const double minNotUsedSpace = 56; // This is spec in M2.

diff --git a/lib/core/views/widgets/universal/colored_text.dart b/lib/core/views/widgets/universal/colored_text.dart
@@ -288,7 +288,7 @@ class ColoredText extends StatelessWidget {
         color: color ?? Theme.of(context).colorScheme.primary,
       ),
     );
-    if (MediaQuery.boldTextOverride(context)) {
+    if (MediaQuery.boldTextOf(context)) {
       effectiveTextStyle = effectiveTextStyle
           .merge(const TextStyle(fontWeight: FontWeight.bold));
     }

diff --git a/lib/home/views/pages/home_page.dart b/lib/home/views/pages/home_page.dart
@@ -74,6 +74,13 @@ class _MyHomePageState extends ConsumerState<HomePage> {
         actions: const <Widget>[AboutIconButton()],
       ),
       drawer: const AppDrawer(),
+      bottomNavigationBar: NavigationBar(
+        destinations: const <Widget>[
+          NavigationDestination(
+              icon: Icon(Icons.access_alarm_outlined), label: 'Alarm'),
+          NavigationDestination(icon: Icon(Icons.settings), label: 'Settings')
+        ],
+      ),
       // This annotated region will change the Android system navigation bar to
       // a theme color, matching active theme mode and FlexColorScheme theme.
       body: AnnotatedRegion<SystemUiOverlayStyle>(

diff --git a/lib/home/views/widgets/theme_settings.dart b/lib/home/views/widgets/theme_settings.dart
@@ -66,8 +66,8 @@ class ThemeSettings extends ConsumerWidget {
         ),
         AnimatedHide(
           hide: !useSubThemes,
-          child: Column(
-            children: const <Widget>[
+          child: const Column(
+            children: <Widget>[
               ListTile(
                 title: Text('Global border radius on components'),
                 subtitle: Text(

diff --git a/lib/settings/views/widgets/surface_mode_widgets.dart b/lib/settings/views/widgets/surface_mode_widgets.dart
@@ -235,11 +235,11 @@ List<Widget> _getModeWidget(ColorScheme scheme, [bool allModes = true]) =>
         message: 'High surface\nlow scaffold',
         child: Icon(Icons.layers),
       ),
-      Tooltip(
+      const Tooltip(
         message: 'High scaffold\nlow surface',
         child: Stack(
           alignment: Alignment.center,
-          children: const <Widget>[
+          children: <Widget>[
             Padding(
               padding: EdgeInsets.only(top: 10),
               child: Icon(Icons.layers_outlined),