From df37b8a59cd2693fe82cdc1eef9d7322ee9c30ee Mon Sep 17 00:00:00 2001 From: shohei Date: Sat, 18 Feb 2023 23:14:23 +0900 Subject: [PATCH] Feature/flutter3 (#42) * update * update * update * update * update * Update pubspec.yaml * update * update --- flamingo/CHANGELOG.md | 5 +- flamingo/example/android/app/build.gradle | 2 +- flamingo/example/android/build.gradle | 4 +- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- flamingo/example/ios/Flutter/Flutter.podspec | 8 +- flamingo/example/ios/Podfile | 6 +- flamingo/example/ios/Podfile.lock | 141 +++-- .../ios/Runner.xcodeproj/project.pbxproj | 29 +- flamingo/example/ios/Runner/Info.plist | 2 + flamingo/example/lib/main.dart | 261 ++++----- flamingo/example/lib/main_sample.dart | 6 +- .../example/lib/model/owner.flamingo.dart | 3 +- .../example/lib/model/shop/shop.flamingo.dart | 3 +- flamingo/example/lib/rounded_button.dart | 48 ++ flamingo/example/pubspec.yaml | 9 +- flamingo/lib/flamingo.dart | 2 - .../archive/collection_paging_listener_1.dart | 1 - .../archive/collection_paging_listener_2.dart | 1 - flamingo/lib/src/base.dart | 30 +- flamingo/lib/src/batch.dart | 7 +- .../lib/src/collection_paging_listener.dart | 4 +- flamingo/lib/src/distributed_counter.dart | 34 +- flamingo/lib/src/document_accessor.dart | 14 +- flamingo/lib/src/helper/helper.dart | 68 ++- flamingo/lib/src/model/collection.dart | 2 +- flamingo/lib/src/model/counter.dart | 3 +- flamingo/lib/src/model/document.dart | 34 +- flamingo/lib/src/model/increment.dart | 8 +- flamingo/lib/src/model/storage_file.dart | 15 +- flamingo/lib/src/run_transaction.dart | 6 +- flamingo/lib/src/storage.dart | 30 +- flamingo/pubspec.yaml | 16 +- flamingo_annotation/CHANGELOG.md | 5 +- flamingo_annotation/example/.gitignore | 43 -- flamingo_annotation/example/.metadata | 10 - flamingo_annotation/example/README.md | 16 - .../example/android/.gitignore | 7 - .../example/android/app/build.gradle | 63 --- .../android/app/src/debug/AndroidManifest.xml | 7 - .../android/app/src/main/AndroidManifest.xml | 47 -- .../MainActivity.kt | 6 - .../main/res/drawable/launch_background.xml | 12 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes .../app/src/main/res/values/styles.xml | 18 - .../app/src/profile/AndroidManifest.xml | 7 - .../example/android/build.gradle | 31 -- .../example/android/gradle.properties | 4 - .../gradle/wrapper/gradle-wrapper.properties | 6 - .../example/android/settings.gradle | 15 - flamingo_annotation/example/ios/.gitignore | 32 -- .../ios/Flutter/AppFrameworkInfo.plist | 26 - .../example/ios/Flutter/Debug.xcconfig | 2 - .../example/ios/Flutter/Release.xcconfig | 2 - flamingo_annotation/example/ios/Podfile | 87 --- .../ios/Runner.xcodeproj/project.pbxproj | 506 ------------------ .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 91 ---- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../example/ios/Runner/AppDelegate.swift | 13 - .../AppIcon.appiconset/Contents.json | 122 ----- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 564 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 1283 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 1588 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 1025 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 1716 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 1920 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 1283 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 1895 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 2665 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 2665 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 3831 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 1888 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 3294 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 3612 -> 0 bytes .../LaunchImage.imageset/Contents.json | 23 - .../LaunchImage.imageset/LaunchImage.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/README.md | 5 - .../Runner/Base.lproj/LaunchScreen.storyboard | 37 -- .../ios/Runner/Base.lproj/Main.storyboard | 26 - .../example/ios/Runner/Info.plist | 45 -- .../ios/Runner/Runner-Bridging-Header.h | 1 - flamingo_annotation/example/lib/main.dart | 33 -- flamingo_annotation/example/pubspec.lock | 160 ------ flamingo_annotation/example/pubspec.yaml | 71 --- .../example/test/widget_test.dart | 27 - flamingo_annotation/pubspec.lock | 2 +- flamingo_annotation/pubspec.yaml | 4 +- flamingo_generator/CHANGELOG.md | 5 +- flamingo_generator/example/pubspec.yaml | 6 +- flamingo_generator/pubspec.yaml | 14 +- 101 files changed, 468 insertions(+), 2019 deletions(-) create mode 100644 flamingo/example/lib/rounded_button.dart delete mode 100644 flamingo_annotation/example/.gitignore delete mode 100644 flamingo_annotation/example/.metadata delete mode 100644 flamingo_annotation/example/README.md delete mode 100644 flamingo_annotation/example/android/.gitignore delete mode 100644 flamingo_annotation/example/android/app/build.gradle delete mode 100644 flamingo_annotation/example/android/app/src/debug/AndroidManifest.xml delete mode 100644 flamingo_annotation/example/android/app/src/main/AndroidManifest.xml delete mode 100644 flamingo_annotation/example/android/app/src/main/kotlin/com/gmail/hukusuke1007/flamingo_annotation_example/MainActivity.kt delete mode 100644 flamingo_annotation/example/android/app/src/main/res/drawable/launch_background.xml delete mode 100644 flamingo_annotation/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 flamingo_annotation/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 flamingo_annotation/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 flamingo_annotation/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 flamingo_annotation/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 flamingo_annotation/example/android/app/src/main/res/values/styles.xml delete mode 100644 flamingo_annotation/example/android/app/src/profile/AndroidManifest.xml delete mode 100644 flamingo_annotation/example/android/build.gradle delete mode 100644 flamingo_annotation/example/android/gradle.properties delete mode 100644 flamingo_annotation/example/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 flamingo_annotation/example/android/settings.gradle delete mode 100644 flamingo_annotation/example/ios/.gitignore delete mode 100644 flamingo_annotation/example/ios/Flutter/AppFrameworkInfo.plist delete mode 100644 flamingo_annotation/example/ios/Flutter/Debug.xcconfig delete mode 100644 flamingo_annotation/example/ios/Flutter/Release.xcconfig delete mode 100644 flamingo_annotation/example/ios/Podfile delete mode 100644 flamingo_annotation/example/ios/Runner.xcodeproj/project.pbxproj delete mode 100644 flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 flamingo_annotation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100644 flamingo_annotation/example/ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 flamingo_annotation/example/ios/Runner/AppDelegate.swift delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png delete mode 100644 flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md delete mode 100644 flamingo_annotation/example/ios/Runner/Base.lproj/LaunchScreen.storyboard delete mode 100644 flamingo_annotation/example/ios/Runner/Base.lproj/Main.storyboard delete mode 100644 flamingo_annotation/example/ios/Runner/Info.plist delete mode 100644 flamingo_annotation/example/ios/Runner/Runner-Bridging-Header.h delete mode 100644 flamingo_annotation/example/lib/main.dart delete mode 100644 flamingo_annotation/example/pubspec.lock delete mode 100644 flamingo_annotation/example/pubspec.yaml delete mode 100644 flamingo_annotation/example/test/widget_test.dart diff --git a/flamingo/CHANGELOG.md b/flamingo/CHANGELOG.md index ae38510..277f832 100644 --- a/flamingo/CHANGELOG.md +++ b/flamingo/CHANGELOG.md @@ -1,4 +1,7 @@ -# 2.18.0 +# 3.0.0 +Updated Plugins and modified example code. + +## 2.18.0 Updated Plugins and modified example code. ## 2.17.0 diff --git a/flamingo/example/android/app/build.gradle b/flamingo/example/android/app/build.gradle index 18f746e..6968747 100644 --- a/flamingo/example/android/app/build.gradle +++ b/flamingo/example/android/app/build.gradle @@ -46,7 +46,7 @@ android { defaultConfig { applicationId "com.gmail.hukusuke1007.flamingo_example" minSdkVersion 24 - targetSdkVersion 31 + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/flamingo/example/android/build.gradle b/flamingo/example/android/build.gradle index 1399547..6f5ac97 100644 --- a/flamingo/example/android/build.gradle +++ b/flamingo/example/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.6.10' repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/flamingo/example/ios/Flutter/AppFrameworkInfo.plist b/flamingo/example/ios/Flutter/AppFrameworkInfo.plist index f2872cf..4f8d4d2 100644 --- a/flamingo/example/ios/Flutter/AppFrameworkInfo.plist +++ b/flamingo/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/flamingo/example/ios/Flutter/Flutter.podspec b/flamingo/example/ios/Flutter/Flutter.podspec index 663d5b2..8ce4394 100644 --- a/flamingo/example/ios/Flutter/Flutter.podspec +++ b/flamingo/example/ios/Flutter/Flutter.podspec @@ -6,12 +6,12 @@ Pod::Spec.new do |s| s.name = 'Flutter' s.version = '1.0.0' - s.summary = 'High-performance, high-fidelity mobile apps.' - s.homepage = 'https://flutter.io' - s.license = { :type => 'MIT' } + s.summary = 'A UI toolkit for beautiful and fast apps.' + s.homepage = 'https://flutter.dev' + s.license = { :type => 'BSD' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '11.0' # Framework linking is handled by Flutter tooling, not CocoaPods. # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. s.vendored_frameworks = 'path/to/nothing' diff --git a/flamingo/example/ios/Podfile b/flamingo/example/ios/Podfile index e305cd6..c606e5d 100644 --- a/flamingo/example/ios/Podfile +++ b/flamingo/example/ios/Podfile @@ -1,10 +1,10 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' -$FirebaseSdkVersion = '9.3.0' +$FirebaseSdkVersion = '10.3.0' project 'Runner', { 'Debug' => :debug, @@ -42,4 +42,4 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) end -end \ No newline at end of file +end diff --git a/flamingo/example/ios/Podfile.lock b/flamingo/example/ios/Podfile.lock index df8ab2f..67b676a 100644 --- a/flamingo/example/ios/Podfile.lock +++ b/flamingo/example/ios/Podfile.lock @@ -1,83 +1,72 @@ PODS: - - cloud_firestore (3.4.3): - - Firebase/Firestore (= 9.3.0) + - cloud_firestore (4.4.2): + - Firebase/Firestore (= 10.3.0) - firebase_core - Flutter - - Firebase/CoreOnly (9.3.0): - - FirebaseCore (= 9.3.0) - - Firebase/Firestore (9.3.0): + - nanopb (< 2.30910.0, >= 2.30908.0) + - Firebase/CoreOnly (10.3.0): + - FirebaseCore (= 10.3.0) + - Firebase/Firestore (10.3.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 9.3.0) - - Firebase/Storage (9.3.0): + - FirebaseFirestore (~> 10.3.0) + - Firebase/Storage (10.3.0): - Firebase/CoreOnly - - FirebaseStorage (~> 9.3.0) - - firebase_core (1.20.0): - - Firebase/CoreOnly (= 9.3.0) + - FirebaseStorage (~> 10.3.0) + - firebase_core (2.6.1): + - Firebase/CoreOnly (= 10.3.0) - Flutter - - firebase_storage (10.3.4): - - Firebase/Storage (= 9.3.0) + - firebase_storage (11.0.13): + - Firebase/Storage (= 10.3.0) - firebase_core - Flutter - - FirebaseAppCheckInterop (9.3.0) - - FirebaseAuthInterop (9.3.0) - - FirebaseCore (9.3.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.3.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreExtension (9.3.0): - - FirebaseCore (~> 9.0) - - FirebaseCoreInternal (9.3.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseFirestore (9.3.0): - - FirebaseFirestore/AutodetectLeveldb (= 9.3.0) - - FirebaseFirestore/AutodetectLeveldb (9.3.0): + - FirebaseAppCheckInterop (10.4.0) + - FirebaseAuthInterop (10.4.0) + - FirebaseCore (10.3.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreExtension (10.4.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.4.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseFirestore (10.3.0): + - FirebaseFirestore/AutodetectLeveldb (= 10.3.0) + - FirebaseFirestore/AutodetectLeveldb (10.3.0): - FirebaseFirestore/Base - FirebaseFirestore/WithLeveldb - - FirebaseFirestore/Base (9.3.0) - - FirebaseFirestore/WithLeveldb (9.3.0): + - FirebaseFirestore/Base (10.3.0) + - FirebaseFirestore/WithLeveldb (10.3.0): - FirebaseFirestore/Base - - FirebaseStorage (9.3.0): - - FirebaseAppCheckInterop (~> 9.0) - - FirebaseAuthInterop (~> 9.0) - - FirebaseCore (~> 9.0) - - FirebaseCoreExtension (~> 9.0) - - FirebaseStorageInternal (~> 9.0) - - FirebaseStorageInternal (9.3.0): - - FirebaseCore (~> 9.0) - - GTMSessionFetcher/Core (< 3.0, >= 1.7) + - FirebaseStorage (10.3.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) - Flutter (1.0.0) - - GoogleDataTransport (9.2.0): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GTMSessionFetcher/Core (2.0.0) + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GTMSessionFetcher/Core (3.1.0) - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) - nanopb/encode (= 2.30909.0) - nanopb/decode (2.30909.0) - nanopb/encode (2.30909.0) - - path_provider_ios (0.0.1): + - path_provider_foundation (0.0.1): - Flutter + - FlutterMacOS - PromisesObjC (2.1.1) DEPENDENCIES: - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`) - - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `9.3.0`) + - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.3.0`) - Flutter (from `Flutter`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) SPEC REPOS: trunk: @@ -85,12 +74,9 @@ SPEC REPOS: - FirebaseAppCheckInterop - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseStorage - - FirebaseStorageInternal - - GoogleDataTransport - GoogleUtilities - GTMSessionFetcher - nanopb @@ -105,39 +91,36 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/firebase_storage/ios" FirebaseFirestore: :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git - :tag: 9.3.0 + :tag: 10.3.0 Flutter: :path: Flutter - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/ios" CHECKOUT OPTIONS: FirebaseFirestore: :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git - :tag: 9.3.0 + :tag: 10.3.0 SPEC CHECKSUMS: - cloud_firestore: 08093e207dfb2e6c82a6b272def699e022548786 - Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c - firebase_core: 96214f90497b808a2cf2a24517084c5f6de37b53 - firebase_storage: e95ec41580e311cb30b1ed7459b9e94fb4bbe672 - FirebaseAppCheckInterop: f6b9670fb1360cf12006ca426e9c3b9a35317d17 - FirebaseAuthInterop: 79826b4edc64e1d10135947866ad4437657e8696 - FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a - FirebaseCoreDiagnostics: 060eb57cc56dfaf40b1b1b5874a5c17c41ce79f8 - FirebaseCoreExtension: 900b065a4970c31ce8de4e966cee910188e3a07b - FirebaseCoreInternal: 635d1c9a612a6502b6377a0c92af83758076ffff - FirebaseFirestore: 033f80710e26a86fd6ecf2a41441360436e45cb9 - FirebaseStorage: 1414d27e15fa04f6350ef6602accef0e951c8bca - FirebaseStorageInternal: f1a6d64cace780580d2b8ffa0a0c8cf3c376f3f8 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - GTMSessionFetcher: 681175626052e03fdde7952f7e9c7a9785719506 + cloud_firestore: 2d8c9f23063a6f735004f9b52cc743f7d8c8a5ae + Firebase: f92fc551ead69c94168d36c2b26188263860acd9 + firebase_core: 6242f038aefa4582e028536e71312f7e3a41e6bb + firebase_storage: 1cf1f798f92d7d66b0bab3d866f63f1bf41def1c + FirebaseAppCheckInterop: ef074633831a90cf6c10e8f2c1e1f8b7842a446a + FirebaseAuthInterop: fef284922da3c350f846ff85cc0dfd5186448e49 + FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a + FirebaseCoreExtension: d209ada6f48bac53d149e996cf1b2dafa632a615 + FirebaseCoreInternal: e301297f4c15a17489e48ed722d733b1578e0c02 + FirebaseFirestore: f16ed5e8e5b024eff4928bc33605df9526bda650 + FirebaseStorage: 0efbff0ac978981866d89804191688ae50d64033 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + GTMSessionFetcher: c9e714f7eec91a55641e2bab9f45fd83a219b882 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 + path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb -PODFILE CHECKSUM: 13191e9e14917d800bed579615f9504170188f60 +PODFILE CHECKSUM: 7ac0fc9959e92330f3f2cf412fdfd089b4ee4c76 COCOAPODS: 1.11.3 diff --git a/flamingo/example/ios/Runner.xcodeproj/project.pbxproj b/flamingo/example/ios/Runner.xcodeproj/project.pbxproj index 217792d..6132840 100644 --- a/flamingo/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flamingo/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -213,6 +213,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -257,34 +258,28 @@ "${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework", "${BUILT_PRODUCTS_DIR}/FirebaseAuthInterop/FirebaseAuthInterop.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseStorage/FirebaseStorage.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseStorageInternal/FirebaseStorageInternal.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", - "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", - "${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework", + "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuthInterop.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorageInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -293,6 +288,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -420,7 +416,10 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -553,7 +552,10 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -582,7 +584,10 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", diff --git a/flamingo/example/ios/Runner/Info.plist b/flamingo/example/ios/Runner/Info.plist index 44527e8..dbb1a5c 100644 --- a/flamingo/example/ios/Runner/Info.plist +++ b/flamingo/example/ios/Runner/Info.plist @@ -43,5 +43,7 @@ CADisableMinimumFrameDurationOnPhone + UIApplicationSupportsIndirectInputEvents + diff --git a/flamingo/example/lib/main.dart b/flamingo/example/lib/main.dart index 105658c..5810058 100644 --- a/flamingo/example/lib/main.dart +++ b/flamingo/example/lib/main.dart @@ -3,6 +3,7 @@ import 'package:flamingo_example/collection_paging_listener_page.dart'; import 'package:flamingo_example/collection_paging_listener_stream_builder_page.dart'; import 'package:flamingo_example/collection_paging_page.dart'; import 'package:flamingo_example/firebase_options.dart'; +import 'package:flamingo_example/rounded_button.dart'; import 'package:flutter/material.dart'; import 'flamingo_test.dart'; @@ -63,10 +64,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () { + onTap: () { Navigator.of(context, rootNavigator: false) .push(MaterialPageRoute( builder: (BuildContext context) => @@ -83,10 +83,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightGreen, - onPressed: () { + onTap: () { Navigator.of(context, rootNavigator: false) .push(MaterialPageRoute( builder: (BuildContext context) => @@ -98,10 +97,10 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + const SizedBox(width: 8), + RoundedButton( color: Colors.orange, - onPressed: () { + onTap: () { Navigator.of(context, rootNavigator: false) .push(MaterialPageRoute( builder: (BuildContext context) => @@ -126,10 +125,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.all(); }, child: Text( @@ -150,10 +148,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.save(); }, child: Text( @@ -161,21 +158,22 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), - color: Colors.amberAccent, - onPressed: () async { - await test.update(); - }, - child: Text( - 'update', - style: TextStyle(color: Colors.white), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: RoundedButton( + color: Colors.amberAccent, + onTap: () async { + await test.update(); + }, + child: Text( + 'update', + style: TextStyle(color: Colors.white), + ), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.delete(); }, child: Text( @@ -196,10 +194,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveRaw(); }, child: Text( @@ -207,21 +204,22 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), - color: Colors.amberAccent, - onPressed: () async { - await test.updateRaw(); - }, - child: Text( - 'update', - style: TextStyle(color: Colors.white), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: RoundedButton( + color: Colors.amberAccent, + onTap: () async { + await test.updateRaw(); + }, + child: Text( + 'update', + style: TextStyle(color: Colors.white), + ), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.deleteRaw(); }, child: Text( @@ -242,10 +240,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.batchSave(); }, child: Text( @@ -253,10 +250,10 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + const SizedBox(width: 8), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.batchUpdateDelete(); }, child: Text( @@ -277,10 +274,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.batchSaveRaw(); }, child: Text( @@ -288,10 +284,10 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + const SizedBox(width: 8), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.batchUpdateDeleteRaw(); }, child: Text( @@ -312,10 +308,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.batchCollectionCRUD(); }, child: Text( @@ -336,10 +331,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.redAccent, - onPressed: () async { + onTap: () async { await test.getAndUpdate(); }, child: Text( @@ -347,10 +341,10 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + const SizedBox(width: 8), + RoundedButton( color: Colors.green, - onPressed: () async { + onTap: () async { await test.getCollection(); }, child: Text( @@ -371,10 +365,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.green, - onPressed: () async { + onTap: () async { await test.subCollection(); }, child: Text( @@ -395,10 +388,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveStorage(); }, child: Text( @@ -406,10 +398,9 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.deleteStorage(); }, child: Text( @@ -430,10 +421,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveStorageAndDoc(); }, child: Text( @@ -441,10 +431,9 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.deleteStorageAndDoc(); }, child: Text( @@ -452,10 +441,9 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveAndDeleteStorageDocWithDocumentAccessor(); }, child: Text( @@ -476,10 +464,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.distributedCounter(); }, child: Text( @@ -500,10 +487,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.transactionSave(); }, child: Text( @@ -511,10 +497,9 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.amber, - onPressed: () async { + onTap: () async { await test.transactionUpdate(); }, child: Text( @@ -522,10 +507,9 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.black12, - onPressed: () async { + onTap: () async { await test.transactionDelete(); }, child: Text( @@ -546,10 +530,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveMap(); }, child: Text( @@ -570,10 +553,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.saveList(); }, child: Text( @@ -594,10 +576,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.checkModelSample(); }, child: Text( @@ -618,10 +599,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.listenerSample(); }, child: Text( @@ -642,10 +622,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.model(); }, child: Text( @@ -666,10 +645,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.incrementTest1(); }, child: Text( @@ -677,21 +655,22 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), - color: Colors.deepPurple, - onPressed: () async { - await test.incrementTest2(); - }, - child: Text( - 'Save 2', - style: TextStyle(color: Colors.white), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: RoundedButton( + color: Colors.deepPurple, + onTap: () async { + await test.incrementTest2(); + }, + child: Text( + 'Save 2', + style: TextStyle(color: Colors.white), + ), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.deepOrangeAccent, - onPressed: () async { + onTap: () async { await test.incrementTest3(); }, child: Text( @@ -712,10 +691,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.valueZeroTest(); }, child: Text( @@ -736,10 +714,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.extendCRUD(); }, child: Text( @@ -760,10 +737,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.testReferencePath(); }, child: Text( @@ -784,10 +760,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.testCustomFieldValueKey(); }, child: Text( @@ -808,10 +783,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.testErrorCheck(); }, child: Text( @@ -832,10 +806,9 @@ class HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.loadUsers(); }, child: Text( @@ -843,10 +816,10 @@ class HomePage extends StatelessWidget { style: TextStyle(color: Colors.white), ), ), - RaisedButton( - padding: const EdgeInsets.all(4), + const SizedBox(width: 8), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { await test.loadMoreUsers(); }, child: Text( diff --git a/flamingo/example/lib/main_sample.dart b/flamingo/example/lib/main_sample.dart index d09c394..184395e 100644 --- a/flamingo/example/lib/main_sample.dart +++ b/flamingo/example/lib/main_sample.dart @@ -1,5 +1,6 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:firebase_core/firebase_core.dart'; +import 'package:flamingo_example/rounded_button.dart'; import 'package:flutter/material.dart'; void main() async { @@ -55,10 +56,9 @@ class _HomePage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - padding: const EdgeInsets.all(4), + RoundedButton( color: Colors.lightBlue, - onPressed: () async { + onTap: () async { final ref = FirebaseFirestore.instance.collection('aaaa').doc(); ref.set({'user': 'aaa'}); diff --git a/flamingo/example/lib/model/owner.flamingo.dart b/flamingo/example/lib/model/owner.flamingo.dart index 4197d89..a672c07 100644 --- a/flamingo/example/lib/model/owner.flamingo.dart +++ b/flamingo/example/lib/model/owner.flamingo.dart @@ -52,8 +52,7 @@ void _$fromData(Owner doc, Map data) { final _medals = Helper.valueMapListFromKey(data, 'medals'); if (_medals != null) { - doc.medals = - _medals.where((d) => d != null).map((d) => Medal(values: d)).toList(); + doc.medals = _medals.map((d) => Medal(values: d)).toList(); } else { doc.medals = null; } diff --git a/flamingo/example/lib/model/shop/shop.flamingo.dart b/flamingo/example/lib/model/shop/shop.flamingo.dart index 10c6be8..8329ae7 100644 --- a/flamingo/example/lib/model/shop/shop.flamingo.dart +++ b/flamingo/example/lib/model/shop/shop.flamingo.dart @@ -52,8 +52,7 @@ void _$fromData(Shop doc, Map data) { final _carts = Helper.valueMapListFromKey(data, 'carts'); if (_carts != null) { - doc.carts = - _carts.where((d) => d != null).map((d) => Cart(values: d)).toList(); + doc.carts = _carts.map((d) => Cart(values: d)).toList(); } else { doc.carts = null; } diff --git a/flamingo/example/lib/rounded_button.dart b/flamingo/example/lib/rounded_button.dart new file mode 100644 index 0000000..2feff3a --- /dev/null +++ b/flamingo/example/lib/rounded_button.dart @@ -0,0 +1,48 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class RoundedButton extends StatelessWidget { + const RoundedButton({ + this.height, + this.width, + required this.child, + this.color, + this.disableColor, + this.elevation, + this.side = BorderSide.none, + this.isLoading = false, + this.onTap, + this.statesController, + super.key, + }); + + final double? height; + final double? width; + final Widget child; + final Color? color; + final Color? disableColor; + final double? elevation; + final BorderSide side; + final bool isLoading; + final VoidCallback? onTap; + final MaterialStatesController? statesController; + + @override + Widget build(BuildContext context) { + return SizedBox( + height: height, + width: width, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + foregroundColor: color, + shape: const StadiumBorder().copyWith(side: side), + disabledBackgroundColor: disableColor ?? Colors.grey, + elevation: elevation, + ), + onPressed: onTap, + statesController: statesController, + child: isLoading ? const CupertinoActivityIndicator() : child, + ), + ); + } +} diff --git a/flamingo/example/pubspec.yaml b/flamingo/example/pubspec.yaml index da05d23..cee9e50 100644 --- a/flamingo/example/pubspec.yaml +++ b/flamingo/example/pubspec.yaml @@ -1,15 +1,16 @@ name: flamingo_example description: Demonstrates how to use the flamingo plugin. publish_to: 'none' +version: 1.0.0 environment: - sdk: '>=2.17.5 <3.0.0' + sdk: ">=2.18.0 <3.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.5 path_provider: pull_to_refresh_flutter3: ^2.0.1 @@ -17,7 +18,7 @@ dependencies: flamingo: path: ../ - flamingo_annotation: + flamingo_annotation: 1.0.0 dev_dependencies: flutter_test: @@ -28,7 +29,7 @@ dev_dependencies: flamingo_generator: path: ../../flamingo_generator/ - test: ^1.14.4 + test: flutter: uses-material-design: true diff --git a/flamingo/lib/flamingo.dart b/flamingo/lib/flamingo.dart index 9e66c6e..55a39f0 100644 --- a/flamingo/lib/flamingo.dart +++ b/flamingo/lib/flamingo.dart @@ -1,5 +1,3 @@ -library flamingo; - import 'package:cloud_firestore/cloud_firestore.dart' show CollectionReference, diff --git a/flamingo/lib/src/archive/collection_paging_listener_1.dart b/flamingo/lib/src/archive/collection_paging_listener_1.dart index 58bf6c6..d29599f 100644 --- a/flamingo/lib/src/archive/collection_paging_listener_1.dart +++ b/flamingo/lib/src/archive/collection_paging_listener_1.dart @@ -183,7 +183,6 @@ // } // } // docs.insert(change.newIndex, data); -// // TODO(shohei): It will be refactored this later. // if (initialLimit >= docs.length) { // _startAfterDocument = querySnapshot.docs.last; // } diff --git a/flamingo/lib/src/archive/collection_paging_listener_2.dart b/flamingo/lib/src/archive/collection_paging_listener_2.dart index 6822154..4f4f385 100644 --- a/flamingo/lib/src/archive/collection_paging_listener_2.dart +++ b/flamingo/lib/src/archive/collection_paging_listener_2.dart @@ -4,7 +4,6 @@ // import 'package:flutter/foundation.dart'; // import 'package:rxdart/rxdart.dart'; // -// // TODO(shohei): リアルタイムアップデートのみのページング // /// やりたいことができなかった // // /// CollectionPagingListener is SnapshotListener + Paging features. diff --git a/flamingo/lib/src/base.dart b/flamingo/lib/src/base.dart index 658c065..a163382 100644 --- a/flamingo/lib/src/base.dart +++ b/flamingo/lib/src/base.dart @@ -15,7 +15,10 @@ class Base { Helper.writeModel(data, key, model); void writeModelList( - Map data, String key, List models) => + Map data, + String key, + List models, + ) => Helper.writeModelList(data, key, models); void writeNotNull(Map data, String key, dynamic value) => @@ -25,7 +28,10 @@ class Base { Helper.writeModelNotNull(data, key, model); void writeModelListNotNull( - Map data, String key, List models) => + Map data, + String key, + List models, + ) => Helper.writeModelListNotNull(data, key, models); void writeStorage( @@ -58,14 +64,20 @@ class Base { List storageFiles, { bool isSetNull = true, }) => - Helper.writeStorageListNotNull(data, key, storageFiles, - isSetNull: isSetNull); + Helper.writeStorageListNotNull( + data, + key, + storageFiles, + isSetNull: isSetNull, + ); StorageFile? storageFile(Map data, String folderName) => Helper.storageFile(data, folderName); List? storageFiles( - Map data, String folderName) => + Map data, + String folderName, + ) => Helper.storageFiles(data, folderName); U valueFromKey( @@ -82,11 +94,15 @@ class Base { Helper.valueListFromKey(data, key); List>? valueMapListFromKey( - Map data, String key) => + Map data, + String key, + ) => Helper.valueMapListFromKey(data, key); Increment valueFromIncrement( - Map data, String key) => + Map data, + String key, + ) => Helper.valueFromIncrement(data, key); bool isVal(Map data, String key) => Helper.isVal(data, key); diff --git a/flamingo/lib/src/batch.dart b/flamingo/lib/src/batch.dart index a9e073b..236dd90 100644 --- a/flamingo/lib/src/batch.dart +++ b/flamingo/lib/src/batch.dart @@ -56,7 +56,10 @@ class Batch implements BatchRepository { data[document.updatedFieldValueKey] = nowAt; document.setAt(createdAt: nowAt, updatedAt: nowAt); _writeBatch.set( - reference ?? document.reference, data, SetOptions(merge: true)); + reference ?? document.reference, + data, + SetOptions(merge: true), + ); _batchDocument.add(_BatchDocument(document, ExecuteType.create)); } @@ -131,6 +134,6 @@ class Batch implements BatchRepository { class _BatchDocument { _BatchDocument(this.document, this.executeType); - final Document document; + final Document document; final ExecuteType executeType; } diff --git a/flamingo/lib/src/collection_paging_listener.dart b/flamingo/lib/src/collection_paging_listener.dart index e0f7960..f7b023b 100644 --- a/flamingo/lib/src/collection_paging_listener.dart +++ b/flamingo/lib/src/collection_paging_listener.dart @@ -89,9 +89,7 @@ class _PagingListener> { required this.decode, this.collectionReference, }) { - _loadController - .switchMap((event) => Stream.value(event)) - .listen(_fetch); + _loadController.switchMap(Stream.value).listen(_fetch); } final Query> query; diff --git a/flamingo/lib/src/distributed_counter.dart b/flamingo/lib/src/distributed_counter.dart index 82aa2be..d47cefc 100644 --- a/flamingo/lib/src/distributed_counter.dart +++ b/flamingo/lib/src/distributed_counter.dart @@ -1,7 +1,6 @@ import 'dart:math'; import '../flamingo.dart'; -import 'model/counter.dart'; abstract class DistributedCounterRepository { Future create(Counter counter); @@ -15,9 +14,12 @@ class DistributedCounter implements DistributedCounterRepository { _create(counter.parentRef, counter.collectionName, counter.numShards); @override - Future increment(Counter counter, {int? count}) async => - _increment(counter.parentRef, counter.collectionName, counter.numShards, - count: count); + Future increment(Counter counter, {int? count}) async => _increment( + counter.parentRef, + counter.collectionName, + counter.numShards, + count: count, + ); @override Future load(Counter counter) async { @@ -27,22 +29,34 @@ class DistributedCounter implements DistributedCounterRepository { } Future _create( - DocumentReference ref, String collectionName, int numShards) async { + DocumentReference ref, + String collectionName, + int numShards, + ) async { final batch = firestoreInstance.batch() - ..set(ref, {'numShards': numShards}, - SetOptions(merge: true)); + ..set( + ref, + {'numShards': numShards}, + SetOptions(merge: true), + ); for (var i = 0; i < numShards; i++) { final shardRef = ref.collection(collectionName).doc(i.toString()); batch.set( - shardRef, {'count': 0}, SetOptions(merge: true)); + shardRef, + {'count': 0}, + SetOptions(merge: true), + ); } await batch.commit(); return; } Future _increment( - DocumentReference ref, String collectionName, int numShards, - {int? count}) async { + DocumentReference ref, + String collectionName, + int numShards, { + int? count, + }) async { final shardId = Random().nextInt(numShards); final shardRef = ref.collection(collectionName).doc(shardId.toString()); await shardRef diff --git a/flamingo/lib/src/document_accessor.dart b/flamingo/lib/src/document_accessor.dart index 5ae408e..4e2dab1 100644 --- a/flamingo/lib/src/document_accessor.dart +++ b/flamingo/lib/src/document_accessor.dart @@ -61,7 +61,7 @@ class DocumentAccessor implements DocumentAccessorRepository { isTimestamp: true, ); await batch.commit(); - return Increment(value: updateValue as T, incrementValue: null); + return Increment(value: updateValue as T); } @override @@ -90,8 +90,8 @@ class DocumentAccessor implements DocumentAccessorRepository { fromCache(null); } } - final _document = await _load(document, source); - return _document != null ? _document as T : null; + final document0 = await _load(document, source); + return document0 != null ? document0 as T : null; } @override @@ -104,8 +104,8 @@ class DocumentAccessor implements DocumentAccessorRepository { } on Exception catch (_) { // nothing } - final _document = await _load(document, Source.serverAndCache); - return _document != null ? _document as T : null; + final document0 = await _load(document, Source.serverAndCache); + return document0 != null ? document0 as T : null; } @override @@ -122,7 +122,9 @@ class DocumentAccessor implements DocumentAccessorRepository { } Future?> _load>( - Document document, Source source) async { + Document document, + Source source, + ) async { final documentSnapshot = await document.reference.get(GetOptions(source: source)); if (documentSnapshot.exists) { diff --git a/flamingo/lib/src/helper/helper.dart b/flamingo/lib/src/helper/helper.dart index cf0f239..1e9bfdb 100644 --- a/flamingo/lib/src/helper/helper.dart +++ b/flamingo/lib/src/helper/helper.dart @@ -4,18 +4,18 @@ import '../../flamingo.dart'; class Helper { const Helper._(); - static Map fromMap(Map map) => + static Map fromMap(Map map) => Map.from(map); static String randomString({int? length}) { - const _randomChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; - const _charsLength = _randomChars.length; + const randomChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + const charsLength = randomChars.length; final rand = Random(); final codeUnits = List.generate( length ?? 10, (index) { - final n = rand.nextInt(_charsLength); - return _randomChars.codeUnitAt(n); + final n = rand.nextInt(charsLength); + return randomChars.codeUnitAt(n); }, ); return String.fromCharCodes(codeUnits); @@ -44,33 +44,48 @@ class Helper { } static void writeModelList( - Map data, String key, List models) { + Map data, + String key, + List models, + ) { _writeModelList(data, key, models); } static void writeNotNull( - Map data, String key, dynamic value) { + Map data, + String key, + dynamic value, + ) { if (value != null) { data[key] = value; } } static void writeModelNotNull( - Map data, String key, Model? model) { + Map data, + String key, + Model? model, + ) { if (model != null) { data[key] = model.toData(); } } static void writeModelListNotNull( - Map data, String key, List? models) { + Map data, + String key, + List? models, + ) { if (models != null) { _writeModelList(data, key, models); } } static void _writeModelList( - Map data, String key, List models) { + Map data, + String key, + List models, + ) { data[key] = models.map((d) => d.toData()).toList(); } @@ -177,7 +192,9 @@ class Helper { } static StorageFile? storageFile( - Map data, String folderName) { + Map data, + String folderName, + ) { final fileMap = valueMapFromKey(data, folderName); if (fileMap != null) { return StorageFile.fromJson(fileMap); @@ -187,10 +204,12 @@ class Helper { } static List? storageFiles( - Map data, String folderName) { + Map data, + String folderName, + ) { final fileMapList = valueMapListFromKey(data, folderName); if (fileMapList != null) { - return fileMapList.map((d) => StorageFile.fromJson(d)).toList(); + return fileMapList.map(StorageFile.fromJson).toList(); } else { return null; } @@ -218,9 +237,11 @@ class Helper { } static Map? valueMapFromKey( - Map data, String key) => + Map data, + String key, + ) => isVal(data, key) && data[key] != null - ? Map.from(Helper.fromMap(data[key] as Map)) + ? Map.from(Helper.fromMap(data[key] as Map)) : null; static List? valueListFromKey(Map data, String key) => @@ -229,7 +250,9 @@ class Helper { : null; static List>? valueMapListFromKey( - Map data, String key) => + Map data, + String key, + ) => isVal(data, key) && data[key] != null ? (data[key] as List) .map((dynamic d) => Map.from(d as Map)) @@ -237,16 +260,23 @@ class Helper { : null; static Increment valueFromIncrement( - Map data, String key) => + Map data, + String key, + ) => Increment(value: data[key] as U?); static bool isVal(Map data, String key) => data.containsKey(key); static Timestamp? timestampFromMap(dynamic data, String key) { + // ignore: avoid_dynamic_calls if (data != null && data[key] is Map) { - final rawTimestamp = - Map.from(Helper.fromMap(data[key] as Map)); + final rawTimestamp = Map.from( + Helper.fromMap( + // ignore: avoid_dynamic_calls + data[key] as Map, + ), + ); final second = rawTimestamp['_seconds'] as int; final nanoseconds = rawTimestamp['_nanoseconds'] as int; return Timestamp(second, nanoseconds); diff --git a/flamingo/lib/src/model/collection.dart b/flamingo/lib/src/model/collection.dart index 00e09b3..90f7840 100644 --- a/flamingo/lib/src/model/collection.dart +++ b/flamingo/lib/src/model/collection.dart @@ -4,7 +4,7 @@ import '../type/type.dart'; import 'document.dart'; class Collection> { - Collection(Document parent, this.name) + Collection(Document parent, this.name) : ref = parent.reference.collection(name), path = parent.reference.collection(name).path; diff --git a/flamingo/lib/src/model/counter.dart b/flamingo/lib/src/model/counter.dart index 3080dca..9397836 100644 --- a/flamingo/lib/src/model/counter.dart +++ b/flamingo/lib/src/model/counter.dart @@ -1,9 +1,10 @@ import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:flamingo/src/type/type.dart'; import 'document.dart'; class Counter { - Counter(Document parent, this.collectionName, this.numShards) + Counter(Document parent, this.collectionName, this.numShards) : parentRef = parent.reference, path = parent.reference.path; diff --git a/flamingo/lib/src/model/document.dart b/flamingo/lib/src/model/document.dart index 721f2a5..2afb95f 100644 --- a/flamingo/lib/src/model/document.dart +++ b/flamingo/lib/src/model/document.dart @@ -9,23 +9,27 @@ class Document extends Base implements DocumentType { this.snapshot, this.values, CollectionReference>? collectionRef, - }) : assert(id == null || documentPath == null, - 'Can be used only either of \'id\' or \'documentPath\'.'), + }) : assert( + id == null || documentPath == null, + 'Can be used only either of \'id\' or \'documentPath\'.', + ), // ignore: lines_longer_than_80_chars assert( - documentPath == null || collectionPath == null, - // ignore: lines_longer_than_80_chars - 'Can be used only either of \'documentPath\' or \'collectionPath\'.'), + documentPath == null || collectionPath == null, + // ignore: lines_longer_than_80_chars + 'Can be used only either of \'documentPath\' or \'collectionPath\'.', + ), assert( - collectionPath == null || collectionRef == null, - // ignore: lines_longer_than_80_chars - 'Can be used only either of \'collectionPath\' or \'collectionRef\'.') { + collectionPath == null || collectionRef == null, + // ignore: lines_longer_than_80_chars + 'Can be used only either of \'collectionPath\' or \'collectionRef\'.', + ) { if (documentPath != null) { /// From reference path. - final _referenceDocument = Flamingo.instance.firestore.doc(documentPath); - _id = _referenceDocument.id; - _collectionRef = _referenceDocument.parent; - _reference = _referenceDocument; + final referenceDocument = Flamingo.instance.firestore.doc(documentPath); + _id = referenceDocument.id; + _collectionRef = referenceDocument.parent; + _reference = referenceDocument; } else { /// Set collectionRef if (collectionPath != null) { @@ -72,10 +76,10 @@ class Document extends Base implements DocumentType { if (collectionPath != null) { return id != null ? '$collectionPath/$id' : collectionPath; } else { - final _collectionPath = Flamingo.instance.rootReference + final collectionPath0 = Flamingo.instance.rootReference .collection(T.toString().toLowerCase()) .path; - return id != null ? '$_collectionPath/$id' : _collectionPath; + return id != null ? '$collectionPath0/$id' : collectionPath0; } } @@ -97,7 +101,7 @@ class Document extends Base implements DocumentType { String get modelName => toString() .replaceAll('*', '') .split(' ')[2] - .replaceAll("\'", '') + .replaceAll("'", '') .toLowerCase(); CollectionReference> get collectionRootReference => diff --git a/flamingo/lib/src/model/increment.dart b/flamingo/lib/src/model/increment.dart index 4dbdb0b..02d2dd7 100644 --- a/flamingo/lib/src/model/increment.dart +++ b/flamingo/lib/src/model/increment.dart @@ -22,13 +22,13 @@ class Increment { Increment onRefresh() { Increment result; if (isClearValue) { - final _value = T.toString() == 'double' ? 0.0 : 0; - result = Increment(value: _value as T); + final value = T.toString() == 'double' ? 0.0 : 0; + result = Increment(value: value as T); } else { if (incrementValue != null) { - final _value = + final value0 = value != null ? value! + incrementValue! : incrementValue; - result = Increment(value: _value! as T); + result = Increment(value: value0! as T); } else { result = Increment(value: value); } diff --git a/flamingo/lib/src/model/storage_file.dart b/flamingo/lib/src/model/storage_file.dart index f43e6ec..f50ccee 100644 --- a/flamingo/lib/src/model/storage_file.dart +++ b/flamingo/lib/src/model/storage_file.dart @@ -1,13 +1,14 @@ part 'storage_file.g.dart'; class StorageFile { - StorageFile( - {required this.name, - required this.path, - required this.url, - this.mimeType = 'application/octet-stream', - this.additionalData = const {}, - this.metadata = const {}}); + StorageFile({ + required this.name, + required this.path, + required this.url, + this.mimeType = 'application/octet-stream', + this.additionalData = const {}, + this.metadata = const {}, + }); factory StorageFile.fromJson(Map json) => _$StorageFileFromJson(json); diff --git a/flamingo/lib/src/run_transaction.dart b/flamingo/lib/src/run_transaction.dart index 7f224bd..880dad7 100644 --- a/flamingo/lib/src/run_transaction.dart +++ b/flamingo/lib/src/run_transaction.dart @@ -2,8 +2,10 @@ import '../flamingo.dart'; // ignore: avoid_classes_with_only_static_members class RunTransaction { - static Future scope(TransactionHandler transactionHandler, - {Duration timeout = const Duration(seconds: 5)}) { + static Future scope( + TransactionHandler transactionHandler, { + Duration timeout = const Duration(seconds: 5), + }) { return Flamingo.instance.firestore .runTransaction(transactionHandler, timeout: timeout); } diff --git a/flamingo/lib/src/storage.dart b/flamingo/lib/src/storage.dart index d79c86c..3fff6dd 100644 --- a/flamingo/lib/src/storage.dart +++ b/flamingo/lib/src/storage.dart @@ -164,9 +164,12 @@ class Storage implements StorageRepository { additionalData: additionalData, ); final documentAccessor = DocumentAccessor(); - await documentAccessor.saveRaw({ - folderName: storageFile.toJson(), - }, reference); + await documentAccessor.saveRaw( + { + folderName: storageFile.toJson(), + }, + reference, + ); return storageFile; } @@ -190,9 +193,12 @@ class Storage implements StorageRepository { additionalData: additionalData, ); final documentAccessor = DocumentAccessor(); - await documentAccessor.saveRaw({ - folderName: storageFile.toJson(), - }, reference); + await documentAccessor.saveRaw( + { + folderName: storageFile.toJson(), + }, + reference, + ); return storageFile; } @@ -209,15 +215,19 @@ class Storage implements StorageRepository { } @override - Future getData(StorageFile storageFile, - [int maxSize = 10485760]) async { + Future getData( + StorageFile storageFile, [ + int maxSize = 10485760, + ]) async { final ref = storage.ref().child(storageFile.path); return ref.getData(maxSize); } @override - Future getDataWithPath(String filePath, - [int maxSize = 10485760]) async { + Future getDataWithPath( + String filePath, [ + int maxSize = 10485760, + ]) async { final ref = storage.ref().child(filePath); return ref.getData(maxSize); } diff --git a/flamingo/pubspec.yaml b/flamingo/pubspec.yaml index bf878c0..ae231d4 100644 --- a/flamingo/pubspec.yaml +++ b/flamingo/pubspec.yaml @@ -1,23 +1,23 @@ name: flamingo description: This is Firebase Firestore Model Framework Library. Can be manage document reference and collection reference. And provide Firestore and Cloud Storage interface. -version: 2.18.0 +version: 3.0.0 repository: https://github.com/hukusuke1007/flamingo homepage: https://github.com/hukusuke1007/flamingo environment: - sdk: ">=2.17.5 <3.0.0" + sdk: ">=2.18.0 <3.0.0" dependencies: flutter: sdk: flutter - firebase_core: ^1.20.0 - cloud_firestore: ^3.4.3 - firebase_storage: ^10.3.4 - rxdart: ^0.27.5 - universal_io: ^2.0.4 + firebase_core: ^2.6.1 + cloud_firestore: ^4.4.2 + firebase_storage: ^11.0.13 + rxdart: ^0.27.7 + universal_io: ^2.2.0 dev_dependencies: flutter_test: sdk: flutter - pedantic_mono: ^1.19.2 \ No newline at end of file + pedantic_mono: ^1.21.1 \ No newline at end of file diff --git a/flamingo_annotation/CHANGELOG.md b/flamingo_annotation/CHANGELOG.md index 387a917..f1bd1ce 100644 --- a/flamingo_annotation/CHANGELOG.md +++ b/flamingo_annotation/CHANGELOG.md @@ -1,4 +1,7 @@ -# 0.5.0 +# 1.0.0 +Updated pubspec.yaml. + +## 0.5.0 Migrate this package to null safety. Sdk constraints: >=2.12.0-0 <3.0.0 based on beta release guidelines. ## 0.4.0 diff --git a/flamingo_annotation/example/.gitignore b/flamingo_annotation/example/.gitignore deleted file mode 100644 index 1ba9c33..0000000 --- a/flamingo_annotation/example/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Exceptions to above rules. -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/flamingo_annotation/example/.metadata b/flamingo_annotation/example/.metadata deleted file mode 100644 index 6daa7e3..0000000 --- a/flamingo_annotation/example/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: 5f21edf8b66e31a39133177319414395cc5b5f48 - channel: stable - -project_type: app diff --git a/flamingo_annotation/example/README.md b/flamingo_annotation/example/README.md deleted file mode 100644 index ccbf01f..0000000 --- a/flamingo_annotation/example/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# flamingo_annotation_example - -Demonstrates how to use the flamingo_annotation plugin. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) - -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/flamingo_annotation/example/android/.gitignore b/flamingo_annotation/example/android/.gitignore deleted file mode 100644 index bc2100d..0000000 --- a/flamingo_annotation/example/android/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java diff --git a/flamingo_annotation/example/android/app/build.gradle b/flamingo_annotation/example/android/app/build.gradle deleted file mode 100644 index 3b289b5..0000000 --- a/flamingo_annotation/example/android/app/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion 28 - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.gmail.hukusuke1007.flamingo_annotation_example" - minSdkVersion 16 - targetSdkVersion 28 - 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 - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/flamingo_annotation/example/android/app/src/debug/AndroidManifest.xml b/flamingo_annotation/example/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 6a85a85..0000000 --- a/flamingo_annotation/example/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/flamingo_annotation/example/android/app/src/main/AndroidManifest.xml b/flamingo_annotation/example/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 9205504..0000000 --- a/flamingo_annotation/example/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/flamingo_annotation/example/android/app/src/main/kotlin/com/gmail/hukusuke1007/flamingo_annotation_example/MainActivity.kt b/flamingo_annotation/example/android/app/src/main/kotlin/com/gmail/hukusuke1007/flamingo_annotation_example/MainActivity.kt deleted file mode 100644 index 1d7a8cd..0000000 --- a/flamingo_annotation/example/android/app/src/main/kotlin/com/gmail/hukusuke1007/flamingo_annotation_example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.gmail.hukusuke1007.flamingo_annotation_example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/flamingo_annotation/example/android/app/src/main/res/drawable/launch_background.xml b/flamingo_annotation/example/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100644 index 304732f..0000000 --- a/flamingo_annotation/example/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/flamingo_annotation/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/flamingo_annotation/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/flamingo_annotation/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/flamingo_annotation/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/flamingo_annotation/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flamingo_annotation/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/flamingo_annotation/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flamingo_annotation/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/flamingo_annotation/example/android/app/src/main/res/values/styles.xml b/flamingo_annotation/example/android/app/src/main/res/values/styles.xml deleted file mode 100644 index 1f83a33..0000000 --- a/flamingo_annotation/example/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/flamingo_annotation/example/android/app/src/profile/AndroidManifest.xml b/flamingo_annotation/example/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index 6a85a85..0000000 --- a/flamingo_annotation/example/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/flamingo_annotation/example/android/build.gradle b/flamingo_annotation/example/android/build.gradle deleted file mode 100644 index 3100ad2..0000000 --- a/flamingo_annotation/example/android/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -buildscript { - ext.kotlin_version = '1.3.50' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - jcenter() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/flamingo_annotation/example/android/gradle.properties b/flamingo_annotation/example/android/gradle.properties deleted file mode 100644 index 38c8d45..0000000 --- a/flamingo_annotation/example/android/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M -android.enableR8=true -android.useAndroidX=true -android.enableJetifier=true diff --git a/flamingo_annotation/example/android/gradle/wrapper/gradle-wrapper.properties b/flamingo_annotation/example/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 296b146..0000000 --- a/flamingo_annotation/example/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Jun 23 08:50:38 CEST 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/flamingo_annotation/example/android/settings.gradle b/flamingo_annotation/example/android/settings.gradle deleted file mode 100644 index d3b6a40..0000000 --- a/flamingo_annotation/example/android/settings.gradle +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -include ':app' - -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() - -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } - -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/flamingo_annotation/example/ios/.gitignore b/flamingo_annotation/example/ios/.gitignore deleted file mode 100644 index e96ef60..0000000 --- a/flamingo_annotation/example/ios/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 diff --git a/flamingo_annotation/example/ios/Flutter/AppFrameworkInfo.plist b/flamingo_annotation/example/ios/Flutter/AppFrameworkInfo.plist deleted file mode 100644 index 6b4c0f7..0000000 --- a/flamingo_annotation/example/ios/Flutter/AppFrameworkInfo.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 8.0 - - diff --git a/flamingo_annotation/example/ios/Flutter/Debug.xcconfig b/flamingo_annotation/example/ios/Flutter/Debug.xcconfig deleted file mode 100644 index e8efba1..0000000 --- a/flamingo_annotation/example/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" -#include "Generated.xcconfig" diff --git a/flamingo_annotation/example/ios/Flutter/Release.xcconfig b/flamingo_annotation/example/ios/Flutter/Release.xcconfig deleted file mode 100644 index 399e934..0000000 --- a/flamingo_annotation/example/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" -#include "Generated.xcconfig" diff --git a/flamingo_annotation/example/ios/Podfile b/flamingo_annotation/example/ios/Podfile deleted file mode 100644 index 6697f0a..0000000 --- a/flamingo_annotation/example/ios/Podfile +++ /dev/null @@ -1,87 +0,0 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '9.0' - -# CocoaPods analytics sends network stats synchronously affecting flutter build latency. -ENV['COCOAPODS_DISABLE_STATS'] = 'true' - -project 'Runner', { - 'Debug' => :debug, - 'Profile' => :release, - 'Release' => :release, -} - -def parse_KV_file(file, separator='=') - file_abs_path = File.expand_path(file) - if !File.exists? file_abs_path - return []; - end - generated_key_values = {} - skip_line_start_symbols = ["#", "/"] - File.foreach(file_abs_path) do |line| - next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } - plugin = line.split(pattern=separator) - if plugin.length == 2 - podname = plugin[0].strip() - path = plugin[1].strip() - podpath = File.expand_path("#{path}", file_abs_path) - generated_key_values[podname] = podpath - else - puts "Invalid plugin specification: #{line}" - end - end - generated_key_values -end - -target 'Runner' do - use_frameworks! - use_modular_headers! - - # Flutter Pod - - copied_flutter_dir = File.join(__dir__, 'Flutter') - copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework') - copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec') - unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path) - # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet. - # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration. - # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist. - - generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig') - unless File.exist?(generated_xcode_build_settings_path) - raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first" - end - generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path) - cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR']; - - unless File.exist?(copied_framework_path) - FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir) - end - unless File.exist?(copied_podspec_path) - FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir) - end - end - - # Keep pod path relative so it can be checked into Podfile.lock. - pod 'Flutter', :path => 'Flutter' - - # Plugin Pods - - # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock - # referring to absolute paths on developers' machines. - system('rm -rf .symlinks') - system('mkdir -p .symlinks/plugins') - plugin_pods = parse_KV_file('../.flutter-plugins') - plugin_pods.each do |name, path| - symlink = File.join('.symlinks', 'plugins', name) - File.symlink(path, symlink) - pod name, :path => File.join(symlink, 'ios') - end -end - -post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['ENABLE_BITCODE'] = 'NO' - end - end -end diff --git a/flamingo_annotation/example/ios/Runner.xcodeproj/project.pbxproj b/flamingo_annotation/example/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100644 index 96e7347..0000000 --- a/flamingo_annotation/example/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,506 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 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 */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* 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 = ""; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; 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 = ""; }; - 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; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 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 = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - ); - path = Runner; - sourceTree = ""; - }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1020; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 1100; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.hukusuke1007.flamingoAnnotationExample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.hukusuke1007.flamingoAnnotationExample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.gmail.hukusuke1007.flamingoAnnotationExample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/flamingo_annotation/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/flamingo_annotation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flamingo_annotation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index a28140c..0000000 --- a/flamingo_annotation/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/flamingo_annotation/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/flamingo_annotation/example/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d526a1..0000000 --- a/flamingo_annotation/example/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/flamingo_annotation/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/flamingo_annotation/example/ios/Runner/AppDelegate.swift b/flamingo_annotation/example/ios/Runner/AppDelegate.swift deleted file mode 100644 index 70693e4..0000000 --- a/flamingo_annotation/example/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import UIKit -import Flutter - -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fa..0000000 --- a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 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 diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b0bca859a3f474b03065bef75ba58a9e4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1588 zcmV-42Fv-0P)C1SqPt}wig>|5Crh^=oyX$BK<}M8eLU3e2hGT;=G|!_SP)7zNI6fqUMB=)y zRAZ>eDe#*r`yDAVgB_R*LB*MAc)8(b{g{9McCXW!lq7r(btRoB9!8B-#AI6JMb~YFBEvdsV)`mEQO^&#eRKx@b&x- z5lZm*!WfD8oCLzfHGz#u7sT0^VLMI1MqGxF^v+`4YYnVYgk*=kU?HsSz{v({E3lb9 z>+xILjBN)t6`=g~IBOelGQ(O990@BfXf(DRI5I$qN$0Gkz-FSc$3a+2fX$AedL4u{ z4V+5Ong(9LiGcIKW?_352sR;LtDPmPJXI{YtT=O8=76o9;*n%_m|xo!i>7$IrZ-{l z-x3`7M}qzHsPV@$v#>H-TpjDh2UE$9g6sysUREDy_R(a)>=eHw-WAyfIN z*qb!_hW>G)Tu8nSw9yn#3wFMiLcfc4pY0ek1}8(NqkBR@t4{~oC>ryc-h_ByH(Cg5 z>ao-}771+xE3um9lWAY1FeQFxowa1(!J(;Jg*wrg!=6FdRX+t_<%z&d&?|Bn){>zm zZQj(aA_HeBY&OC^jj*)N`8fa^ePOU72VpInJoI1?`ty#lvlNzs(&MZX+R%2xS~5Kh zX*|AU4QE#~SgPzOXe9>tRj>hjU@c1k5Y_mW*Jp3fI;)1&g3j|zDgC+}2Q_v%YfDax z!?umcN^n}KYQ|a$Lr+51Nf9dkkYFSjZZjkma$0KOj+;aQ&721~t7QUKx61J3(P4P1 zstI~7-wOACnWP4=8oGOwz%vNDqD8w&Q`qcNGGrbbf&0s9L0De{4{mRS?o0MU+nR_! zrvshUau0G^DeMhM_v{5BuLjb#Hh@r23lDAk8oF(C+P0rsBpv85EP>4CVMx#04MOfG z;P%vktHcXwTj~+IE(~px)3*MY77e}p#|c>TD?sMatC0Tu4iKKJ0(X8jxQY*gYtxsC z(zYC$g|@+I+kY;dg_dE>scBf&bP1Nc@Hz<3R)V`=AGkc;8CXqdi=B4l2k|g;2%#m& z*jfX^%b!A8#bI!j9-0Fi0bOXl(-c^AB9|nQaE`*)Hw+o&jS9@7&Gov#HbD~#d{twV zXd^Tr^mWLfFh$@Dr$e;PBEz4(-2q1FF0}c;~B5sA}+Q>TOoP+t>wf)V9Iy=5ruQa;z)y zI9C9*oUga6=hxw6QasLPnee@3^Rr*M{CdaL5=R41nLs(AHk_=Y+A9$2&H(B7!_pURs&8aNw7?`&Z&xY_Ye z)~D5Bog^td-^QbUtkTirdyK^mTHAOuptDflut!#^lnKqU md>ggs(5nOWAqO?umG&QVYK#ibz}*4>0000U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI zC*%Wgg22K|8E#!~cTNYR~@Y9KepMPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#% zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?( ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF4|Rt=2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw zqn8u9a)z>l(1kEaPYZ6hwubN6i<8QHgsu0oE) ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy z0um=e3$K3i6K{U_4K!EX?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB# vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{ diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e7edb86cdfe0d15b4b0d98334a86163658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1716 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 diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8f5cee1c98386d13b17e89f719e83555b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1895 zcmV-t2blPYP)FQtfgmafE#=YDCq`qUBt#QpG%*H6QHY765~R=q zZ6iudfM}q!Pz#~9JgOi8QJ|DSu?1-*(kSi1K4#~5?#|rh?sS)(-JQqX*}ciXJ56_H zdw=^s_srbAdqxlvGyrgGet#6T7_|j;95sL%MtM;q86vOxKM$f#puR)Bjv9Zvz9-di zXOTSsZkM83)E9PYBXC<$6(|>lNLVBb&&6y{NByFCp%6+^ALR@NCTse_wqvNmSWI-m z!$%KlHFH2omF!>#%1l3LTZg(s7eof$7*xB)ZQ0h?ejh?Ta9fDv59+u#MokW+1t8Zb zgHv%K(u9G^Lv`lh#f3<6!JVTL3(dCpxHbnbA;kKqQyd1~^Xe0VIaYBSWm6nsr;dFj z4;G-RyL?cYgsN1{L4ZFFNa;8)Rv0fM0C(~Tkit94 zz#~A)59?QjD&pAPSEQ)p8gP|DS{ng)j=2ux)_EzzJ773GmQ_Cic%3JJhC0t2cx>|v zJcVusIB!%F90{+}8hG3QU4KNeKmK%T>mN57NnCZ^56=0?&3@!j>a>B43pi{!u z7JyDj7`6d)qVp^R=%j>UIY6f+3`+qzIc!Y_=+uN^3BYV|o+$vGo-j-Wm<10%A=(Yk^beI{t%ld@yhKjq0iNjqN4XMGgQtbKubPM$JWBz}YA65k%dm*awtC^+f;a-x4+ddbH^7iDWGg&N0n#MW{kA|=8iMUiFYvMoDY@sPC#t$55gn6ykUTPAr`a@!(;np824>2xJthS z*ZdmT`g5-`BuJs`0LVhz+D9NNa3<=6m;cQLaF?tCv8)zcRSh66*Z|vXhG@$I%U~2l z?`Q zykI#*+rQ=z6Jm=Bui-SfpDYLA=|vzGE(dYm=OC8XM&MDo7ux4UF1~0J1+i%aCUpRe zt3L_uNyQ*cE(38Uy03H%I*)*Bh=Lb^Xj3?I^Hnbeq72(EOK^Y93CNp*uAA{5Lc=ky zx=~RKa4{iTm{_>_vSCm?$Ej=i6@=m%@VvAITnigVg{&@!7CDgs908761meDK5azA} z4?=NOH|PdvabgJ&fW2{Mo$Q0CcD8Qc84%{JPYt5EiG{MdLIAeX%T=D7NIP4%Hw}p9 zg)==!2Lbp#j{u_}hMiao9=!VSyx0gHbeCS`;q&vzeq|fs`y&^X-lso(Ls@-706qmA z7u*T5PMo_w3{se1t2`zWeO^hOvTsohG_;>J0wVqVe+n)AbQCx)yh9;w+J6?NF5Lmo zecS@ieAKL8%bVd@+-KT{yI|S}O>pYckUFs;ry9Ow$CD@ztz5K-*D$^{i(_1llhSh^ zEkL$}tsQt5>QA^;QgjgIfBDmcOgi5YDyu?t6vSnbp=1+@6D& z5MJ}B8q;bRlVoxasyhcUF1+)o`&3r0colr}QJ3hcSdLu;9;td>kf@Tcn<@9sIx&=m z;AD;SCh95=&p;$r{Xz3iWCO^MX83AGJ(yH&eTXgv|0=34#-&WAmw{)U7OU9!Wz^!7 zZ%jZFi@JR;>Mhi7S>V7wQ176|FdW2m?&`qa(ScO^CFPR80HucLHOTy%5s*HR0^8)i h0WYBP*#0Ks^FNSabJA*5${_#%002ovPDHLkV1oKhTl@e3 diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b8609df07bf62e5100a53a01510388bd2b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b8609df07bf62e5100a53a01510388bd2b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d164a5a98e212cca15ea7bf2ab5de5108680..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3831 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 diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d39da7941ef3f6dcb7f06a192d8dcb308d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 zcmV-m2cP(fP)x~L`~4d)Rspd&<9kFh{hn*KP1LP0~$;u(LfAu zp%fx&qLBcRHx$G|3q(bv@+b;o0*D|jwD-Q9uQR(l*ST}s+uPgQ-MeFwZ#GS?b332? z&Tk$&_miXn3IGq)AmQ)3sisq{raD4(k*bHvpCe-TdWq^NRTEVM)i9xbgQ&ccnUVx* zEY%vS%gDcSg=!tuIK8$Th2_((_h^+7;R|G{n06&O2#6%LK`a}n?h_fL18btz<@lFG za}xS}u?#DBMB> zw^b($1Z)`9G?eP95EKi&$eOy@K%h;ryrR3la%;>|o*>CgB(s>dDcNOXg}CK9SPmD? zmr-s{0wRmxUnbDrYfRvnZ@d z6johZ2sMX{YkGSKWd}m|@V7`Degt-43=2M?+jR%8{(H$&MLLmS;-|JxnX2pnz;el1jsvqQz}pGSF<`mqEXRQ5sC4#BbwnB_4` zc5bFE-Gb#JV3tox9fp-vVEN{(tOCpRse`S+@)?%pz+zVJXSooTrNCUg`R6`hxwb{) zC@{O6MKY8tfZ5@!yy=p5Y|#+myRL=^{tc(6YgAnkg3I(Cd!r5l;|;l-MQ8B`;*SCE z{u)uP^C$lOPM z5d~UhKhRRmvv{LIa^|oavk1$QiEApSrP@~Jjbg`<*dW4TO?4qG%a%sTPUFz(QtW5( zM)lA+5)0TvH~aBaOAs|}?u2FO;yc-CZ1gNM1dAxJ?%m?YsGR`}-xk2*dxC}r5j$d* zE!#Vtbo69h>V4V`BL%_&$} z+oJAo@jQ^Tk`;%xw-4G>hhb&)B?##U+(6Fi7nno`C<|#PVA%$Y{}N-?(Gc$1%tr4Pc}}hm~yY#fTOe!@v9s-ik$dX~|ygArPhByaXn8 zpI^FUjNWMsTFKTP3X7m?UK)3m zp6rI^_zxRYrx6_QmhoWoDR`fp4R7gu6;gdO)!KexaoO2D88F9x#TM1(9Bn7g;|?|o z)~$n&Lh#hCP6_LOPD>a)NmhW})LADx2kq=X7}7wYRj-0?dXr&bHaRWCfSqvzFa=sn z-8^gSyn-RmH=BZ{AJZ~!8n5621GbUJV7Qvs%JNv&$%Q17s_X%s-41vAPfIR>;x0Wlqr5?09S>x#%Qkt>?(&XjFRY}*L6BeQ3 z<6XEBh^S7>AbwGm@XP{RkeEKj6@_o%oV?hDuUpUJ+r#JZO?!IUc;r0R?>mi)*ZpQ) z#((dn=A#i_&EQn|hd)N$#A*fjBFuiHcYvo?@y1 z5|fV=a^a~d!c-%ZbMNqkMKiSzM{Yq=7_c&1H!mXk60Uv32dV;vMg&-kQ)Q{+PFtwc zj|-uQ;b^gts??J*9VxxOro}W~Q9j4Em|zSRv)(WSO9$F$s=Ydu%Q+5DOid~lwk&we zY%W(Z@ofdwPHncEZzZgmqS|!gTj3wQq9rxQy+^eNYKr1mj&?tm@wkO*9@UtnRMG>c aR{jt9+;fr}hV%pg00001^@s67{VYS000c7NklQEG_j zup^)eW&WUIApqy$=APz8jE@awGp)!bsTjDbrJO`$x^ZR^dr;>)LW>{ zs70vpsD38v)19rI=GNk1b(0?Js9~rjsQsu*K;@SD40RB-3^gKU-MYC7G!Bw{fZsqp zih4iIi;Hr_xZ033Iu{sQxLS=}yBXgLMn40d++>aQ0#%8D1EbGZp7+ z5=mK?t31BkVYbGOxE9`i748x`YgCMwL$qMsChbSGSE1`p{nSmadR zcQ#R)(?!~dmtD0+D2!K zR9%!Xp1oOJzm(vbLvT^$IKp@+W2=-}qTzTgVtQ!#Y7Gxz}stUIm<1;oBQ^Sh2X{F4ibaOOx;5ZGSNK z0maF^@(UtV$=p6DXLgRURwF95C=|U8?osGhgOED*b z7woJ_PWXBD>V-NjQAm{~T%sjyJ{5tn2f{G%?J!KRSrrGvQ1(^`YLA5B!~eycY(e5_ z*%aa{at13SxC(=7JT7$IQF~R3sy`Nn%EMv!$-8ZEAryB*yB1k&stni)=)8-ODo41g zkJu~roIgAih94tb=YsL%iH5@^b~kU9M-=aqgXIrbtxMpFy5mekFm#edF9z7RQ6V}R zBIhbXs~pMzt0VWy1Fi$^fh+1xxLDoK09&5&MJl(q#THjPm(0=z2H2Yfm^a&E)V+a5 zbi>08u;bJsDRUKR9(INSc7XyuWv(JsD+BB*0hS)FO&l&7MdViuur@-<-EHw>kHRGY zqoT}3fDv2-m{NhBG8X}+rgOEZ;amh*DqN?jEfQdqxdj08`Sr=C-KmT)qU1 z+9Cl)a1mgXxhQiHVB}l`m;-RpmKy?0*|yl?FXvJkFxuu!fKlcmz$kN(a}i*saM3nr z0!;a~_%Xqy24IxA2rz<+08=B-Q|2PT)O4;EaxP^6qixOv7-cRh?*T?zZU`{nIM-at zTKYWr9rJ=tppQ9I#Z#mLgINVB!pO-^FOcvFw6NhV0gztuO?g ztoA*C-52Q-Z-P#xB4HAY3KQVd%dz1S4PA3vHp0aa=zAO?FCt zC_GaTyVBg2F!bBr3U@Zy2iJgIAt>1sf$JWA9kh{;L+P*HfUBX1Zy{4MgNbDfBV_ly z!y#+753arsZUt@366jIC0klaC@ckuk!qu=pAyf7&QmiBUT^L1&tOHzsK)4n|pmrVT zs2($4=?s~VejTFHbFdDOwG;_58LkIj1Fh@{glkO#F1>a==ymJS$z;gdedT1zPx4Kj ztjS`y_C}%af-RtpehdQDt3a<=W5C4$)9W@QAse;WUry$WYmr51ml9lkeunUrE`-3e zmq1SgSOPNEE-Mf+AGJ$g0M;3@w!$Ej;hMh=v=I+Lpz^n%Pg^MgwyqOkNyu2c^of)C z1~ALor3}}+RiF*K4+4{(1%1j3pif1>sv0r^mTZ?5Jd-It!tfPfiG_p$AY*Vfak%FG z4z#;wLtw&E&?}w+eKG^=#jF7HQzr8rV0mY<1YAJ_uGz~$E13p?F^fPSzXSn$8UcI$ z8er9{5w5iv0qf8%70zV71T1IBB1N}R5Kp%NO0=5wJalZt8;xYp;b{1K) zHY>2wW-`Sl{=NpR%iu3(u6l&)rc%%cSA#aV7WCowfbFR4wcc{LQZv~o1u_`}EJA3>ki`?9CKYTA!rhO)if*zRdd}Kn zEPfYbhoVE~!FI_2YbC5qAj1kq;xP6%J8+?2PAs?`V3}nyFVD#sV3+uP`pi}{$l9U^ zSz}_M9f7RgnnRhaoIJgT8us!1aB&4!*vYF07Hp&}L zCRlop0oK4DL@ISz{2_BPlezc;xj2|I z23RlDNpi9LgTG_#(w%cMaS)%N`e>~1&a3<{Xy}>?WbF>OOLuO+j&hc^YohQ$4F&ze z+hwnro1puQjnKm;vFG~o>`kCeUIlkA-2tI?WBKCFLMBY=J{hpSsQ=PDtU$=duS_hq zHpymHt^uuV1q@uc4bFb{MdG*|VoW@15Osrqt2@8ll0qO=j*uOXn{M0UJX#SUztui9FN4)K3{9!y8PC-AHHvpVTU;x|-7P+taAtyglk#rjlH2 z5Gq8ik}BPaGiM{#Woyg;*&N9R2{J0V+WGB69cEtH7F?U~Kbi6ksi*`CFXsi931q7Y zGO82?whBhN%w1iDetv%~wM*Y;E^)@Vl?VDj-f*RX>{;o_=$fU!&KAXbuadYZ46Zbg z&6jMF=49$uL^73y;;N5jaHYv)BTyfh&`qVLYn?`o6BCA_z-0niZz=qPG!vonK3MW_ zo$V96zM!+kJRs{P-5-rQVse0VBH*n6A58)4uc&gfHMa{gIhV2fGf{st>E8sKyP-$8zp~wJX^A*@DI&-;8>gANXZj zU)R+Y)PB?=)a|Kj>8NXEu^S_h^7R`~Q&7*Kn!xyvzVv&^>?^iu;S~R2e-2fJx-oUb cX)(b1KSk$MOV07*qoM6N<$f&6$jw%VRuvdN2+38CZWny1cRtlsl+0_KtW)EU14Ei(F!UtWuj4IK+3{sK@>rh zs1Z;=(DD&U6+tlyL?UnHVN^&g6QhFi2#HS+*qz;(>63G(`|jRtW|nz$Pv7qTovP!^ zP_jES{mr@O-02w%!^a?^1ZP!_KmQiz0L~jZ=W@Qt`8wzOoclQsAS<5YdH;a(4bGLE zk8s}1If(PSIgVi!XE!5kA?~z*sobvNyohr;=Q_@h2@$6Flyej3J)D-6YfheRGl`HEcPk|~huT_2-U?PfL=4BPV)f1o!%rQ!NMt_MYw-5bUSwQ9Z&zC>u zOrl~UJglJNa%f50Ok}?WB{on`Ci`p^Y!xBA?m@rcJXLxtrE0FhRF3d*ir>yzO|BD$ z3V}HpFcCh6bTzY}Nt_(W%QYd3NG)jJ4<`F<1Od) zfQblTdC&h2lCz`>y?>|9o2CdvC8qZeIZt%jN;B7Hdn2l*k4M4MFEtq`q_#5?}c$b$pf_3y{Y!cRDafZBEj-*OD|gz#PBDeu3QoueOesLzB+O zxjf2wvf6Wwz>@AiOo2mO4=TkAV+g~%_n&R;)l#!cBxjuoD$aS-`IIJv7cdX%2{WT7 zOm%5rs(wqyPE^k5SIpUZ!&Lq4<~%{*>_Hu$2|~Xa;iX*tz8~G6O3uFOS?+)tWtdi| zV2b#;zRN!m@H&jd=!$7YY6_}|=!IU@=SjvGDFtL;aCtw06U;-v^0%k0FOyESt z1Wv$={b_H&8FiRV?MrzoHWd>%v6KTRU;-v^Miiz+@q`(BoT!+<37CKhoKb)|8!+RG z6BQFU^@fRW;s8!mOf2QViKQGk0TVER6EG1`#;Nm39Do^PoT!+<37AD!%oJe86(=et zZ~|sLzU>V-qYiU6V8$0GmU7_K8|Fd0B?+9Un1BhKAz#V~Fk^`mJtlCX#{^8^M8!me z8Yg;8-~>!e<-iG;h*0B1kBKm}hItVGY6WnjVpgnTTAC$rqQ^v)4KvOtpY|sIj@WYg zyw##ZZ5AC2IKNC;^hwg9BPk0wLStlmBr;E|$5GoAo$&Ui_;S9WY62n3)i49|T%C#i017z3J=$RF|KyZWnci*@lW4 z=AKhNN6+m`Q!V3Ye68|8y@%=am>YD0nG99M)NWc20%)gwO!96j7muR}Fr&54SxKP2 zP30S~lt=a*qDlbu3+Av57=9v&vr<6g0&`!8E2fq>I|EJGKs}t|{h7+KT@)LfIV-3K zK)r_fr2?}FFyn*MYoLC>oV-J~eavL2ho4a4^r{E-8m2hi>~hA?_vIG4a*KT;2eyl1 zh_hUvUJpNCFwBvRq5BI*srSle>c6%n`#VNsyC|MGa{(P&08p=C9+WUw9Hl<1o9T4M zdD=_C0F7#o8A_bRR?sFNmU0R6tW`ElnF8p53IdHo#S9(JoZCz}fHwJ6F<&?qrpVqE zte|m%89JQD+XwaPU#%#lVs-@-OL);|MdfINd6!XwP2h(eyafTUsoRkA%&@fe?9m@jw-v(yTTiV2(*fthQH9}SqmsRPVnwwbV$1E(_lkmo&S zF-truCU914_$jpqjr(>Ha4HkM4YMT>m~NosUu&UZ>zirfHo%N6PPs9^_o$WqPA0#5 z%tG>qFCL+b*0s?sZ;Sht0nE7Kl>OVXy=gjWxxK;OJ3yGd7-pZf7JYNcZo2*1SF`u6 zHJyRRxGw9mDlOiXqVMsNe#WX`fC`vrtjSQ%KmLcl(lC>ZOQzG^%iql2w-f_K@r?OE zwCICifM#L-HJyc7Gm>Ern?+Sk3&|Khmu4(~3qa$(m6Ub^U0E5RHq49za|XklN#?kP zl;EstdW?(_4D>kwjWy2f!LM)y?F94kyU3`W!6+AyId-89v}sXJpuic^NLL7GJItl~ zsiuB98AI-(#Mnm|=A-R6&2fwJ0JVSY#Q>&3$zFh|@;#%0qeF=j5Ajq@4i0tIIW z&}sk$&fGwoJpe&u-JeGLi^r?dO`m=y(QO{@h zQqAC7$rvz&5+mo3IqE?h=a~6m>%r5Quapvzq;{y~p zJpyXOBgD9VrW7@#p6l7O?o3feml(DtSL>D^R) zZUY%T2b0-vBAFN7VB;M88!~HuOXi4KcI6aRQ&h|XQ0A?m%j2=l1f0cGP}h(oVfJ`N zz#PpmFC*ieab)zJK<4?^k=g%OjPnkANzbAbmGZHoVRk*mTfm75s_cWVa`l*f$B@xu z5E*?&@seIo#*Y~1rBm!7sF9~~u6Wrj5oICUOuz}CS)jdNIznfzCA(stJ(7$c^e5wN z?lt>eYgbA!kvAR7zYSD&*r1$b|(@;9dcZ^67R0 zXAXJKa|5Sdmj!g578Nwt6d$sXuc&MWezA0Whd`94$h{{?1IwXP4)Tx4obDK%xoFZ_Z zjjHJ_P@R_e5blG@yEjnaJb`l;s%Lb2&=8$&Ct-fV`E^4CUs)=jTk!I}2d&n!f@)bm z@ z_4Dc86+3l2*p|~;o-Sb~oXb_RuLmoifDU^&Te$*FevycC0*nE3Xws8gsWp|Rj2>SM zns)qcYj?^2sd8?N!_w~4v+f-HCF|a$TNZDoNl$I1Uq87euoNgKb6&r26TNrfkUa@o zfdiFA@p{K&mH3b8i!lcoz)V{n8Q@g(vR4ns4r6w;K z>1~ecQR0-<^J|Ndg5fvVUM9g;lbu-){#ghGw(fg>L zh)T5Ljb%lWE;V9L!;Cqk>AV1(rULYF07ZBJbGb9qbSoLAd;in9{)95YqX$J43-dY7YU*k~vrM25 zxh5_IqO0LYZW%oxQ5HOzmk4x{atE*vipUk}sh88$b2tn?!ujEHn`tQLe&vo}nMb&{ zio`xzZ&GG6&ZyN3jnaQy#iVqXE9VT(3tWY$n-)uWDQ|tc{`?fq2F`oQ{;d3aWPg4Hp-(iE{ry>MIPWL> iW8Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100644 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100644 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100644 index 89c2725..0000000 --- a/flamingo_annotation/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/flamingo_annotation/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/flamingo_annotation/example/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index f2e259c..0000000 --- a/flamingo_annotation/example/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/flamingo_annotation/example/ios/Runner/Base.lproj/Main.storyboard b/flamingo_annotation/example/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100644 index f3c2851..0000000 --- a/flamingo_annotation/example/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/flamingo_annotation/example/ios/Runner/Info.plist b/flamingo_annotation/example/ios/Runner/Info.plist deleted file mode 100644 index e1abc2d..0000000 --- a/flamingo_annotation/example/ios/Runner/Info.plist +++ /dev/null @@ -1,45 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - flamingo_annotation_example - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - diff --git a/flamingo_annotation/example/ios/Runner/Runner-Bridging-Header.h b/flamingo_annotation/example/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a5..0000000 --- a/flamingo_annotation/example/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/flamingo_annotation/example/lib/main.dart b/flamingo_annotation/example/lib/main.dart deleted file mode 100644 index 5cfe6ba..0000000 --- a/flamingo_annotation/example/lib/main.dart +++ /dev/null @@ -1,33 +0,0 @@ -import 'package:flutter/material.dart'; - -void main() { - runApp(MyApp()); -} - -class MyApp extends StatefulWidget { - @override - _MyAppState createState() => _MyAppState(); -} - -class _MyAppState extends State { - String _platformVersion = 'Unknown'; - - @override - void initState() { - super.initState(); - } - - @override - Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - ), - body: Center( - child: Text('Running'), - ), - ), - ); - } -} diff --git a/flamingo_annotation/example/pubspec.lock b/flamingo_annotation/example/pubspec.lock deleted file mode 100644 index e76c216..0000000 --- a/flamingo_annotation/example/pubspec.lock +++ /dev/null @@ -1,160 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.5.0-nullsafety.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.1" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.3" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.1" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.1" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0-nullsafety.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.1" - flamingo_annotation: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "0.3.0+1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.10-nullsafety.1" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0-nullsafety.3" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0-nullsafety.1" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0-nullsafety.2" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0-nullsafety.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0-nullsafety.1" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0-nullsafety.1" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.19-nullsafety.2" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0-nullsafety.3" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0-nullsafety.3" -sdks: - dart: ">=2.10.0-110 <2.11.0" diff --git a/flamingo_annotation/example/pubspec.yaml b/flamingo_annotation/example/pubspec.yaml deleted file mode 100644 index 4ab95d0..0000000 --- a/flamingo_annotation/example/pubspec.yaml +++ /dev/null @@ -1,71 +0,0 @@ -name: flamingo_annotation_example -description: Demonstrates how to use the flamingo_annotation plugin. - -# The following line prevents the package from being accidentally published to -# pub.dev using `pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -environment: - sdk: ">=2.7.0 <3.0.0" - -dependencies: - flutter: - sdk: flutter - - flamingo_annotation: - # When depending on this package from a real application you should use: - # flamingo_annotation: ^x.y.z - # See https://dart.dev/tools/pub/dependencies#version-constraints - # The example app is bundled with the plugin so we use a path dependency on - # the parent directory to use the current plugin's version. - path: ../ - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.3 - -dev_dependencies: - flutter_test: - sdk: flutter - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. -flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. - uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/flamingo_annotation/example/test/widget_test.dart b/flamingo_annotation/example/test/widget_test.dart deleted file mode 100644 index ab59cba..0000000 --- a/flamingo_annotation/example/test/widget_test.dart +++ /dev/null @@ -1,27 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:flamingo_annotation_example/main.dart'; - -void main() { - testWidgets('Verify Platform version', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that platform version is retrieved. - expect( - find.byWidgetPredicate( - (Widget widget) => widget is Text && - widget.data.startsWith('Running on:'), - ), - findsOneWidget, - ); - }); -} diff --git a/flamingo_annotation/pubspec.lock b/flamingo_annotation/pubspec.lock index e67a0d9..89b205e 100644 --- a/flamingo_annotation/pubspec.lock +++ b/flamingo_annotation/pubspec.lock @@ -2,4 +2,4 @@ # See https://dart.dev/tools/pub/glossary#lockfile packages: {} sdks: - dart: ">=2.12.0-0 <3.0.0" + dart: ">=2.18.0 <3.0.0" diff --git a/flamingo_annotation/pubspec.yaml b/flamingo_annotation/pubspec.yaml index 476b599..7ae4a44 100644 --- a/flamingo_annotation/pubspec.yaml +++ b/flamingo_annotation/pubspec.yaml @@ -1,10 +1,10 @@ name: flamingo_annotation description: Automatically generate code for converting flamingo JSON by annotating Dart classes. -version: 0.5.0 +version: 1.0.0 homepage: https://github.com/hukusuke1007/flamingo environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.18.0 <3.0.0' dependencies: # nothing diff --git a/flamingo_generator/CHANGELOG.md b/flamingo_generator/CHANGELOG.md index 91b3c25..cf584bb 100644 --- a/flamingo_generator/CHANGELOG.md +++ b/flamingo_generator/CHANGELOG.md @@ -1,4 +1,7 @@ -# 0.13.0 +# 1.0.0 +Updated plugins. + +## 0.13.0 Updated analyzer plugins. ## 0.12.0 diff --git a/flamingo_generator/example/pubspec.yaml b/flamingo_generator/example/pubspec.yaml index 6075bd5..f601e1f 100644 --- a/flamingo_generator/example/pubspec.yaml +++ b/flamingo_generator/example/pubspec.yaml @@ -3,15 +3,15 @@ description: Demonstrates how to use the flamingogenerator plugin. publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.18.0 <3.0.0' dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.3 + cupertino_icons: ^1.0.5 flamingo: path: ../../flamingo - flamingo_annotation: ^0.5.0 + flamingo_annotation: 1.0.0 dev_dependencies: flutter_test: diff --git a/flamingo_generator/pubspec.yaml b/flamingo_generator/pubspec.yaml index 7829c9d..cad9096 100644 --- a/flamingo_generator/pubspec.yaml +++ b/flamingo_generator/pubspec.yaml @@ -1,17 +1,17 @@ name: flamingo_generator description: Automatically generate code for converting flamingo JSON by annotating Dart classes. -version: 0.13.0 +version: 1.0.0 repository: https://github.com/hukusuke1007/flamingo environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.18.0 <3.0.0' dependencies: - analyzer: ^2.0.0 - build: ^2.0.1 - meta: ^1.3.0 - source_gen: ^1.0.0 - flamingo_annotation: ^0.5.0 + analyzer: ^5.2.0 + build: ^2.3.1 + meta: ^1.7.0 + source_gen: ^1.2.3 + flamingo_annotation: 1.0.0 dev_dependencies: test: