Merge pull request #473 from stryder-dev/Update-to-flutter-3.29.0

Update to flutter 3.29.0

Author: aqwert

.fvm/flutter_sdk

@@ -0,0 +1 @@
+/Users/lancejohnstone/fvm/versions/3.24.0

.fvm/fvm_config.json

@@ -0,0 +1,4 @@
+{
+  "flutterSdkVersion": "3.24.0",
+  "flavors": {}
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [8.0.0]
+
+#### (Flutter version support: v3.29.0)
+
+- Adds all the flutter 3.29 additional properties for platform widgets
+- Removed deprecated parameters
+
 ## [7.0.1]
 
 #### (Flutter version support: v3.19.6)

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -50,6 +50,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/lib/cupertino_date_picker.dart

@@ -153,17 +153,17 @@ class _CustomCupertinoDatePicker extends StatelessWidget {
   const _CustomCupertinoDatePicker({
     required this.contentData,
     required this.onDateTimeChanged,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.data,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.modalColor,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.modalHeight = 300,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.mode = CupertinoDatePickerMode.date,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.doneLabel,
-    // ignore: unused_element
+    // ignore: unused_element_parameter
     this.cancelLabel,
     Key? key,
   }) : super(key: key);

lib/src/platform.dart

@@ -228,6 +228,7 @@ class MaterialModalSheetData extends _ModalSheetBaseData {
   String? barrierLabel;
   double? scrollControlDisabledMaxHeightRatio;
   bool? showDragHandle;
+  AnimationStyle? sheetAnimationStyle;
 
   MaterialModalSheetData({
     super.anchorPoint,
@@ -247,6 +248,7 @@ class MaterialModalSheetData extends _ModalSheetBaseData {
     this.barrierLabel,
     this.scrollControlDisabledMaxHeightRatio,
     this.showDragHandle,
+    this.sheetAnimationStyle,
   });
 }
 
@@ -300,6 +302,7 @@ Future<T?> showPlatformModalSheet<T>({
           material?.scrollControlDisabledMaxHeightRatio ??
               _defaultScrollControlDisabledMaxHeightRatio,
       showDragHandle: material?.showDragHandle,
+      sheetAnimationStyle: material?.sheetAnimationStyle,
     );
   } else {
     return showCupertinoModalPopup<T>(

lib/src/platform_app.dart

@@ -108,16 +108,13 @@ abstract class _BaseRouterData {
     this.shortcuts,
     this.actions,
     this.onGenerateInitialRoutes,
-    // ignore: unused_element
     this.highContrastDarkTheme,
-    // ignore: unused_element
     this.highContrastTheme,
     this.routeInformationProvider,
     this.routeInformationParser,
     this.routerDelegate,
     this.routerConfig,
     this.backButtonDispatcher,
-    // ignore: unused_element
     this.restorationScopeId,
     this.scrollBehavior,
     this.onNavigationNotification,
@@ -197,6 +194,8 @@ class MaterialAppData extends _BaseData {
     super.restorationScopeId,
     super.scrollBehavior,
     super.onNavigationNotification,
+    super.highContrastDarkTheme,
+    super.highContrastTheme,
     this.theme,
     this.debugShowMaterialGrid,
     this.darkTheme,
@@ -243,6 +242,10 @@ class MaterialAppRouterData extends _BaseRouterData {
     super.onGenerateInitialRoutes,
     super.scrollBehavior,
     super.onNavigationNotification,
+    super.restorationScopeId,
+    super.backButtonDispatcher,
+    super.highContrastDarkTheme,
+    super.highContrastTheme,
     this.theme,
     this.debugShowMaterialGrid,
     this.darkTheme,

lib/src/platform_app_bar.dart

@@ -33,13 +33,15 @@ abstract class _BaseData {
     this.backgroundColor,
     this.leading,
     this.automaticallyImplyLeading,
+    this.bottom,
   });
 
   final Widget? title;
   final Color? backgroundColor;
   final Widget? leading;
   final Key? widgetKey;
   final bool? automaticallyImplyLeading;
+  final PreferredSizeWidget? bottom;
 }
 
 class MaterialAppBarData extends _BaseData {
@@ -49,8 +51,8 @@ class MaterialAppBarData extends _BaseData {
     super.leading,
     super.widgetKey,
     super.automaticallyImplyLeading,
+    super.bottom,
     this.actions,
-    this.bottom,
     this.bottomOpacity,
     this.centerTitle,
     this.elevation,
@@ -74,11 +76,10 @@ class MaterialAppBarData extends _BaseData {
     this.notificationPredicate,
     this.clipBehavior,
     this.forceMaterialTransparency,
+    this.actionsPadding,
   });
 
   final List<Widget>? actions;
-  final PreferredSizeWidget? bottom;
-
   final double? bottomOpacity;
   final bool? centerTitle;
   final double? elevation;
@@ -102,6 +103,7 @@ class MaterialAppBarData extends _BaseData {
   final ScrollNotificationPredicate? notificationPredicate;
   final Clip? clipBehavior;
   final bool? forceMaterialTransparency;
+  final EdgeInsetsGeometry? actionsPadding;
 }
 
 class CupertinoNavigationBarData extends _BaseData {
@@ -111,6 +113,8 @@ class CupertinoNavigationBarData extends _BaseData {
     super.leading,
     super.widgetKey,
     super.automaticallyImplyLeading,
+    super.bottom,
+    this.automaticBackgroundVisibility,
     this.previousPageTitle,
     this.automaticallyImplyMiddle,
     this.padding,
@@ -120,6 +124,7 @@ class CupertinoNavigationBarData extends _BaseData {
     this.brightness,
     this.heroTag,
     this.noMaterialParent = false,
+    this.enableBackgroundFilterBlur,
   });
 
   final Widget? trailing;
@@ -130,6 +135,8 @@ class CupertinoNavigationBarData extends _BaseData {
   final String? previousPageTitle;
   final EdgeInsetsDirectional? padding;
   final Brightness? brightness;
+  final bool? automaticBackgroundVisibility;
+  final bool? enableBackgroundFilterBlur;
 
   /// When enabling [iosUsesMaterialWidgets] on [PlatformProvider] settings it will
   /// add a Material widget as a parent to both the leading and trailing widgets.
@@ -146,6 +153,7 @@ class PlatformAppBar
   final Widget? leading;
   final List<Widget>? trailingActions;
   final bool? automaticallyImplyLeading;
+  final PreferredSizeWidget? bottom;
 
   final PlatformBuilder<MaterialAppBarData>? material;
   final PlatformBuilder<CupertinoNavigationBarData>? cupertino;
@@ -158,6 +166,7 @@ class PlatformAppBar
     this.leading,
     this.trailingActions,
     this.automaticallyImplyLeading,
+    this.bottom,
     this.material,
     this.cupertino,
   });
@@ -170,7 +179,7 @@ class PlatformAppBar
       key: data?.widgetKey ?? widgetKey,
       title: data?.title ?? title,
       backgroundColor: data?.backgroundColor ?? backgroundColor,
-      bottom: data?.bottom,
+      bottom: data?.bottom ?? bottom,
       actions: data?.actions ?? trailingActions,
       automaticallyImplyLeading:
           data?.automaticallyImplyLeading ?? automaticallyImplyLeading ?? true,
@@ -199,6 +208,7 @@ class PlatformAppBar
           data?.notificationPredicate ?? defaultScrollNotificationPredicate,
       clipBehavior: data?.clipBehavior,
       forceMaterialTransparency: data?.forceMaterialTransparency ?? false,
+      actionsPadding: data?.actionsPadding,
     );
   }
 
@@ -241,6 +251,10 @@ class PlatformAppBar
         transitionBetweenRoutes: data?.transitionBetweenRoutes ?? true,
         brightness: data?.brightness,
         heroTag: heroTag,
+        automaticBackgroundVisibility:
+            data?.automaticBackgroundVisibility ?? true,
+        bottom: data?.bottom ?? bottom,
+        enableBackgroundFilterBlur: data?.enableBackgroundFilterBlur ?? true,
       );
     }
 
@@ -262,6 +276,10 @@ class PlatformAppBar
           .withWidgetFinder<CupertinoNavigationBar>(),
       transitionBetweenRoutes: data?.transitionBetweenRoutes ?? true,
       brightness: data?.brightness,
+      automaticBackgroundVisibility:
+          data?.automaticBackgroundVisibility ?? true,
+      bottom: data?.bottom,
+      enableBackgroundFilterBlur: data?.enableBackgroundFilterBlur ?? true,
       //heroTag: , used above
     );
   }

lib/src/platform_checkbox.dart

@@ -6,7 +6,7 @@
 
 import 'package:flutter/cupertino.dart' show CupertinoCheckbox;
 import 'package:flutter/material.dart'
-    show Checkbox, MaterialTapTargetSize, MaterialStateProperty, VisualDensity;
+    show Checkbox, MaterialTapTargetSize, VisualDensity;
 import 'package:flutter/widgets.dart';
 
 import 'platform.dart';
@@ -25,6 +25,9 @@ abstract class _BaseData {
     this.autofocus,
     this.shape,
     this.side,
+    this.mouseCursor,
+    this.fillColor,
+    this.semanticLabel,
   });
   final Key? widgetKey;
   final bool? value;
