Merge branch 'letsar:master' into master

Author: centy

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.0
+### Changed
+* Bump minimal Flutter version to 3.7.0
+### Fixed
+* Warning with Scrollable.of
+
 ## 0.6.2
 ### Fixed
 * Issue with Quilted layout algorithm. (https://github.com/letsar/flutter_staggered_grid_view/issues/232)

examples/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

examples/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -171,10 +171,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -185,6 +187,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -272,7 +275,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -346,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -395,7 +398,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

examples/ios/Runner/Info.plist

@@ -43,5 +43,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

lib/src/widgets/sliver_aligned_grid.dart

@@ -188,7 +188,7 @@ class _Gap extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final axis = axisDirectionToAxis(Scrollable.of(context)!.axisDirection);
+    final axis = axisDirectionToAxis(Scrollable.of(context).axisDirection);
     return axis == Axis.vertical
         ? SizedBox(height: mainAxisExtent)
         : SizedBox(width: mainAxisExtent);

lib/src/widgets/staggered_grid.dart

@@ -82,7 +82,7 @@ class StaggeredGrid extends MultiChildRenderObjectWidget {
       mainAxisSpacing: mainAxisSpacing,
       crossAxisSpacing: crossAxisSpacing,
       axisDirection: axisDirection ??
-          Scrollable.of(context)?.axisDirection ??
+          Scrollable.maybeOf(context)?.axisDirection ??
           AxisDirection.down,
       textDirection: Directionality.of(context),
     );
@@ -98,7 +98,7 @@ class StaggeredGrid extends MultiChildRenderObjectWidget {
       ..mainAxisSpacing = mainAxisSpacing
       ..crossAxisSpacing = crossAxisSpacing
       ..axisDirection = axisDirection ??
-          Scrollable.of(context)?.axisDirection ??
+          Scrollable.maybeOf(context)?.axisDirection ??
           AxisDirection.down
       ..textDirection = Directionality.of(context);
   }

pubspec.yaml

@@ -1,11 +1,11 @@
 name: flutter_staggered_grid_view
 description: Provides a collection of Flutter grids layouts (staggered, masonry, quilted, woven, etc.).
-version: 0.6.2
+version: 0.7.0
 homepage: https://github.com/letsar/flutter_staggered_grid_view
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
   flutter: