Merge pull request #456 from stryder-dev/Update-to-flutter-3.19.6

Update to flutter 3.19.6

Author: aqwert

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [7.0.0]
+
+#### (Flutter version support: v3.19.6)
+
+- Adds all the flutter 3.19 additional properties for platform widgets
+- Updated cupertino_icons to version 1.0.8
+- Added deprecation notice on switching between material 2 and material 3. Calling these has no effect and the method calls will be removed in a furture version
+
 ## [6.1.0]
 
 #### (Flutter version support: v3.16.8)

example/ios/Runner.xcodeproj/project.pbxproj

@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/lib/platform_page.dart.dart

@@ -36,22 +36,7 @@ class PlatformPage extends StatelessWidget {
                         : p.changeToMaterialPlatform();
                   }),
             ),
-            if (isMaterial(context))
-              Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: PlatformElevatedButton(
-                    child: PlatformText(
-                        'Change to Material${Theme.of(context).useMaterial3 ? "" : " 3"}'),
-                    onPressed: () {
-                      final isMaterial3 = Theme.of(context).useMaterial3;
 
-                      isMaterial3
-                          ? PlatformTheme.of(context)?.changeToMaterial2(
-                              applyToBothDarkAndLightTheme: true)
-                          : PlatformTheme.of(context)?.changeToMaterial3(
-                              applyToBothDarkAndLightTheme: true);
-                    }),
-              ),
             Padding(
               padding: const EdgeInsets.all(8.0),
               child: PlatformElevatedButton(

lib/src/platform.dart

@@ -19,6 +19,8 @@ import 'package:flutter/material.dart'
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 
+const double _defaultScrollControlDisabledMaxHeightRatio = 9.0 / 16.0;
+
 const Color _kModalBarrierColor = CupertinoDynamicColor.withBrightness(
   color: Color(0x33000000),
   darkColor: Color(0x7A000000),
@@ -223,6 +225,9 @@ class MaterialModalSheetData extends _ModalSheetBaseData {
   final AnimationController? transitionAnimationController;
   final BoxConstraints? constraints;
   final bool? useSafeArea;
+  String? barrierLabel;
+  double? scrollControlDisabledMaxHeightRatio;
+  bool? showDragHandle;
 
   MaterialModalSheetData({
     super.anchorPoint,
@@ -239,6 +244,9 @@ class MaterialModalSheetData extends _ModalSheetBaseData {
     this.transitionAnimationController,
     this.constraints,
     this.useSafeArea,
+    this.barrierLabel,
+    this.scrollControlDisabledMaxHeightRatio,
+    this.showDragHandle,
   });
 }
 
@@ -287,6 +295,11 @@ Future<T?> showPlatformModalSheet<T>({
       constraints: material?.constraints,
       anchorPoint: material?.anchorPoint,
       useSafeArea: material?.useSafeArea ?? false,
+      barrierLabel: material?.barrierLabel,
+      scrollControlDisabledMaxHeightRatio:
+          material?.scrollControlDisabledMaxHeightRatio ??
+              _defaultScrollControlDisabledMaxHeightRatio,
+      showDragHandle: material?.showDragHandle,
     );
   } else {
     return showCupertinoModalPopup<T>(

lib/src/platform_app.dart

@@ -204,6 +204,7 @@ class MaterialAppData extends _BaseData {
     this.scaffoldMessengerKey,
     this.themeAnimationCurve,
     this.themeAnimationDuration,
+    this.themeAnimationStyle,
   });
 
   final ThemeData? theme;
@@ -213,6 +214,7 @@ class MaterialAppData extends _BaseData {
   final GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey;
   final Curve? themeAnimationCurve;
   final Duration? themeAnimationDuration;
+  final AnimationStyle? themeAnimationStyle;
 }
 
 class MaterialAppRouterData extends _BaseRouterData {
@@ -248,6 +250,7 @@ class MaterialAppRouterData extends _BaseRouterData {
     this.scaffoldMessengerKey,
     this.themeAnimationCurve,
     this.themeAnimationDuration,
+    this.themeAnimationStyle,
   });
 
   final ThemeData? theme;
@@ -257,6 +260,7 @@ class MaterialAppRouterData extends _BaseRouterData {
   final GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey;
   final Curve? themeAnimationCurve;
   final Duration? themeAnimationDuration;
+  final AnimationStyle? themeAnimationStyle;
 }
 
 class CupertinoAppData extends _BaseData {
@@ -536,6 +540,7 @@ class PlatformApp extends PlatformWidgetBase<CupertinoApp, MaterialApp> {
             dataRouter?.themeAnimationDuration ?? kThemeAnimationDuration,
         onNavigationNotification:
             dataRouter?.onNavigationNotification ?? onNavigationNotification,
+        themeAnimationStyle: dataRouter?.themeAnimationStyle,
         // useInheritedMediaQuery: , Deprecated
       );
     } else {
@@ -602,6 +607,7 @@ class PlatformApp extends PlatformWidgetBase<CupertinoApp, MaterialApp> {
             data?.themeAnimationDuration ?? kThemeAnimationDuration,
         onNavigationNotification:
             data?.onNavigationNotification ?? onNavigationNotification,
+        themeAnimationStyle: data?.themeAnimationStyle,
         // useInheritedMediaQuery: , Deprecated
       );
     }

lib/src/platform_nav_bar.dart

@@ -14,6 +14,7 @@ import 'package:flutter/material.dart'
         NavigationBar,
         NavigationDestination,
         NavigationDestinationLabelBehavior,
+        MaterialStateProperty,
         Theme;
 import 'package:flutter/widgets.dart';
 
@@ -80,6 +81,7 @@ class MaterialNavigationBarData {
     this.selectedIndex,
     this.shadowColor,
     this.surfaceTintColor,
+    this.overlayColor,
   });
 
   final Key? widgetKey;
@@ -95,6 +97,7 @@ class MaterialNavigationBarData {
   final int? selectedIndex;
   final Color? shadowColor;
   final Color? surfaceTintColor;
+  final MaterialStateProperty<Color?>? overlayColor;
 }
 
 class MaterialNavBarData extends _BaseData {
@@ -224,6 +227,7 @@ class PlatformNavBar extends PlatformWidgetBase<CupertinoTabBar, Widget> {
       selectedIndex: selectedIndex,
       shadowColor: data?.shadowColor,
       surfaceTintColor: data?.surfaceTintColor,
+      overlayColor: data?.overlayColor,
     );
   }
 

lib/src/platform_popup_menu.dart

@@ -108,6 +108,8 @@ class MaterialPopupMenuData {
   final Color? shadowColor;
   final Color? surfaceTintColor;
   final Color? iconColor;
+  final AnimationStyle? popUpAnimationStyle;
+  final bool? useRootNavigator;
 
   MaterialPopupMenuData({
     this.key,
@@ -133,6 +135,8 @@ class MaterialPopupMenuData {
     this.shadowColor,
     this.surfaceTintColor,
     this.iconColor,
+    this.popUpAnimationStyle,
+    this.useRootNavigator,
   });
 }
 
@@ -302,6 +306,8 @@ class PlatformPopupMenu extends StatelessWidget {
       shadowColor: data?.shadowColor,
       surfaceTintColor: data?.surfaceTintColor,
       iconColor: data?.iconColor,
+      popUpAnimationStyle: data?.popUpAnimationStyle,
+      useRootNavigator: data?.useRootNavigator ?? false,
     );
   }
 }

lib/src/platform_search_bar.dart

@@ -11,7 +11,7 @@ import 'package:flutter/cupertino.dart'
         OverlayVisibilityMode,
         CupertinoIcons;
 import 'package:flutter/material.dart' show MaterialStateProperty, SearchBar;
-import 'package:flutter/services.dart' show TextCapitalization;
+import 'package:flutter/services.dart' show TextCapitalization, TextInputAction;
 import 'package:flutter/widgets.dart';
 
 import 'platform.dart';
@@ -24,12 +24,16 @@ abstract class _BaseData {
     this.focusNode,
     this.onTap,
     this.onChanged,
+    this.keyboardType,
+    this.autofocus,
   });
   final Key? widgetKey;
   final FocusNode? focusNode;
   final TextEditingController? controller;
   final void Function()? onTap;
   final ValueChanged<String>? onChanged;
+  final TextInputType? keyboardType;
+  final bool? autofocus;
 }
 
 class MaterialSearchBarData extends _BaseData {
@@ -40,6 +44,9 @@ class MaterialSearchBarData extends _BaseData {
     super.focusNode,
     super.onTap,
     super.onChanged,
+    super.autofocus,
+    super.keyboardType,
+
     //Material
     this.leading,
     this.trailing,
@@ -57,6 +64,7 @@ class MaterialSearchBarData extends _BaseData {
     this.hintText,
     this.onSubmitted,
     this.textCapitalization,
+    this.textInputAction,
   });
 
   // final String? hintText;
@@ -76,6 +84,7 @@ class MaterialSearchBarData extends _BaseData {
   final String? hintText;
   final ValueChanged<String>? onSubmitted;
   final TextCapitalization? textCapitalization;
+  final TextInputAction? textInputAction;
 }
 
 class CupertinoSearchBarData extends _BaseData {
@@ -86,12 +95,13 @@ class CupertinoSearchBarData extends _BaseData {
     super.focusNode,
     super.onTap,
     super.onChanged,
+    super.autofocus,
+    super.keyboardType,
 
     //Cupertino
     this.onSubmitted,
     this.decoration,
     this.borderRadius,
-    this.keyboardType,
     this.itemColor = CupertinoColors.secondaryLabel,
     this.itemSize = 20.0,
     this.prefixInsets = const EdgeInsetsDirectional.fromSTEB(6, 0, 0, 3),
@@ -103,9 +113,8 @@ class CupertinoSearchBarData extends _BaseData {
     this.restorationId,
     this.smartQuotesType,
     this.smartDashesType,
-    this.enableIMEPersonalizedLearning = true,
-    this.autofocus = false,
-    this.autocorrect = true,
+    this.enableIMEPersonalizedLearning,
+    this.autocorrect,
     this.enabled,
     this.padding,
     this.backgroundColor,
@@ -127,7 +136,6 @@ class CupertinoSearchBarData extends _BaseData {
   final ValueChanged<String>? onSubmitted;
   final BoxDecoration? decoration;
   final BorderRadius? borderRadius;
-  final TextInputType? keyboardType;
   final Color itemColor;
   final double itemSize;
   final EdgeInsetsGeometry prefixInsets;
@@ -140,9 +148,8 @@ class CupertinoSearchBarData extends _BaseData {
 
   final SmartQuotesType? smartQuotesType;
   final SmartDashesType? smartDashesType;
-  final bool enableIMEPersonalizedLearning;
-  final bool autofocus;
-  final bool autocorrect;
+  final bool? enableIMEPersonalizedLearning;
+  final bool? autocorrect;
   final bool? enabled;
   final EdgeInsetsGeometry? padding;
   final Color? backgroundColor;
@@ -161,6 +168,8 @@ class PlatformSearchBar
   final void Function()? onTap;
   final ValueChanged<String>? onChanged;
   final Color? backgroundColor;
+  final TextInputType? keyboardType;
+  final bool? autoFocus;
 
   //Mixed
   final String? hintText;
@@ -180,6 +189,8 @@ class PlatformSearchBar
     this.onTap,
     this.onChanged,
     this.backgroundColor,
+    this.keyboardType,
+    this.autoFocus,
     //Mixed
     this.hintText,
     this.hintStyle,
@@ -216,6 +227,8 @@ class PlatformSearchBar
           (textStyle != null
               ? MaterialStateProperty.all<TextStyle>(textStyle)
               : null),
+      autoFocus: data?.autofocus ?? autoFocus ?? false,
+      keyboardType: data?.keyboardType ?? keyboardType,
 
       //Material only
       leading: data?.leading,
@@ -230,6 +243,8 @@ class PlatformSearchBar
       padding: data?.padding,
       onSubmitted: data?.onSubmitted,
       textCapitalization: data?.textCapitalization,
+
+      textInputAction: data?.textInputAction,
     );
   }
 
@@ -249,12 +264,13 @@ class PlatformSearchBar
       placeholder: data?.placeholder ?? hintText,
       placeholderStyle: data?.placeholderStyle ?? hintStyle,
       style: data?.style ?? textStyle,
+      autofocus: data?.autofocus ?? autoFocus ?? false,
+      keyboardType: data?.keyboardType ?? keyboardType ?? TextInputType.text,
 
       //Cupertino only
       onSubmitted: data?.onSubmitted,
       decoration: data?.decoration,
       borderRadius: data?.borderRadius,
-      keyboardType: data?.keyboardType,
       itemColor: data?.itemColor ?? CupertinoColors.secondaryLabel,
       itemSize: data?.itemSize ?? 20.0,
       prefixInsets: data?.prefixInsets ??
@@ -271,7 +287,6 @@ class PlatformSearchBar
       smartDashesType: data?.smartDashesType,
       enableIMEPersonalizedLearning:
           data?.enableIMEPersonalizedLearning ?? true,
-      autofocus: data?.autofocus ?? false,
       autocorrect: data?.autocorrect ?? true,
       enabled: data?.enabled,
     );

lib/src/platform_sliver_app_bar.dart

@@ -224,6 +224,8 @@ class PlatformSliverAppBar
       systemOverlayStyle: data?.systemOverlayStyle,
       forceMaterialTransparency: data?.forceMaterialTransparency ?? false,
       clipBehavior: data?.clipBehavior,
+      scrolledUnderElevation: data?.scrolledUnderElevation,
+      surfaceTintColor: data?.surfaceTintColor,
     );
   }