@@ -37,6 +40,9 @@ abstract class _BaseData {
   final bool? autofocus;
   final OutlinedBorder? shape;
   final BorderSide? side;
+  final MouseCursor? mouseCursor;
+  final WidgetStateProperty<Color?>? fillColor;
+  final String? semanticLabel;
 }
 
 class MaterialCheckboxData extends _BaseData {
@@ -53,27 +59,25 @@ class MaterialCheckboxData extends _BaseData {
     super.autofocus,
     super.shape,
     super.side,
+    super.mouseCursor,
+    super.fillColor,
+    super.semanticLabel,
     //Material
-    this.mouseCursor,
-    this.fillColor,
+
     this.hoverColor,
     this.overlayColor,
     this.splashRadius,
     this.materialTapTargetSize,
     this.visualDensity,
     this.isError = false,
-    this.semanticLabel,
   });
 
-  final MouseCursor? mouseCursor;
-  final MaterialStateProperty<Color?>? fillColor;
   final Color? hoverColor;
-  final MaterialStateProperty<Color?>? overlayColor;
+  final WidgetStateProperty<Color?>? overlayColor;
   final double? splashRadius;
   final MaterialTapTargetSize? materialTapTargetSize;
   final VisualDensity? visualDensity;
   final bool isError;
-  final String? semanticLabel;
 }
 
 class CupertinoCheckboxData extends _BaseData {
@@ -90,12 +94,10 @@ class CupertinoCheckboxData extends _BaseData {
     super.autofocus,
     super.shape,
     super.side,
-
-    //Cupertino
-    this.inactiveColor,
+    super.mouseCursor,
+    super.fillColor,
+    super.semanticLabel,
   });
