Migrate to Flutter 3.10 & Dart 3.0 (#342)

* Migrate to Flutter 3.10 & Dart 3.0

* Restore 16px horizontal padding for buttons

* Merge commonButtonStyle with type-specific button styles

* Swap button style merge the other way around

Use the common properties as defaults and let the type-specific
properties override to avoid surprises.

Author: jpnurmi

.github/workflows/flutter-ci.yml

@@ -53,7 +53,7 @@ jobs:
         channel: 'stable'
 
     - name: Check for any formatting issues
-      run: flutter format --set-exit-if-changed .
+      run: dart format --set-exit-if-changed .
 
   pub:
     runs-on: ubuntu-20.04

example/lib/view/controls_view.dart

@@ -227,10 +227,10 @@ class _ControlsViewState extends State<ControlsView>
                         ],
                       ),
                     ),
-                    Padding(
-                      padding: const EdgeInsets.all(12.0),
+                    const Padding(
+                      padding: EdgeInsets.all(12.0),
                       child: Row(
-                        children: const [
+                        children: [
                           DropdownMenu(
                             dropdownMenuEntries: [
                               DropdownMenuEntry(value: 1, label: '1'),
@@ -407,17 +407,17 @@ class _ControlsViewState extends State<ControlsView>
                         const Text('No'),
                       ],
                     ),
-                    Row(
-                      children: const <Widget>[
+                    const Row(
+                      children: <Widget>[
                         Switch(
                           value: true,
                           onChanged: null,
                         ),
                         Text('Disabled Yes'),
                       ],
                     ),
-                    Row(
-                      children: const <Widget>[
+                    const Row(
+                      children: <Widget>[
                         Switch(
                           value: false,
                           onChanged: null,
@@ -428,17 +428,17 @@ class _ControlsViewState extends State<ControlsView>
                   ],
                 ),
               ),
-              Column(
+              const Column(
                 children: [
                   Padding(
-                    padding: const EdgeInsets.all(18.0),
+                    padding: EdgeInsets.all(18.0),
                     child: Row(
-                      children: const [
+                      children: [
                         CircularProgressIndicator(),
                       ],
                     ),
                   ),
-                  const Padding(
+                  Padding(
                     padding: EdgeInsets.all(18.0),
                     child: LinearProgressIndicator(),
                   ),

example/pubspec.yaml

@@ -4,7 +4,8 @@ publish_to: "none"
 version: 1.0.0
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   flutter:

lib/src/themes/common_themes.dart

@@ -99,7 +99,10 @@ const _tooltipThemeData = TooltipThemeData(
 
 // Buttons
 
-const _commonButtonStyle = ButtonStyle(visualDensity: VisualDensity.standard);
+const _commonButtonStyle = ButtonStyle(
+  visualDensity: VisualDensity.standard,
+  padding: MaterialStatePropertyAll(EdgeInsets.symmetric(horizontal: 16)),
+);
 
 final _buttonThemeData = ButtonThemeData(
   shape: RoundedRectangleBorder(
@@ -117,13 +120,12 @@ OutlinedButtonThemeData _createOutlinedButtonTheme(
             ? colorScheme.outlineVariant
             : colorScheme.outline,
       ),
-      visualDensity: _commonButtonStyle.visualDensity,
       // backgroundColor: colorScheme.surface, // defaults to transparent
       foregroundColor: colorScheme.onSurface,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(kButtonRadius),
       ),
-    ),
+    ).merge(_commonButtonStyle),
   );
 }
 
@@ -134,11 +136,10 @@ TextButtonThemeData _createTextButtonTheme(
     style: TextButton.styleFrom(
       iconColor: colorScheme.primary,
       foregroundColor: colorScheme.primary,
-      visualDensity: _commonButtonStyle.visualDensity,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(kButtonRadius),
       ),
-    ),
+    ).merge(_commonButtonStyle),
   );
 }
 
@@ -151,7 +152,6 @@ ElevatedButtonThemeData _createElevatedButtonTheme({
     style: ElevatedButton.styleFrom(
       backgroundColor: color,
       foregroundColor: textColor ?? contrastColor(color),
-      visualDensity: _commonButtonStyle.visualDensity,
       elevation: 0,
       shadowColor: Colors.transparent,
       shape: RoundedRectangleBorder(
@@ -160,7 +160,7 @@ ElevatedButtonThemeData _createElevatedButtonTheme({
             : BorderSide.none,
         borderRadius: BorderRadius.circular(kButtonRadius),
       ),
-    ),
+    ).merge(_commonButtonStyle),
   );
 }
 
@@ -173,7 +173,6 @@ FilledButtonThemeData _createFilledButtonTheme(
       backgroundColor: colorScheme.onSurface.withOpacity(0.1),
       surfaceTintColor: colorScheme.onSurface.withOpacity(0.1),
       foregroundColor: colorScheme.onSurface,
-      visualDensity: _commonButtonStyle.visualDensity,
       elevation: 0,
       shadowColor: Colors.transparent,
       shape: RoundedRectangleBorder(
@@ -182,7 +181,7 @@ FilledButtonThemeData _createFilledButtonTheme(
             : BorderSide.none,
         borderRadius: BorderRadius.circular(kButtonRadius),
       ),
-    ),
+    ).merge(_commonButtonStyle),
   );
 }
 

pubspec.yaml

@@ -7,8 +7,8 @@ homepage: https://github.com/ubuntu/yaru.dart
 issue_tracker: https://github.com/ubuntu/yaru.dart/issues
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=3.7.0-0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 platforms:
   android:
@@ -19,18 +19,18 @@ platforms:
   windows:
 
 dependencies:
-  collection: ^1.16.0
+  collection: ^1.17.0
   flutter:
     sdk: flutter
   gtk: ^2.0.0
   platform: ^3.1.0
 
 dev_dependencies:
   build_runner: ^2.1.10
-  flutter_lints: ^1.0.4
+  flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-  mockito: ^5.1.0
+  mockito: ^5.4.0
 
 flutter:
   fonts:

test/settings_test.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in yaru/test/settings_test.dart.
 // Do not manually edit this file.
 

test/widget_test.dart

@@ -214,7 +214,6 @@ extension ThemeTester on WidgetTester {
       MaterialApp(
         key: ValueKey(data),
         home: YaruTheme(
-          child: Container(),
           data: data,
           platform: FakePlatform(
             operatingSystem: Platform.linux,
@@ -224,6 +223,7 @@ extension ThemeTester on WidgetTester {
             },
           ),
           settings: settings,
+          child: Container(),
         ),
       ),
     );

test/widget_test.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in yaru/test/widget_test.dart.
 // Do not manually edit this file.