diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 8d689b7..f03477b 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -17,15 +17,14 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - channel: stable - flutter-version-file: pubspec.yaml + channel: beta cache: true - name: Install dependencies run: flutter pub get - name: Build web - run: flutter build web --base-href /samba_public_app/ + run: flutter build web --wasm --base-href /samba_public_app/ - name: Commit changes run: | diff --git a/.metadata b/.metadata index 1f7f527..5ff4102 100644 --- a/.metadata +++ b/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled and should not be manually edited. version: - revision: "300451adae589accbece3490f4396f10bdf15e6e" - channel: "stable" + revision: "29babcb32a591b9e5be8c6a6075d4fe605d46ad3" + channel: "beta" project_type: app @@ -13,20 +13,20 @@ project_type: app migration: platforms: - platform: root - create_revision: 300451adae589accbece3490f4396f10bdf15e6e - base_revision: 300451adae589accbece3490f4396f10bdf15e6e + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 - platform: android - create_revision: 300451adae589accbece3490f4396f10bdf15e6e - base_revision: 300451adae589accbece3490f4396f10bdf15e6e + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 - platform: ios - create_revision: 300451adae589accbece3490f4396f10bdf15e6e - base_revision: 300451adae589accbece3490f4396f10bdf15e6e + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 - platform: macos - create_revision: 300451adae589accbece3490f4396f10bdf15e6e - base_revision: 300451adae589accbece3490f4396f10bdf15e6e + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 - platform: web - create_revision: 300451adae589accbece3490f4396f10bdf15e6e - base_revision: 300451adae589accbece3490f4396f10bdf15e6e + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 # User provided section diff --git a/android/app/build.gradle b/android/app/build.gradle index 73f2522..e02c4dc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,67 +1,58 @@ plugins { id "com.android.application" id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') +def localPropertiesFile = rootProject.file("local.properties") if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> + localPropertiesFile.withReader("UTF-8") { reader -> localProperties.load(reader) } } -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = "1" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') +def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = "1.0" } android { - namespace "com.example.samba_public_app" - compileSdk flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + namespace = "com.example.samba_public_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.samba_public_app" + applicationId = "com.example.samba_public_app" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdk flutter.minSdkVersion - targetSdk flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutterVersionCode.toInteger() + versionName = flutterVersionName } buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' + source = "../.." } - -dependencies {} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e8428db..1af7da1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" + android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" @@ -31,7 +32,7 @@ android:value="2" /> diff --git a/android/build.gradle b/android/build.gradle index bc157bd..d2ffbff 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,12 +5,12 @@ allprojects { } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } tasks.register("clean", Delete) { diff --git a/android/gradle.properties b/android/gradle.properties index 598d13f..3b5b324 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx4G +org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ac40c5d..b936d46 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,12 +2,8 @@ PODS: - cupertino_http (0.0.1): - Flutter - Flutter (1.0.0) - - flutter_keyboard_visibility (0.0.1): - - Flutter - flutter_native_splash (0.0.1): - Flutter - - flutter_secure_storage (6.0.0): - - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS @@ -18,9 +14,7 @@ PODS: DEPENDENCIES: - cupertino_http (from `.symlinks/plugins/cupertino_http/ios`) - Flutter (from `Flutter`) - - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) @@ -29,12 +23,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/cupertino_http/ios" Flutter: :path: Flutter - flutter_keyboard_visibility: - :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" flutter_native_splash: :path: ".symlinks/plugins/flutter_native_splash/ios" - flutter_secure_storage: - :path: ".symlinks/plugins/flutter_secure_storage/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" shared_preferences_foundation: @@ -43,9 +33,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: cupertino_http: 5f8b1161107fe6c8d94a0c618735a033d93fa7db Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778 - flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d8c256c..4c8d84e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,12 +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 */; }; + 641228FC057093F2300B169E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19D62FB02C002064F28E4D25 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 7F0E68E105486477B728222A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179752D28FC1B3B421CCCB48 /* Pods_RunnerTests.framework */; }; 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 */; }; - A25BDFBBE235794FA6FB86E1 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70D3EB22B9EF544A1F5405C3 /* Pods_RunnerTests.framework */; }; - E994B61EA553E89E70BF481B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E849C0243DDCAB3C4E9060ED /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,13 +44,15 @@ /* Begin PBXFileReference section */ 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 = ""; }; - 164FD23740766C15C3E5C2A0 /* 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 = ""; }; - 1F7C8C04E6BB8AEF4E13C083 /* 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 = ""; }; - 2DBFFDAFFAAC449D0B556059 /* 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 = ""; }; + 179752D28FC1B3B421CCCB48 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 19D62FB02C002064F28E4D25 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1BD50ADD331FAF87DA196F09 /* 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 = ""; }; + 1EDB7E3FA44AC875016AC9B2 /* 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 = ""; }; 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; }; + 3A172BA824A8449712647FC6 /* 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 = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 70D3EB22B9EF544A1F5405C3 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4A1EB9A0B1DB30F68E8FD03E /* 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 = ""; }; 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 = ""; }; @@ -61,61 +63,59 @@ 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 = ""; }; - A0FB933FAAAE111427B4B575 /* 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 = ""; }; - B2A038CFCF0432FAE002D079 /* 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 = ""; }; - B800FD0216DE5DE7E685CFF5 /* 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 = ""; }; - E849C0243DDCAB3C4E9060ED /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E5945FA95413CF11F9E79F13 /* 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 = ""; }; + F09955B68D0C3530A1594620 /* 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { + 531F6F8096D763A17F341629 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E994B61EA553E89E70BF481B /* Pods_Runner.framework in Frameworks */, + 7F0E68E105486477B728222A /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - A0AD3C7E9FDACB9975941EC3 /* Frameworks */ = { + 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A25BDFBBE235794FA6FB86E1 /* Pods_RunnerTests.framework in Frameworks */, + 641228FC057093F2300B169E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 331C8082294A63A400263BE5 /* RunnerTests */ = { + 25B926AB7A84B02A92BAB1C4 /* Pods */ = { isa = PBXGroup; children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, + 1BD50ADD331FAF87DA196F09 /* Pods-Runner.debug.xcconfig */, + 3A172BA824A8449712647FC6 /* Pods-Runner.release.xcconfig */, + 4A1EB9A0B1DB30F68E8FD03E /* Pods-Runner.profile.xcconfig */, + E5945FA95413CF11F9E79F13 /* Pods-RunnerTests.debug.xcconfig */, + F09955B68D0C3530A1594620 /* Pods-RunnerTests.release.xcconfig */, + 1EDB7E3FA44AC875016AC9B2 /* Pods-RunnerTests.profile.xcconfig */, ); - path = RunnerTests; + name = Pods; + path = Pods; sourceTree = ""; }; - 7175FB39E3AAEB93E691599D /* Pods */ = { + 2A15CF52CA97B4E6D2F14F4F /* Frameworks */ = { isa = PBXGroup; children = ( - 164FD23740766C15C3E5C2A0 /* Pods-Runner.debug.xcconfig */, - B2A038CFCF0432FAE002D079 /* Pods-Runner.release.xcconfig */, - 2DBFFDAFFAAC449D0B556059 /* Pods-Runner.profile.xcconfig */, - 1F7C8C04E6BB8AEF4E13C083 /* Pods-RunnerTests.debug.xcconfig */, - A0FB933FAAAE111427B4B575 /* Pods-RunnerTests.release.xcconfig */, - B800FD0216DE5DE7E685CFF5 /* Pods-RunnerTests.profile.xcconfig */, + 19D62FB02C002064F28E4D25 /* Pods_Runner.framework */, + 179752D28FC1B3B421CCCB48 /* Pods_RunnerTests.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; - 789253D28FA681B9A388CFB3 /* Frameworks */ = { + 331C8082294A63A400263BE5 /* RunnerTests */ = { isa = PBXGroup; children = ( - E849C0243DDCAB3C4E9060ED /* Pods_Runner.framework */, - 70D3EB22B9EF544A1F5405C3 /* Pods_RunnerTests.framework */, + 331C807B294A618700263BE5 /* RunnerTests.swift */, ); - name = Frameworks; + path = RunnerTests; sourceTree = ""; }; 9740EEB11CF90186004384FC /* Flutter */ = { @@ -136,8 +136,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, - 7175FB39E3AAEB93E691599D /* Pods */, - 789253D28FA681B9A388CFB3 /* Frameworks */, + 25B926AB7A84B02A92BAB1C4 /* Pods */, + 2A15CF52CA97B4E6D2F14F4F /* Frameworks */, ); sourceTree = ""; }; @@ -172,10 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - CBF97F5856832FFD45B10C02 /* [CP] Check Pods Manifest.lock */, + 6844AB1D85BBFD9F84069C62 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, - A0AD3C7E9FDACB9975941EC3 /* Frameworks */, + 531F6F8096D763A17F341629 /* Frameworks */, ); buildRules = ( ); @@ -191,14 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - FB64E20EA909A3D467592FBD /* [CP] Check Pods Manifest.lock */, + F1B79918A9EAE7A435107B79 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 61DF933E7291EEFEA2C940A3 /* [CP] Embed Pods Frameworks */, + B27220DF87E196C071847103 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -286,21 +286,26 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 61DF933E7291EEFEA2C940A3 /* [CP] Embed Pods Frameworks */ = { + 6844AB1D85BBFD9F84069C62 /* [CP] Check Pods Manifest.lock */ = { 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"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + 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; }; 9740EEB61CF901F6004384FC /* Run Script */ = { @@ -318,29 +323,24 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - CBF97F5856832FFD45B10C02 /* [CP] Check Pods Manifest.lock */ = { + B27220DF87E196C071847103 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - FB64E20EA909A3D467592FBD /* [CP] Check Pods Manifest.lock */ = { + F1B79918A9EAE7A435107B79 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -488,7 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1F7C8C04E6BB8AEF4E13C083 /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = E5945FA95413CF11F9E79F13 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -506,7 +506,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A0FB933FAAAE111427B4B575 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = F09955B68D0C3530A1594620 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -522,7 +522,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B800FD0216DE5DE7E685CFF5 /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 1EDB7E3FA44AC875016AC9B2 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/lib/features/home/widgets/settings_modal_sheet.dart b/lib/features/home/widgets/settings_modal_sheet.dart index 3aed84f..b12d7a5 100644 --- a/lib/features/home/widgets/settings_modal_sheet.dart +++ b/lib/features/home/widgets/settings_modal_sheet.dart @@ -1,7 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; import '../../../common_widgets/app_cupertino_button.dart'; import '../../../extensions/app_localization_extension.dart'; @@ -15,64 +14,53 @@ void showSettingModalSheet( EdgeInsets padding = const EdgeInsets.only(top: 24), bool showAsDialog = true, }) { - WoltModalSheet.show( + showModalBottomSheet( context: context, + useSafeArea: true, + useRootNavigator: true, showDragHandle: false, - pageListBuilder: (context) { - return [ - SliverWoltModalSheetPage( - surfaceTintColor: Colors.transparent, - backgroundColor: Colors.transparent, - hasTopBarLayer: false, - mainContentSlivers: [ - Builder( - builder: (context) { - return SliverAppBar( - automaticallyImplyLeading: false, - elevation: 0, - title: Text(context.loc.settingsTitle), - titleTextStyle: context.textTheme.titleLarge!.copyWith( - fontWeight: FontWeight.bold, - ), - backgroundColor: CupertinoColors.systemGroupedBackground - .resolveFrom(context), - actions: [ - if (showAsDialog) - Padding( - padding: const EdgeInsets.only(right: 16), - child: AppCupertinoButton( - onPressed: () => Navigator.of(context).pop(), - color: CupertinoDynamicColor.resolve( - CupertinoColors.lightBackgroundGray, - context, - ), - padding: const EdgeInsets.all(4), - child: const Icon( - CupertinoIcons.xmark, - size: 16, - color: CupertinoColors.label, - ), - ), - ), - ], - ); - }, + isScrollControlled: true, + builder: (context) => SingleChildScrollView( + padding: const EdgeInsets.only(bottom: 32), + controller: PrimaryScrollController.of(context), + physics: const ClampingScrollPhysics(), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + AppBar( + automaticallyImplyLeading: false, + elevation: 0, + title: Text(context.loc.settingsTitle), + titleTextStyle: context.textTheme.titleLarge!.copyWith( + fontWeight: FontWeight.bold, ), - SliverToBoxAdapter( - child: Padding( - padding: showAsDialog ? EdgeInsets.zero : padding, - child: const Column( - children: [ - SettingsThemeSection(), - SettingsLanguageSection(), - ], + backgroundColor: + CupertinoColors.systemGroupedBackground.resolveFrom(context), + actions: [ + if (showAsDialog) + Padding( + padding: const EdgeInsets.only(right: 16), + child: AppCupertinoButton( + onPressed: () => Navigator.of(context).pop(), + color: CupertinoDynamicColor.resolve( + CupertinoColors.lightBackgroundGray, + context, + ), + padding: const EdgeInsets.all(4), + child: const Icon( + CupertinoIcons.xmark, + size: 16, + color: CupertinoColors.label, + ), + ), ), - ), - ), - ], - ), - ]; - }, + ], + ), + const SettingsThemeSection(), + const SettingsLanguageSection(), + ], + ), + ), ); } diff --git a/lib/features/instruments/details/instrument_details_page.dart b/lib/features/instruments/details/instrument_details_page.dart index 2139cf5..7b7039e 100644 --- a/lib/features/instruments/details/instrument_details_page.dart +++ b/lib/features/instruments/details/instrument_details_page.dart @@ -162,5 +162,3 @@ extension TextLinesExtension on String { return textPainter.computeLineMetrics().length; } } - -typedef WidgetStatePropertyAll = MaterialStatePropertyAll; diff --git a/lib/features/parades/widgets/parade_item.dart b/lib/features/parades/widgets/parade_item.dart index 48f5679..e943dde 100644 --- a/lib/features/parades/widgets/parade_item.dart +++ b/lib/features/parades/widgets/parade_item.dart @@ -40,7 +40,7 @@ class ParadeItem extends ConsumerWidget { clipBehavior: Clip.antiAlias, margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), child: InkWell( - onTap: () { + onLongPress: () { ref.read(paradeShowOriginalProvider.notifier).toggle(); }, child: Container( diff --git a/lib/features/schools/details/school_details_page.dart b/lib/features/schools/details/school_details_page.dart index 6eb1ccc..6ee3a94 100644 --- a/lib/features/schools/details/school_details_page.dart +++ b/lib/features/schools/details/school_details_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; import '../../../common_widgets/app_cupertino_button.dart'; import '../../../common_widgets/app_page_indicator.dart'; @@ -9,7 +8,6 @@ import '../../../extensions/app_localization_extension.dart'; import '../../../extensions/intl_extension.dart'; import '../../../extensions/string_extension.dart'; import '../../../extensions/theme_of_context_extension.dart'; -import '../../../router/go_router.dart'; import '../school.dart'; import '../school_extensions.dart'; import '../widgets/school_flag.dart'; @@ -24,23 +22,6 @@ class SchoolDetailsPage extends ConsumerStatefulWidget { final int id; static const path = ':id'; - static SheetPage getWoltModal(int id) { - return SheetPage( - pageIndexNotifier: ValueNotifier(0), - pageListBuilderNotifier: ValueNotifier( - (context) => [ - SliverWoltModalSheetPage( - hasTopBarLayer: false, - isTopBarLayerAlwaysVisible: false, - mainContentSlivers: [ - SliverToBoxAdapter(child: SchoolDetailsPage(id: id)), - ], - ), - ], - ), - ); - } - @override ConsumerState createState() => _SchoolDetailsPageState(); } @@ -54,96 +35,105 @@ class _SchoolDetailsPageState extends ConsumerState { @override Widget build(BuildContext context) { final school = ref.watch(selectedSchoolProvider(widget.id)); - return DecoratedBox( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - if (school.colors.isEmpty) - for (final _ in Iterable.generate(2)) - CupertinoDynamicColor.resolve( - CupertinoColors.systemGrey5, - context, - ), - for (final color in school.colorsCode) color.withOpacity(0.5), - ], - ), - ), - child: Padding( - padding: const EdgeInsets.only(top: 12), - child: InkWell( - onLongPress: school.name == school.translatedName && - school.symbols == school.translatedSymbols - ? null - : () { - showOriginal.value = !showOriginal.value; - }, - splashFactory: NoSplash.splashFactory, - highlightColor: Colors.transparent, - splashColor: Colors.transparent, - child: Column( - children: [ - LayoutBuilder( - builder: (context, constraints) => ConstrainedBox( - constraints: BoxConstraints( - maxHeight: ((constraints.maxWidth - 20) / 3) * 2, - ), - child: ClipRRect( - borderRadius: const BorderRadius.all(Radius.circular(16)), - child: Stack( - children: [ - PageView.builder( - clipBehavior: Clip.antiAlias, - itemCount: imageCount, - onPageChanged: (value) => currentImage.value = value, - itemBuilder: (context, index) { - return Padding( - padding: - const EdgeInsets.symmetric(horizontal: 12), - child: Card( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16), - ), - elevation: 4, - child: SchoolFlag( - heartSize: 32, - school: school, - ), - ), - ); - }, - ), - ValueListenableBuilder( - valueListenable: currentImage, - builder: (context, index, child) { - return AppPageIndicator( - pageCount: imageCount, - currentPage: index, - ); - }, + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + DecoratedBox( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + if (school.colors.isEmpty) + for (final _ in Iterable.generate(2)) + CupertinoDynamicColor.resolve( + CupertinoColors.systemGrey5, + context, + ), + for (final color in school.colorsCode) color.withOpacity(0.5), + ], + ), + ), + child: Padding( + padding: const EdgeInsets.only(top: 12), + child: InkWell( + onLongPress: school.name == school.translatedName && + school.symbols == school.translatedSymbols + ? null + : () { + showOriginal.value = !showOriginal.value; + }, + focusColor: Colors.transparent, + highlightColor: Colors.transparent, + splashColor: Colors.transparent, + hoverColor: Colors.transparent, + child: Column( + children: [ + LayoutBuilder( + builder: (context, constraints) => ConstrainedBox( + constraints: BoxConstraints( + maxHeight: ((constraints.maxWidth - 20) / 3) * 2, + ), + child: ClipRRect( + borderRadius: + const BorderRadius.all(Radius.circular(16)), + child: Stack( + children: [ + PageView.builder( + clipBehavior: Clip.antiAlias, + itemCount: imageCount, + onPageChanged: (value) => + currentImage.value = value, + itemBuilder: (context, index) { + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 12, + ), + child: Card( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + ), + elevation: 4, + child: SchoolFlag( + heartSize: 32, + school: school, + ), + ), + ); + }, + ), + ValueListenableBuilder( + valueListenable: currentImage, + builder: (context, index, child) { + return AppPageIndicator( + pageCount: imageCount, + currentPage: index, + ); + }, + ), + ], ), - ], + ), ), ), - ), - ), - ValueListenableBuilder( - valueListenable: showOriginal, - builder: (context, value, child) { - return SchoolDetailsText( - school: school, - showOriginal: value, - onTranslate: () { - showOriginal.value = !showOriginal.value; + ValueListenableBuilder( + valueListenable: showOriginal, + builder: (context, value, child) { + return SchoolDetailsText( + school: school, + showOriginal: value, + onTranslate: () { + showOriginal.value = !showOriginal.value; + }, + ); }, - ); - }, + ), + ], ), - ], + ), ), ), - ), + ], ); } } diff --git a/lib/router/go_router.dart b/lib/router/go_router.dart index 58a9922..c6e83f0 100644 --- a/lib/router/go_router.dart +++ b/lib/router/go_router.dart @@ -2,7 +2,6 @@ import 'package:fast_immutable_collections/fast_immutable_collections.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; import '../features/home/home_page.dart'; import '../features/home/home_page_controller.dart'; import '../features/instruments/details/instrument_details_page.dart'; @@ -130,8 +129,11 @@ GoRouter goRouter(GoRouterRef ref) { return Future.value(true); }, pageBuilder: (context, state) { - final id = int.parse(state.pathParameters['id']!); - return SchoolDetailsPage.getWoltModal(id); + return SheetPage( + child: SchoolDetailsPage( + id: int.parse(state.pathParameters['id']!), + ), + ); }, ), ], @@ -156,28 +158,19 @@ void _scrollTabToTheTop(ScrollController controller) { class SheetPage extends Page { const SheetPage({ - required this.pageIndexNotifier, - required this.pageListBuilderNotifier, + required this.child, }) : super(key: const ValueKey('SheetPage')); - final ValueNotifier pageIndexNotifier; - final ValueNotifier pageListBuilderNotifier; + final Widget child; static const String routeName = 'Modal Sheet'; @override Route createRoute(BuildContext context) { - return WoltModalSheetRoute( - pageIndexNotifier: pageIndexNotifier, - pageListBuilderNotifier: pageListBuilderNotifier, - useSafeArea: false, - onModalDismissedWithDrag: () { - context.pop(); - }, - onModalDismissedWithBarrierTap: () { - context.pop(); - }, - routeSettings: this, + return ModalBottomSheetRoute( + settings: this, + builder: (context) => child, + isScrollControlled: true, ); } diff --git a/lib/theme/theme_data.dart b/lib/theme/theme_data.dart index 163dc3f..f7d6bd9 100644 --- a/lib/theme/theme_data.dart +++ b/lib/theme/theme_data.dart @@ -2,7 +2,6 @@ import 'package:flex_color_scheme/flex_color_scheme.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; class AppTheme { static ThemeData get lightTheme => FlexThemeData.light( @@ -23,23 +22,12 @@ class AppTheme { snackBarBackgroundSchemeColor: SchemeColor.inversePrimary, snackBarRadius: 8, snackBarElevation: 2, + bottomSheetRadius: 16, + bottomSheetModalBackgroundColor: SchemeColor.background, ), splashFactory: InkSparkle.splashFactory, extensions: [ AppCustomColors.light(), - const WoltModalSheetThemeData( - bottomSheetShape: RoundedRectangleBorder( - borderRadius: BorderRadius.vertical( - top: Radius.circular(28), - ), - ), - mainContentScrollPhysics: ClampingScrollPhysics(), - dialogShape: RoundedRectangleBorder( - borderRadius: BorderRadius.all( - Radius.circular(28), - ), - ), - ), ], ).copyWith( cupertinoOverrideTheme: getCupertinoTheme(Brightness.light), @@ -61,27 +49,14 @@ class AppTheme { snackBarBackgroundSchemeColor: SchemeColor.inversePrimary, snackBarRadius: 8, snackBarElevation: 2, + bottomSheetRadius: 16, + bottomSheetModalBackgroundColor: SchemeColor.background, ), surface: CupertinoColors.systemBackground.darkColor, background: CupertinoColors.systemGroupedBackground.darkColor, splashFactory: InkSparkle.splashFactory, darkIsTrueBlack: trueBlack, - extensions: [ - AppCustomColors.dark(), - const WoltModalSheetThemeData( - bottomSheetShape: RoundedRectangleBorder( - borderRadius: BorderRadius.vertical( - top: Radius.circular(28), - ), - ), - mainContentScrollPhysics: ClampingScrollPhysics(), - dialogShape: RoundedRectangleBorder( - borderRadius: BorderRadius.all( - Radius.circular(28), - ), - ), - ), - ], + extensions: [AppCustomColors.dark()], ).copyWith( cupertinoOverrideTheme: getCupertinoTheme(Brightness.dark), ); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 37af1fe..b8e2b22 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,12 +5,10 @@ import FlutterMacOS import Foundation -import flutter_secure_storage_macos import path_provider_foundation import shared_preferences_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) } diff --git a/macos/Podfile.lock b/macos/Podfile.lock index f6a3d7c..7ad0d81 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,8 +1,6 @@ PODS: - cupertino_http (0.0.1): - FlutterMacOS - - flutter_secure_storage_macos (6.1.1): - - FlutterMacOS - FlutterMacOS (1.0.0) - path_provider_foundation (0.0.1): - Flutter @@ -13,7 +11,6 @@ PODS: DEPENDENCIES: - cupertino_http (from `Flutter/ephemeral/.symlinks/plugins/cupertino_http/macos`) - - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) @@ -21,8 +18,6 @@ DEPENDENCIES: EXTERNAL SOURCES: cupertino_http: :path: Flutter/ephemeral/.symlinks/plugins/cupertino_http/macos - flutter_secure_storage_macos: - :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos FlutterMacOS: :path: Flutter/ephemeral path_provider_foundation: @@ -32,7 +27,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: cupertino_http: afa11b9e2786b62da2671e4ddd32caf792503748 - flutter_secure_storage_macos: 75c8cadfdba05ca007c0fa4ea0c16e5cf85e521b FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 47dc176..133984e 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -21,14 +21,14 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 1AD39FBE59BE7826FA94EDC2 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 033DFFCD5FB657C0AB6FDFC3 /* Pods_RunnerTests.framework */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 50AADE8BDD9CC9C9E07E1995 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 553249B39DC83EDBDBFB4B32 /* Pods_RunnerTests.framework */; }; - 8416C4C1E6ACD5BE93AF42C6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76B3AE2DF7E9A583C18EE45E /* Pods_Runner.framework */; }; + CE23FE5BB53C4B3F1A1D1BD7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AE496D7ADE6CA1CC6A56F88 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,8 +62,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 02E2D4018E50F6A5D732517D /* 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 = ""; }; - 202FFEE3FCEC7A659E178F52 /* 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 = ""; }; + 033DFFCD5FB657C0AB6FDFC3 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DF01780CF6F7CBF3D4A89F9 /* 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 = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; @@ -80,14 +80,14 @@ 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 553249B39DC83EDBDBFB4B32 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 76B3AE2DF7E9A583C18EE45E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 4AE496D7ADE6CA1CC6A56F88 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5730EACE615274189D400390 /* 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 = ""; }; + 57B3DE1BB8C0C0C5015D7515 /* 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 = ""; }; + 7060EC46A0FB91367A83C174 /* 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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 825F812456B651E25695E2DA /* 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 = ""; }; - 87FB62C68818F21D2D7A219C /* 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 = ""; }; - 92CF7F94968CBA09B8871FF8 /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - FD8B5F181A1399D1C5C5BEC9 /* 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 = ""; }; + A0836AEDF984F71AD9F0DA59 /* 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 = ""; }; + A0984040D09E1404AB18ACEB /* 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,7 +95,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 50AADE8BDD9CC9C9E07E1995 /* Pods_RunnerTests.framework in Frameworks */, + 1AD39FBE59BE7826FA94EDC2 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,7 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8416C4C1E6ACD5BE93AF42C6 /* Pods_Runner.framework in Frameworks */, + CE23FE5BB53C4B3F1A1D1BD7 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -137,7 +137,7 @@ 331C80D6294CF71000263BE5 /* RunnerTests */, 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, - B221147FC9754BC81A760FCE /* Pods */, + AAF614844FAD0783F9A0D176 /* Pods */, ); sourceTree = ""; }; @@ -185,15 +185,15 @@ path = Runner; sourceTree = ""; }; - B221147FC9754BC81A760FCE /* Pods */ = { + AAF614844FAD0783F9A0D176 /* Pods */ = { isa = PBXGroup; children = ( - 92CF7F94968CBA09B8871FF8 /* Pods-Runner.debug.xcconfig */, - 825F812456B651E25695E2DA /* Pods-Runner.release.xcconfig */, - FD8B5F181A1399D1C5C5BEC9 /* Pods-Runner.profile.xcconfig */, - 02E2D4018E50F6A5D732517D /* Pods-RunnerTests.debug.xcconfig */, - 202FFEE3FCEC7A659E178F52 /* Pods-RunnerTests.release.xcconfig */, - 87FB62C68818F21D2D7A219C /* Pods-RunnerTests.profile.xcconfig */, + A0984040D09E1404AB18ACEB /* Pods-Runner.debug.xcconfig */, + 1DF01780CF6F7CBF3D4A89F9 /* Pods-Runner.release.xcconfig */, + 7060EC46A0FB91367A83C174 /* Pods-Runner.profile.xcconfig */, + 5730EACE615274189D400390 /* Pods-RunnerTests.debug.xcconfig */, + 57B3DE1BB8C0C0C5015D7515 /* Pods-RunnerTests.release.xcconfig */, + A0836AEDF984F71AD9F0DA59 /* Pods-RunnerTests.profile.xcconfig */, ); name = Pods; path = Pods; @@ -202,8 +202,8 @@ D73912EC22F37F3D000D13A0 /* Frameworks */ = { isa = PBXGroup; children = ( - 76B3AE2DF7E9A583C18EE45E /* Pods_Runner.framework */, - 553249B39DC83EDBDBFB4B32 /* Pods_RunnerTests.framework */, + 4AE496D7ADE6CA1CC6A56F88 /* Pods_Runner.framework */, + 033DFFCD5FB657C0AB6FDFC3 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -215,7 +215,7 @@ isa = PBXNativeTarget; buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( - 998B6138F8859ED6A5888409 /* [CP] Check Pods Manifest.lock */, + 136D84E61E24EE26BBA41047 /* [CP] Check Pods Manifest.lock */, 331C80D1294CF70F00263BE5 /* Sources */, 331C80D2294CF70F00263BE5 /* Frameworks */, 331C80D3294CF70F00263BE5 /* Resources */, @@ -234,13 +234,13 @@ isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - D243B40F16D9E20AF5430B6F /* [CP] Check Pods Manifest.lock */, + 613AA72FF639E178F8AD23D3 /* [CP] Check Pods Manifest.lock */, 33CC10E92044A3C60003C045 /* Sources */, 33CC10EA2044A3C60003C045 /* Frameworks */, 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - 5A7AB039B24A8492CEFEC0BA /* [CP] Embed Pods Frameworks */, + F70F74F2339FC5E82941B41F /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -323,62 +323,67 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3399D490228B24CF009A79C7 /* ShellScript */ = { + 136D84E61E24EE26BBA41047 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; 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 = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + 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; }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { + 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, ); inputPaths = ( - Flutter/ephemeral/tripwire, ); outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; - 5A7AB039B24A8492CEFEC0BA /* [CP] Embed Pods Frameworks */ = { + 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, ); - name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; }; - 998B6138F8859ED6A5888409 /* [CP] Check Pods Manifest.lock */ = { + 613AA72FF639E178F8AD23D3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -393,33 +398,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + "$(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; }; - D243B40F16D9E20AF5430B6F /* [CP] Check Pods Manifest.lock */ = { + F70F74F2339FC5E82941B41F /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -473,7 +473,7 @@ /* Begin XCBuildConfiguration section */ 331C80DB294CF71000263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02E2D4018E50F6A5D732517D /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 5730EACE615274189D400390 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -488,7 +488,7 @@ }; 331C80DC294CF71000263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 202FFEE3FCEC7A659E178F52 /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = 57B3DE1BB8C0C0C5015D7515 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; @@ -503,7 +503,7 @@ }; 331C80DD294CF71000263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 87FB62C68818F21D2D7A219C /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = A0836AEDF984F71AD9F0DA59 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CURRENT_PROJECT_VERSION = 1; diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift index 5418c9f..61f3bd1 100644 --- a/macos/RunnerTests/RunnerTests.swift +++ b/macos/RunnerTests/RunnerTests.swift @@ -1,5 +1,5 @@ -import FlutterMacOS import Cocoa +import FlutterMacOS import XCTest class RunnerTests: XCTestCase { diff --git a/pubspec.lock b/pubspec.lock index 733fa1b..bd594aa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -293,10 +293,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "639179e1cc0957779e10dd5b786ce180c477c4c0aca5aaba5d1700fa2e834801" + sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5" url: "https://pub.dev" source: hosted - version: "5.4.3" + version: "5.4.3+1" dio_cache_interceptor: dependency: "direct main" description: @@ -422,54 +422,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_keyboard_visibility: - dependency: transitive - description: - name: flutter_keyboard_visibility - sha256: "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8" - url: "https://pub.dev" - source: hosted - version: "6.0.0" - flutter_keyboard_visibility_linux: - dependency: transitive - description: - name: flutter_keyboard_visibility_linux - sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - flutter_keyboard_visibility_macos: - dependency: transitive - description: - name: flutter_keyboard_visibility_macos - sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086 - url: "https://pub.dev" - source: hosted - version: "1.0.0" - flutter_keyboard_visibility_platform_interface: - dependency: transitive - description: - name: flutter_keyboard_visibility_platform_interface - sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 - url: "https://pub.dev" - source: hosted - version: "2.0.0" - flutter_keyboard_visibility_web: - dependency: transitive - description: - name: flutter_keyboard_visibility_web - sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 - url: "https://pub.dev" - source: hosted - version: "2.0.0" - flutter_keyboard_visibility_windows: - dependency: transitive - description: - name: flutter_keyboard_visibility_windows - sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73 - url: "https://pub.dev" - source: hosted - version: "1.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -491,54 +443,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0-dev.3" - flutter_secure_storage: - dependency: transitive - description: - name: flutter_secure_storage - sha256: f2afec1f1762c040a349ea2a588e32f442da5d0db3494a52a929a97c9e550bc5 - url: "https://pub.dev" - source: hosted - version: "7.0.1" - flutter_secure_storage_linux: - dependency: transitive - description: - name: flutter_secure_storage_linux - sha256: "3d5032e314774ee0e1a7d0a9f5e2793486f0dff2dd9ef5a23f4e3fb2a0ae6a9e" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - flutter_secure_storage_macos: - dependency: transitive - description: - name: flutter_secure_storage_macos - sha256: ff0768a6700ea1d9620e03518e2e25eac86a8bd07ca3556e9617bfa5ace4bd00 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - flutter_secure_storage_platform_interface: - dependency: transitive - description: - name: flutter_secure_storage_platform_interface - sha256: "0d4d3a5dd4db28c96ae414d7ba3b8422fd735a8255642774803b2532c9a61d7e" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - flutter_secure_storage_web: - dependency: transitive - description: - name: flutter_secure_storage_web - sha256: "30f84f102df9dcdaa2241866a958c2ec976902ebdaa8883fbfe525f1f2f3cf20" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - flutter_secure_storage_windows: - dependency: transitive - description: - name: flutter_secure_storage_windows - sha256: ca89c8059cf439985aa83c59619b3674c7ef6cc2e86943d169a7369d6a69cab5 - url: "https://pub.dev" - source: hosted - version: "1.1.3" flutter_staggered_grid_view: dependency: "direct main" description: @@ -605,22 +509,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.3" - hive_cache_manager: - dependency: "direct main" - description: - name: hive_cache_manager - sha256: b920c6b2a3d46bb0b73dbc0722bc5f29284244f210be5b353aa48fe00f475371 - url: "https://pub.dev" - source: hosted - version: "0.0.1" - hive_flutter: - dependency: transitive - description: - name: hive_flutter - sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc - url: "https://pub.dev" - source: hosted - version: "1.1.0" hotreloader: dependency: transitive description: @@ -689,10 +577,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -729,26 +617,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" logging: dependency: "direct main" description: @@ -777,10 +665,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -825,10 +713,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.4" path_provider_foundation: dependency: transitive description: @@ -985,10 +873,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_foundation: dependency: transitive description: @@ -1142,10 +1030,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -1214,10 +1102,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48 url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.0" watcher: dependency: transitive description: @@ -1258,14 +1146,6 @@ packages: url: "https://pub.dev" source: hosted version: "5.4.0" - wolt_modal_sheet: - dependency: "direct main" - description: - name: wolt_modal_sheet - sha256: e5f08db4927bd97ec57fdf6f995d4bd6f17459c5511cbb07f4c94c82c6a2cfcd - url: "https://pub.dev" - source: hosted - version: "0.5.0" xdg_directories: dependency: transitive description: @@ -1292,4 +1172,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.3.3 <4.0.0" - flutter: ">=3.19.5" + flutter: ">=3.22.0-0.1.pre" diff --git a/pubspec.yaml b/pubspec.yaml index f3422f4..129b647 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ version: 1.0.0+1 environment: sdk: '>=3.3.3 <4.0.0' - flutter: 3.19.5 + flutter: 3.22.0-0.1.pre dependencies: country_picker: ^2.0.25 @@ -20,7 +20,7 @@ dependencies: easy_image_viewer: ^1.4.1 extended_image: ^8.2.0 fast_immutable_collections: ^10.2.2 - fetch_client: ^1.0.2 + fetch_client: ^1.1.0-wasm flex_color_scheme: ^7.3.1 flutter: sdk: flutter @@ -30,8 +30,7 @@ dependencies: flutter_riverpod: ^3.0.0-dev.3 flutter_staggered_grid_view: ^0.7.0 go_router: ^13.2.1 - hive_cache_manager: ^0.0.1 - intl: ^0.18.1 + intl: ^0.19.0 logging: ^1.2.0 native_dio_adapter: ^1.3.0 path_provider: ^2.1.3 @@ -41,7 +40,6 @@ dependencies: sliver_tools: ^0.2.12 super_sliver_list: ^0.4.1 transparent_image: ^2.0.1 - wolt_modal_sheet: ^0.5.0 dev_dependencies: build_runner: ^2.4.8 diff --git a/web/flutter_bootstrap.js b/web/flutter_bootstrap.js new file mode 100644 index 0000000..c2c8734 --- /dev/null +++ b/web/flutter_bootstrap.js @@ -0,0 +1,45 @@ +function topInset() { + Number.parseFloat( + getComputedStyle(document.documentElement).getPropertyValue("--sat"), + ); +} + +function rightInset() { + return Number.parseFloat( + getComputedStyle(document.documentElement).getPropertyValue("--sar"), + ); +} + +function bottomInset() { + return Number.parseFloat( + getComputedStyle(document.documentElement).getPropertyValue("--sab"), + ); +} + +function leftInset() { + return Number.parseFloat( + getComputedStyle(document.documentElement).getPropertyValue("--sal"), + ); +} +{{flutter_js}} +{{flutter_build_config}} +window.addEventListener("load", (_) => { + _flutter.loader.load({ + config: { + // Use the local CanvasKit bundle instead of the CDN to reduce test flakiness. + canvasKitBaseUrl: "/canvaskit/", + }, + onEntrypointLoaded: (engineInitializer) => { + engineInitializer.initializeEngine().then((appRunner) => { + appRunner.runApp().then((_) => { + document + .querySelector('meta[name="viewport"]') + .setAttribute( + "content", + "width=device-width, initial-scale=1.0, viewport-fit=cover", + ); + }); + }); + }, + }); +}); diff --git a/web/index.html b/web/index.html index 4ee78d1..2a80047 100644 --- a/web/index.html +++ b/web/index.html @@ -40,49 +40,10 @@ samba_public_app - - - - + - \ No newline at end of file