-
-  final Color? inactiveColor;
 }
 
 class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
@@ -111,6 +113,9 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
   final bool autofocus;
   final OutlinedBorder? shape;
   final BorderSide? side;
+  final MouseCursor? mouseCursor;
+  final WidgetStateProperty<Color?>? fillColor;
+  final String? semanticLabel;
 
   //Platform
   final PlatformBuilder<MaterialCheckboxData>? material;
@@ -130,6 +135,9 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
     this.autofocus = false,
     this.shape,
     this.side,
+    this.mouseCursor,
+    this.fillColor,
+    this.semanticLabel,
     //Platform
     this.material,
     this.cupertino,
@@ -143,8 +151,6 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
     assert(tristate || value != null);
     return Checkbox(
       //Material
-      mouseCursor: data?.mouseCursor,
-      fillColor: data?.fillColor,
       hoverColor: data?.hoverColor,
       overlayColor: data?.overlayColor,
       splashRadius: data?.splashRadius,
@@ -163,7 +169,9 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
       autofocus: data?.autofocus ?? autofocus,
       shape: data?.shape ?? shape,
       side: data?.side ?? side,
-      semanticLabel: data?.semanticLabel,
+      mouseCursor: data?.mouseCursor ?? mouseCursor,
+      fillColor: data?.fillColor ?? fillColor,
+      semanticLabel: data?.semanticLabel ?? semanticLabel,
     );
   }
 
@@ -175,7 +183,7 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
     assert(tristate || value != null);
     return CupertinoCheckbox(
       //Cupertino
-      inactiveColor: data?.inactiveColor,
+      // inactiveColor: Deprecated
       //Common
       key: data?.widgetKey ?? widgetKey,
       value: value,
@@ -188,6 +196,9 @@ class PlatformCheckbox extends PlatformWidgetBase<CupertinoCheckbox, Checkbox> {
       autofocus: data?.autofocus ?? autofocus,
       shape: data?.shape ?? shape,
       side: data?.side ?? side,
+      fillColor: data?.fillColor ?? fillColor,
+      mouseCursor: data?.mouseCursor ?? mouseCursor,
+      semanticLabel: data?.semanticLabel ?? semanticLabel,
     );
   }
 }