diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index 1fd9325..0000000 --- a/android/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures -GeneratedPluginRegistrant.java - -/gradle -/gradlew -/gradlew.bat diff --git a/android/.hgignore b/android/.hgignore new file mode 100644 index 0000000..62794a1 --- /dev/null +++ b/android/.hgignore @@ -0,0 +1,14 @@ +android.iml +app/app.iml +.gradle +local.properties +.idea/workspace.xml +.idea/libraries +.DS_Store +build +captures +GeneratedPluginRegistrant.java + +/gradle +gradlew +gradlew.bat diff --git a/ios/.hgignore b/ios/.hgignore index b2d233e..c631b1f 100644 --- a/ios/.hgignore +++ b/ios/.hgignore @@ -16,15 +16,17 @@ GeneratedPluginRegistrant.m !default.mode2v3 !default.perspectivev3 -xcuserdata +Runner.xcodeproj/xcuserdata +Runner.xcworkspace/xcuserdata + Icon? .tags* -/Flutter/app.flx -/Flutter/app.zip -/Flutter/App.framework -/Flutter/Flutter.framework -/Flutter/Generated.xcconfig -/ServiceDefinitions.json +Flutter/app.flx +Flutter/app.zip +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Generated.xcconfig +ServiceDefinitions.json Pods/ diff --git a/ios/Flutter/App.framework/App b/ios/Flutter/App.framework/App index e83845c..9ad365c 100755 Binary files a/ios/Flutter/App.framework/App and b/ios/Flutter/App.framework/App differ diff --git a/ios/Flutter/Flutter.framework/Flutter b/ios/Flutter/Flutter.framework/Flutter index e334c5c..f602ec9 100755 Binary files a/ios/Flutter/Flutter.framework/Flutter and b/ios/Flutter/Flutter.framework/Flutter differ diff --git a/ios/Flutter/Flutter.framework/Headers/Flutter.h b/ios/Flutter/Flutter.framework/Headers/Flutter.h index 87604cf..5ce388d 100644 --- a/ios/Flutter/Flutter.framework/Headers/Flutter.h +++ b/ios/Flutter/Flutter.framework/Headers/Flutter.h @@ -8,6 +8,26 @@ /** BREAKING CHANGES: + January 15, 2018: Marked "initWithFLXArchive" and + "initWithFLXArchiveWithScriptSnapshot" as unavailable following the + deprecation from December 11, 2017. Scheduled to be removed on February + 19, 2018. + + January 09, 2018: Deprecated "FlutterStandardBigInteger" and its use in + "FlutterStandardMessageCodec" and "FlutterStandardMethodCodec". Scheduled to + be marked as unavailable once the deprecation has been available on the + flutter/flutter alpha branch for four weeks. "FlutterStandardBigInteger" was + needed because the Dart 1.0 int type had no size limit. With Dart 2.0, the + int type is a fixed-size, 64-bit signed integer. If you need to communicate + larger integers, use NSString encoding instead. + + December 11, 2017: Deprecated "initWithFLXArchive" and + "initWithFLXArchiveWithScriptSnapshot" and scheculed the same to be marked as + unavailable on January 15, 2018. Instead, "initWithFlutterAssets" and + "initWithFlutterAssetsWithScriptSnapshot" should be used. The reason for this + change is that the FLX archive will be deprecated and replaced with a flutter + assets directory containing the same files as the FLX did. + November 29, 2017: Added a BREAKING CHANGES section. */ diff --git a/ios/Flutter/Flutter.framework/Headers/FlutterCodecs.h b/ios/Flutter/Flutter.framework/Headers/FlutterCodecs.h index 0d191db..2d65967 100644 --- a/ios/Flutter/Flutter.framework/Headers/FlutterCodecs.h +++ b/ios/Flutter/Flutter.framework/Headers/FlutterCodecs.h @@ -91,7 +91,6 @@ FLUTTER_EXPORT - `nil` or `NSNull` - `NSNumber` (including their representation of Boolean values) - - `FlutterStandardBigInteger` - `NSString` - `FlutterStandardTypedData` - `NSArray` of supported values @@ -101,11 +100,17 @@ FLUTTER_EXPORT - `nil` or `NSNull`: null - `NSNumber`: `bool`, `int`, or `double`, depending on the contained value. - - `FlutterStandardBigInteger`: `int` - `NSString`: `String` - `FlutterStandardTypedData`: `Uint8List`, `Int32List`, `Int64List`, or `Float64List` - `NSArray`: `List` - `NSDictionary`: `Map` + + Support for `FlutterStandardBigInteger` has been deprecated on 2018-01-09 to be + made unavailable four weeks after this change is available on the Flutter alpha + branch. `FlutterStandardBigInteger` were needed because the Dart 1.0 `int` type + had no size limit. With Dart 2.0, the `int` type is a fixed-size, 64-bit signed + integer. If you need to communicate larger integers, use `NSString` encoding + instead. */ FLUTTER_EXPORT @interface FlutterStandardMessageCodec : NSObject @@ -253,6 +258,13 @@ FLUTTER_EXPORT and `FlutterStandardMethodCodec`. */ FLUTTER_EXPORT +FLUTTER_DEPRECATED( + "Deprecated on 2018-01-09 to be made unavailable four weeks after the " + "deprecation is available on the flutter/flutter alpha branch. " + "FlutterStandardBigInteger was needed because the Dart 1.0 int type had no " + "size limit. With Dart 2.0, the int type is a fixed-size, 64-bit signed " + "integer. If you need to communicate larger integers, use NSString encoding " + "instead.") @interface FlutterStandardBigInteger : NSObject /** Creates a `FlutterStandardBigInteger` from a hexadecimal representation. diff --git a/ios/Flutter/Flutter.framework/Headers/FlutterDartProject.h b/ios/Flutter/Flutter.framework/Headers/FlutterDartProject.h index 79c7a7a..7752ab9 100644 --- a/ios/Flutter/Flutter.framework/Headers/FlutterDartProject.h +++ b/ios/Flutter/Flutter.framework/Headers/FlutterDartProject.h @@ -16,9 +16,22 @@ FLUTTER_EXPORT - (instancetype)initWithFLXArchive:(NSURL*)archiveURL dartMain:(NSURL*)dartMainURL - packages:(NSURL*)dartPackages NS_DESIGNATED_INITIALIZER; + packages:(NSURL*)dartPackages NS_DESIGNATED_INITIALIZER + FLUTTER_UNAVAILABLE( + "This initializer is no longer available. See the deprecation message from " + "December 11, 2017 in Flutter.h. Instead, use [initWithFlutterAssets]."); -- (instancetype)initWithFLXArchiveWithScriptSnapshot:(NSURL*)archiveURL NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithFLXArchiveWithScriptSnapshot:(NSURL*)archiveURL NS_DESIGNATED_INITIALIZER + FLUTTER_UNAVAILABLE( + "This initializer is no longer available. See the deprecation message from " + "December 11, 2017 in Flutter.h. Instead, use [initWithFlutterAssetsWithScriptSnapshot]."); + +- (instancetype)initWithFlutterAssets:(NSURL*)flutterAssetsURL + dartMain:(NSURL*)dartMainURL + packages:(NSURL*)dartPackages NS_DESIGNATED_INITIALIZER; + +- (instancetype)initWithFlutterAssetsWithScriptSnapshot:(NSURL*)flutterAssetsURL + NS_DESIGNATED_INITIALIZER; - (instancetype)initFromDefaultSourceForConfiguration; diff --git a/ios/Flutter/Flutter.framework/Headers/FlutterPlugin.h b/ios/Flutter/Flutter.framework/Headers/FlutterPlugin.h index fece7fe..396d8d9 100644 --- a/ios/Flutter/Flutter.framework/Headers/FlutterPlugin.h +++ b/ios/Flutter/Flutter.framework/Headers/FlutterPlugin.h @@ -127,7 +127,8 @@ NS_ASSUME_NONNULL_BEGIN */ - (BOOL)application:(UIApplication*)application performActionForShortcutItem:(UIApplicationShortcutItem*)shortcutItem - completionHandler:(void (^)(BOOL succeeded))completionHandler; + completionHandler:(void (^)(BOOL succeeded))completionHandler + API_AVAILABLE(ios(9.0)); @end diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig index 9bd4244..1962428 100644 --- a/ios/Flutter/Generated.xcconfig +++ b/ios/Flutter/Generated.xcconfig @@ -1,9 +1,9 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/Users/dinect/projects/flutter -FLUTTER_APPLICATION_PATH=/Users/dinect/projects/checker +FLUTTER_ROOT=/Users/kifio/flutter +FLUTTER_APPLICATION_PATH=/Users/kifio/Desktop/FlutterProjects/checker FLUTTER_TARGET=lib/main.dart -FLUTTER_BUILD_MODE=release +FLUTTER_BUILD_MODE=debug FLUTTER_BUILD_DIR=build SYMROOT=${SOURCE_ROOT}/../build/ios -FLUTTER_FRAMEWORK_DIR=/Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios-release +FLUTTER_FRAMEWORK_DIR=/Users/kifio/flutter/bin/cache/artifacts/engine/ios #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/ios/Flutter/app.flx b/ios/Flutter/app.flx index 99718cc..bfa8ccb 100644 Binary files a/ios/Flutter/app.flx and b/ios/Flutter/app.flx differ diff --git a/ios/Podfile b/ios/Podfile index 90b5f65..cba6fff 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,6 @@ # Uncomment this line to define a global platform for your project # platform :ios, '9.0' +pod 'ZXingObjC', '~> 3.2.1' if ENV['FLUTTER_FRAMEWORK_DIR'] == nil abort('Please set FLUTTER_FRAMEWORK_DIR to the directory containing Flutter.framework') diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 23ae2c7..0cd8086 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -10,30 +10,35 @@ PODS: - sqflite (0.0.1): - Flutter - FMDB + - ZXingObjC (3.2.2): + - ZXingObjC/All (= 3.2.2) + - ZXingObjC/All (3.2.2) DEPENDENCIES: - - Flutter (from `/Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios-release`) - - image_picker (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/image_picker-0.1.5/ios`) - - path_provider (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.2/ios`) - - sqflite (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.6.2/ios`) + - Flutter (from `/Users/kifio/flutter/bin/cache/artifacts/engine/ios`) + - image_picker (from `/Users/kifio/.pub-cache/hosted/pub.dartlang.org/image_picker-0.1.5/ios`) + - path_provider (from `/Users/kifio/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.2/ios`) + - sqflite (from `/Users/kifio/.pub-cache/hosted/pub.dartlang.org/sqflite-0.6.2+2/ios`) + - ZXingObjC (~> 3.2.1) EXTERNAL SOURCES: Flutter: - :path: /Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios-release + :path: /Users/kifio/flutter/bin/cache/artifacts/engine/ios image_picker: - :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/image_picker-0.1.5/ios + :path: /Users/kifio/.pub-cache/hosted/pub.dartlang.org/image_picker-0.1.5/ios path_provider: - :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.2/ios + :path: /Users/kifio/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.2/ios sqflite: - :path: /Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.6.2/ios + :path: /Users/kifio/.pub-cache/hosted/pub.dartlang.org/sqflite-0.6.2+2/ios SPEC CHECKSUMS: - Flutter: d674e78c937094a75ac71dd77e921e840bea3dbf + Flutter: 7eb41cd1fd524b90d7f22bceb20da2c39338b089 FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa - image_picker: a211f28b95a560433c00f5cd3773f4710a20404d - path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 - sqflite: 8e2d9fe1e7cdc95d4d537fc7eb2d23c8dc428e3c + image_picker: ee00aab0487cedc80a304085219503cc6d0f2e22 + path_provider: 09407919825bfe3c2deae39453b7a5b44f467873 + sqflite: edb0e4df7640c26fea6a107c21ed1542219e761a + ZXingObjC: 2c95a0dc52daac69b23ec78fad8fa2fec05f8981 -PODFILE CHECKSUM: 351e02e34b831289961ec3558a535cbd2c4965d2 +PODFILE CHECKSUM: 6ff82960897df72ab1735b87f4a4feb0f254f399 -COCOAPODS: 1.4.0.beta.2 +COCOAPODS: 1.4.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2644e61..ac97257 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; ACE8612B1F9F745B006FEF38 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; ACE8612C1F9F745B006FEF38 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; ACE8612D1F9F745B006FEF38 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; @@ -35,7 +36,6 @@ ACE861471F9F745B006FEF38 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; AFFEFA1AD31BC8D9EA04CFCB /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AC45BF661F9E3F97009713E2 /* libPods-Runner.a */; }; BAE7FF4D875B996672385844 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AC45BF661F9E3F97009713E2 /* libPods-Runner.a */; }; - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378261FAA1A9400D5DBA9 /* flutter_assets */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -64,9 +64,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 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 = ""; }; - 2D5378261FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; 28B464359F9DDCC3EF756D7D /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 32DA147B1FBC3DCE008F0388 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; @@ -154,6 +154,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, 9740EEB71CF902C7004384FC /* app.flx */, 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, @@ -161,7 +162,6 @@ 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, - 2D5378261FAA1A9400D5DBA9 /* flutter_assets */, ); name = Flutter; sourceTree = ""; @@ -345,6 +345,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, ACE8613E1F9F745B006FEF38 /* app.flx in Resources */, ACE8613F1F9F745B006FEF38 /* LaunchScreen.storyboard in Resources */, ACE861401F9F745B006FEF38 /* Generated.xcconfig in Resources */, @@ -352,7 +353,6 @@ ACE861421F9F745B006FEF38 /* Debug.xcconfig in Resources */, ACE861431F9F745B006FEF38 /* Assets.xcassets in Resources */, ACE861441F9F745B006FEF38 /* Main.storyboard in Resources */, - 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -412,7 +412,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../../../flutter/bin/cache/artifacts/engine/ios-release/Flutter.framework", + "${PODS_ROOT}/../../../../../flutter/bin/cache/artifacts/engine/ios/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( diff --git a/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..47ee33d Binary files /dev/null and b/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate differ