diff --git a/examples/counter_example/ios/Flutter/AppFrameworkInfo.plist b/examples/counter_example/ios/Flutter/AppFrameworkInfo.plist index 7c569640..1dc6cf76 100644 --- a/examples/counter_example/ios/Flutter/AppFrameworkInfo.plist +++ b/examples/counter_example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/examples/counter_example/ios/Podfile b/examples/counter_example/ios/Podfile index e549ee22..620e46eb 100644 --- a/examples/counter_example/ios/Podfile +++ b/examples/counter_example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/examples/counter_example/ios/Podfile.lock b/examples/counter_example/ios/Podfile.lock new file mode 100644 index 00000000..f2b82f70 --- /dev/null +++ b/examples/counter_example/ios/Podfile.lock @@ -0,0 +1,30 @@ +PODS: + - Flutter (1.0.0) + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - sqflite_darwin (0.0.4): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - Flutter (from `Flutter`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" + +SPEC CHECKSUMS: + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 + +PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e + +COCOAPODS: 1.16.2 diff --git a/examples/counter_example/ios/Runner.xcodeproj/project.pbxproj b/examples/counter_example/ios/Runner.xcodeproj/project.pbxproj index e477a21a..b5bf8c87 100644 --- a/examples/counter_example/ios/Runner.xcodeproj/project.pbxproj +++ b/examples/counter_example/ios/Runner.xcodeproj/project.pbxproj @@ -10,10 +10,12 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 602CE4AF19B97F4F61FB98FD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE96CE240CB853136192A05 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + D4416862CE9A112F263379A3 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60FD2ECB041DD1927EF427A7 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,14 +42,21 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 00FD098565DFBFCB4F407191 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 17CDE0E3211DAD5624F17132 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 47746FEAF6ADA3972B2F7F80 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 485DAB4A8A72E353CF095BCE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 60FD2ECB041DD1927EF427A7 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7DE96CE240CB853136192A05 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8628CEEB4595E2BE4B740014 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -55,6 +64,7 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9EC1045DA6310A861FBA139D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -62,6 +72,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 602CE4AF19B97F4F61FB98FD /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C12EAFA41A913DC28F6E91DA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D4416862CE9A112F263379A3 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,6 +95,15 @@ path = RunnerTests; sourceTree = ""; }; + 88B2C4E95454974371301D67 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 7DE96CE240CB853136192A05 /* Pods_Runner.framework */, + 60FD2ECB041DD1927EF427A7 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -94,6 +122,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, + C3F325E699635FC13D008D15 /* Pods */, + 88B2C4E95454974371301D67 /* Frameworks */, ); sourceTree = ""; }; @@ -121,6 +151,20 @@ path = Runner; sourceTree = ""; }; + C3F325E699635FC13D008D15 /* Pods */ = { + isa = PBXGroup; + children = ( + 47746FEAF6ADA3972B2F7F80 /* Pods-Runner.debug.xcconfig */, + 9EC1045DA6310A861FBA139D /* Pods-Runner.release.xcconfig */, + 485DAB4A8A72E353CF095BCE /* Pods-Runner.profile.xcconfig */, + 00FD098565DFBFCB4F407191 /* Pods-RunnerTests.debug.xcconfig */, + 17CDE0E3211DAD5624F17132 /* Pods-RunnerTests.release.xcconfig */, + 8628CEEB4595E2BE4B740014 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -128,8 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + D7F730ED3047A191DC0D6503 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, + C12EAFA41A913DC28F6E91DA /* Frameworks */, ); buildRules = ( ); @@ -145,12 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 2422AF6BFFDAEA19429B661C /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 341F4B04DDC628F53153F47A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -222,6 +270,45 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2422AF6BFFDAEA19429B661C /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 341F4B04DDC628F53153F47A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -253,6 +340,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + D7F730ED3047A191DC0D6503 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -346,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -379,6 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 00FD098565DFBFCB4F407191 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -396,6 +506,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 17CDE0E3211DAD5624F17132 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -411,6 +522,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8628CEEB4595E2BE4B740014 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -473,7 +585,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -524,7 +636,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/examples/counter_example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/examples/counter_example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 15cada48..e3773d42 100644 --- a/examples/counter_example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/examples/counter_example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES"> + + diff --git a/examples/movie_app/ios/Flutter/AppFrameworkInfo.plist b/examples/movie_app/ios/Flutter/AppFrameworkInfo.plist index 7c569640..1dc6cf76 100644 --- a/examples/movie_app/ios/Flutter/AppFrameworkInfo.plist +++ b/examples/movie_app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/examples/movie_app/ios/Podfile b/examples/movie_app/ios/Podfile index e549ee22..620e46eb 100644 --- a/examples/movie_app/ios/Podfile +++ b/examples/movie_app/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/examples/movie_app/ios/Podfile.lock b/examples/movie_app/ios/Podfile.lock index e36ad4c4..f2b82f70 100644 --- a/examples/movie_app/ios/Podfile.lock +++ b/examples/movie_app/ios/Podfile.lock @@ -21,10 +21,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/sqflite_darwin/darwin" SPEC CHECKSUMS: - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 -PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5 +PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e COCOAPODS: 1.16.2 diff --git a/examples/movie_app/ios/Runner.xcodeproj/project.pbxproj b/examples/movie_app/ios/Runner.xcodeproj/project.pbxproj index 79b3a436..1c4bc28a 100644 --- a/examples/movie_app/ios/Runner.xcodeproj/project.pbxproj +++ b/examples/movie_app/ios/Runner.xcodeproj/project.pbxproj @@ -455,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -585,7 +585,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -636,7 +636,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/examples/stac_gallery/assets/json/align_example.json b/examples/stac_gallery/assets/json/align_example.json index 22b62f89..f80cf9aa 100644 --- a/examples/stac_gallery/assets/json/align_example.json +++ b/examples/stac_gallery/assets/json/align_example.json @@ -13,7 +13,6 @@ "child": { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 250, "width": 200, "child": { diff --git a/examples/stac_gallery/assets/json/backdrop_filter_example.json b/examples/stac_gallery/assets/json/backdrop_filter_example.json index 6f2f4df5..b0320bb6 100644 --- a/examples/stac_gallery/assets/json/backdrop_filter_example.json +++ b/examples/stac_gallery/assets/json/backdrop_filter_example.json @@ -1,376 +1,376 @@ { "type": "scaffold", "appBar": { - "type": "appBar", - "title": { - "type": "text", - "data": "Backdrop Filter Example" - } + "type": "appBar", + "title": { + "type": "text", + "data": "Backdrop Filter Example" + } }, "body": { - "type": "singleChildScrollView", - "child": { - "type": "column", - "mainAxisAlignment": "center", - "crossAxisAlignment": "center", - "children": [ - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Backdrop filters apply visual effects to everything behind a widget.", - "textAlign": "center", - "style": { - "fontSize": 16, - "fontWeight": "w700" - } - } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Blur Filter with sigmaX: 10.0, sigmaY: 10.0", - "style": { - "fontSize": 18 - } + "type": "singleChildScrollView", + "child": { + "type": "column", + "mainAxisAlignment": "center", + "crossAxisAlignment": "center", + "children": [ + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Backdrop filters apply visual effects to everything behind a widget.", + "textAlign": "center", + "style": { + "fontSize": 16, + "fontWeight": "w700" + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Blur Filter with sigmaX: 10.0, sigmaY: 10.0", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "blur", + "sigmaX": 10.0, + "sigmaY": 10.0 + }, "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "blur", - "sigmaX": 10.0, - "sigmaY": 10.0 - }, - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Dilate Filter with radiusX: 2.0, radiusY: 2.0", - "style": { - "fontSize": 18 - } + ] + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Dilate Filter with radiusX: 2.0, radiusY: 2.0", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "dilate", + "radiusX": 2.0, + "radiusY": 2.0 + }, "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "dilate", - "radiusX": 2.0, - "radiusY": 2.0 - }, - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Erode Filter with radiusX: 2.0, radiusY: 2.0", - "style": { - "fontSize": 18 - } + ] + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Erode Filter with radiusX: 2.0, radiusY: 2.0", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "erode", + "radiusX": 2.0, + "radiusY": 2.0 + }, "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "erode", - "radiusX": 2.0, - "radiusY": 2.0 - }, - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Frosted Glass Effect with sigmaX: 15.0, sigmaY: 15.0", - "style": { - "fontSize": 18 - } + ] + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Frosted Glass Effect with sigmaX: 15.0, sigmaY: 15.0", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "blur", + "sigmaX": 15.0, + "sigmaY": 15.0 + }, "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "blur", - "sigmaX": 15.0, - "sigmaY": 15.0 - }, - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Compose Filter (Blur + Dilate)", - "style": { - "fontSize": 18 - } + ] + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Compose Filter (Blur + Dilate)", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "compose", + "outer": { + "type": "blur", + "sigmaX": 5.0, + "sigmaY": 5.0 + }, + "inner": { + "type": "dilate", + "radiusX": 2.0, + "radiusY": 2.0 + } + }, "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "compose", - "outer": { - "type": "blur", - "sigmaX": 5.0, - "sigmaY": 5.0 - }, - "inner": { - "type": "dilate", - "radiusX": 2.0, - "radiusY": 2.0 - } - }, - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - }, - { - "type": "padding", - "padding": 16, - "child": { - "type": "text", - "data": "Blur Filter with BlendMode dstOver", - "style": { - "fontSize": 18 - } + ] + } + } + }, + { + "type": "divider", + "height": 20 + }, + { + "type": "padding", + "padding": 16, + "child": { + "type": "text", + "data": "Blur Filter with BlendMode dstOver", + "style": { + "fontSize": 18 + } + } + }, + { + "type": "clipRRect", + "borderRadius": { + "all": 16 + }, + "child": { + "type": "sizedBox", + "height": 200, + "width": 300, + "child": { + "type": "stack", + "fit": "expand", + "children": [ + { + "type": "container", + "decoration": { + "image": { + "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", + "fit": "cover" + } } - }, - { - "type": "clipRRect", - "borderRadius": { - "all": 16 }, - "child": { - "type": "sizedBox", - "height": 200, - "width": 300, + { + "type": "backdropFilter", + "filter": { + "type": "blur", + "radiusX": 10.0, + "radiusY": 10.0 + }, + "blendMode": "dstOver", "child": { - "type": "stack", - "fit": "expand", - "children": [ - { - "type": "container", - "decoration": { - "image": { - "src": "https://images.pexels.com/photos/1323550/pexels-photo-1323550.jpeg", - "fit": "cover" - } - } - }, - { - "type": "backdropFilter", - "filter": { - "type": "blur", - "radiusX": 10.0, - "radiusY": 10.0 - }, - "blendMode": "dstOver", - "child": { - "type": "container", - "decoration": { - "color": "#80FFFFFF" - } - } - } - ] + "type": "container", + "decoration": { + "color": "#80FFFFFF" + } } } - }, - { - "type": "divider", - "height": 20 - } - ] + ] + } } - } + }, + { + "type": "divider", + "height": 20 + } + ] + } } +} \ No newline at end of file diff --git a/examples/stac_gallery/assets/json/list_tile_example.json b/examples/stac_gallery/assets/json/list_tile_example.json index 7f3e8530..bc60a3d4 100644 --- a/examples/stac_gallery/assets/json/list_tile_example.json +++ b/examples/stac_gallery/assets/json/list_tile_example.json @@ -19,8 +19,8 @@ { "type": "listTile", "leading": { - "type": "image", - "src": "https://cdn-icons-png.flaticon.com/512/3135/3135715.png" + "type": "icon", + "icon": "person" }, "title": { "type": "padding", @@ -62,8 +62,8 @@ { "type": "listTile", "leading": { - "type": "image", - "src": "https://cdn-icons-png.flaticon.com/512/3135/3135715.png" + "type": "icon", + "icon": "person" }, "title": { "type": "padding", diff --git a/examples/stac_gallery/assets/json/padding_example.json b/examples/stac_gallery/assets/json/padding_example.json index 3b0b76b2..7fbd4868 100644 --- a/examples/stac_gallery/assets/json/padding_example.json +++ b/examples/stac_gallery/assets/json/padding_example.json @@ -35,7 +35,6 @@ "child": { "type": "container", "color": "#672BFF", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } @@ -53,7 +52,6 @@ "child": { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } @@ -71,7 +69,6 @@ "child": { "type": "container", "color": "#D9D9D9", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } @@ -89,7 +86,6 @@ "child": { "type": "container", "color": "#672BFF", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } @@ -107,7 +103,6 @@ "child": { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } @@ -125,7 +120,6 @@ "child": { "type": "container", "color": "#D9D9D9", - "clipBehavior": "hardEdge", "height": 75, "width": 700 } diff --git a/examples/stac_gallery/assets/json/refresh_indicator_example.json b/examples/stac_gallery/assets/json/refresh_indicator_example.json index c1ac0949..7221f880 100644 --- a/examples/stac_gallery/assets/json/refresh_indicator_example.json +++ b/examples/stac_gallery/assets/json/refresh_indicator_example.json @@ -3,7 +3,7 @@ "body": { "type": "refreshIndicator", "onRefresh": { - "actionType": "request", + "actionType": "networkRequest", "url": "https://raw.githubusercontent.com/StacDev/stac/main/examples/stac_gallery/assets/json/list_view_example.json", "method": "get", "contentType": "application/json" diff --git a/examples/stac_gallery/assets/json/scaffold_example.json b/examples/stac_gallery/assets/json/scaffold_example.json index ddab073a..1c92c692 100644 --- a/examples/stac_gallery/assets/json/scaffold_example.json +++ b/examples/stac_gallery/assets/json/scaffold_example.json @@ -78,40 +78,5 @@ "size": 32 }, "onPressed": {} - }, - "bottomNavigationBar": { - "type": "bottomNavigationBar", - "items": [ - { - "type": "navigationBarItem", - "label": "Comments", - "icon": { - "type": "icon", - "iconType": "material", - "icon": "comment", - "size": 24 - } - }, - { - "type": "navigationBarItem", - "label": "Calendar", - "icon": { - "type": "icon", - "iconType": "material", - "icon": "calendar_month", - "size": 24 - } - }, - { - "type": "navigationBarItem", - "label": "Account", - "icon": { - "type": "icon", - "iconType": "cupertino", - "icon": "profile_circled", - "size": 24 - } - } - ] } } \ No newline at end of file diff --git a/examples/stac_gallery/assets/json/scroll_view_example.json b/examples/stac_gallery/assets/json/scroll_view_example.json index 8d93868d..4b458f85 100644 --- a/examples/stac_gallery/assets/json/scroll_view_example.json +++ b/examples/stac_gallery/assets/json/scroll_view_example.json @@ -18,7 +18,6 @@ { "type": "container", "color": "#672BFF", - "clipBehavior": "hardEdge", "height": 400, "width": 200 }, @@ -29,7 +28,6 @@ { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 400, "width": 200 }, @@ -40,7 +38,6 @@ { "type": "container", "color": "#D9D9D9", - "clipBehavior": "hardEdge", "height": 400, "width": 200 } diff --git a/examples/stac_gallery/assets/json/sized_box_example.json b/examples/stac_gallery/assets/json/sized_box_example.json index 72519365..743fad34 100644 --- a/examples/stac_gallery/assets/json/sized_box_example.json +++ b/examples/stac_gallery/assets/json/sized_box_example.json @@ -18,7 +18,6 @@ { "type": "container", "color": "#672BFF", - "clipBehavior": "hardEdge", "height": 75 }, { @@ -28,7 +27,6 @@ { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 75 }, { @@ -38,7 +36,6 @@ { "type": "container", "color": "#D9D9D9", - "clipBehavior": "hardEdge", "height": 75 }, { @@ -48,7 +45,6 @@ { "type": "container", "color": "#672BFF", - "clipBehavior": "hardEdge", "height": 75 }, { @@ -58,7 +54,6 @@ { "type": "container", "color": "#FC5632", - "clipBehavior": "hardEdge", "height": 75 }, { @@ -68,7 +63,6 @@ { "type": "container", "color": "#D9D9D9", - "clipBehavior": "hardEdge", "height": 75 } ] diff --git a/examples/stac_gallery/assets/json/text_example.json b/examples/stac_gallery/assets/json/text_example.json index ca267518..753876ca 100644 --- a/examples/stac_gallery/assets/json/text_example.json +++ b/examples/stac_gallery/assets/json/text_example.json @@ -49,7 +49,7 @@ "data": "This is a ", "children": [ { - "data": "Rich Text.", + "text": "Rich Text.", "style": { "fontWeight": "w800", "color": "#6750A4" diff --git a/examples/stac_gallery/ios/Flutter/AppFrameworkInfo.plist b/examples/stac_gallery/ios/Flutter/AppFrameworkInfo.plist index 7c569640..1dc6cf76 100644 --- a/examples/stac_gallery/ios/Flutter/AppFrameworkInfo.plist +++ b/examples/stac_gallery/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/examples/stac_gallery/ios/Podfile b/examples/stac_gallery/ios/Podfile index d97f17e2..e51a31d9 100644 --- a/examples/stac_gallery/ios/Podfile +++ b/examples/stac_gallery/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/examples/stac_gallery/ios/Podfile.lock b/examples/stac_gallery/ios/Podfile.lock index 47c23f5e..b4b97557 100644 --- a/examples/stac_gallery/ios/Podfile.lock +++ b/examples/stac_gallery/ios/Podfile.lock @@ -27,11 +27,11 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2 -PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 +PODFILE CHECKSUM: 4f1c12611da7338d21589c0b2ecd6bd20b109694 COCOAPODS: 1.16.2 diff --git a/examples/stac_gallery/ios/Runner.xcodeproj/project.pbxproj b/examples/stac_gallery/ios/Runner.xcodeproj/project.pbxproj index b5460988..1ce2cdd4 100644 --- a/examples/stac_gallery/ios/Runner.xcodeproj/project.pbxproj +++ b/examples/stac_gallery/ios/Runner.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -579,7 +579,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -628,7 +628,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/packages/stac/lib/src/framework/stac.dart b/packages/stac/lib/src/framework/stac.dart index 34ebea56..8ea93390 100644 --- a/packages/stac/lib/src/framework/stac.dart +++ b/packages/stac/lib/src/framework/stac.dart @@ -8,7 +8,6 @@ import 'package:stac/src/services/stac_cloud.dart'; import 'package:stac_core/actions/network_request/stac_network_request.dart'; import 'package:stac_core/core/stac_options.dart'; import 'package:stac_framework/stac_framework.dart'; -import 'package:stac_logger/stac_logger.dart'; typedef ErrorWidgetBuilder = Widget Function( BuildContext context, @@ -58,7 +57,6 @@ class Stac extends StatelessWidget { Map? json, BuildContext context, ) { - Log.d('fromJson: $json'); return StacService.fromJson(json, context); } diff --git a/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_io.dart b/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_io.dart index 6df54f95..2366d0cb 100644 --- a/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_io.dart +++ b/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_io.dart @@ -22,7 +22,7 @@ extension StacDecorationImageParser on StacDecorationImage { image = AssetImage(src); break; default: - return null; + image = NetworkImage(src); } return DecorationImage( diff --git a/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_web.dart b/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_web.dart index 02167740..9f45aef1 100644 --- a/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_web.dart +++ b/packages/stac/lib/src/parsers/foundation/decoration/stac_decoration_image/stac_decoration_image_parser_web.dart @@ -21,7 +21,7 @@ extension StacDecorationImageParser on StacDecorationImage { image = AssetImage(src); break; default: - return null; + image = NetworkImage(src); } return DecorationImage( diff --git a/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_io.dart b/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_io.dart index 2be2b6e0..93129a47 100644 --- a/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_io.dart +++ b/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_io.dart @@ -27,7 +27,7 @@ class StacImageParser extends StacParser { case StacImageType.asset: return _assetImage(model, context); default: - return const SizedBox(); + return _networkImage(model, context); } } diff --git a/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_web.dart b/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_web.dart index 34729ebb..ef5e573b 100644 --- a/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_web.dart +++ b/packages/stac/lib/src/parsers/widgets/stac_image/stac_image_parser_web.dart @@ -26,7 +26,7 @@ class StacImageParser extends StacParser { case StacImageType.asset: return _assetImage(model, context); default: - return const SizedBox(); + return _networkImage(model, context); } } diff --git a/packages/stac/lib/src/parsers/widgets/stac_refresh_indicator/stac_refresh_indicator_parser.dart b/packages/stac/lib/src/parsers/widgets/stac_refresh_indicator/stac_refresh_indicator_parser.dart index 5e9d58bb..67c15a0d 100644 --- a/packages/stac/lib/src/parsers/widgets/stac_refresh_indicator/stac_refresh_indicator_parser.dart +++ b/packages/stac/lib/src/parsers/widgets/stac_refresh_indicator/stac_refresh_indicator_parser.dart @@ -49,8 +49,7 @@ class _RefreshIndicatorWidgetState extends State<_RefreshIndicatorWidget> { displacement: widget.model.displacement ?? 40.0, edgeOffset: widget.model.edgeOffset ?? 0.0, onRefresh: () async { - Response result = - await widget.model.onRefresh?.parse(context) as Response; + Response result = await widget.model.onRefresh?.parse(context); if (context.mounted) { if (result.data != null) { diff --git a/packages/stac_core/lib/actions/snack_bar/stac_snack_bar_action.dart b/packages/stac_core/lib/actions/snack_bar/stac_snack_bar_action.dart index 0fd0a93f..fa3fc7d2 100644 --- a/packages/stac_core/lib/actions/snack_bar/stac_snack_bar_action.dart +++ b/packages/stac_core/lib/actions/snack_bar/stac_snack_bar_action.dart @@ -1,5 +1,6 @@ import 'package:json_annotation/json_annotation.dart'; import 'package:stac_core/core/core.dart'; +import 'package:stac_core/foundation/specifications/action_type.dart'; part 'stac_snack_bar_action.g.dart'; @@ -24,7 +25,7 @@ part 'stac_snack_bar_action.g.dart'; /// } /// ``` @JsonSerializable() -class StacSnackBarAction { +class StacSnackBarAction extends StacAction { /// Creates a [StacSnackBarAction] that shows a snack bar action. const StacSnackBarAction({ this.textColor, @@ -65,6 +66,10 @@ class StacSnackBarAction { /// Type: `StacAction?` (serialized with `toJson`). final StacAction? onPressed; + /// Unique action type string used for routing. + @override + String get actionType => ActionType.showSnackBar.name; + /// Creates a `StacSnackBarAction` from JSON. /// /// Type: `factory StacSnackBarAction.fromJson(Map json)`. @@ -74,5 +79,6 @@ class StacSnackBarAction { /// Converts this action to JSON. /// /// Type: `Map toJson()`. + @override Map toJson() => _$StacSnackBarActionToJson(this); }