diff --git a/.hgignore b/.hgignore index f7d1a85..7351c22 100644 --- a/.hgignore +++ b/.hgignore @@ -4,12 +4,14 @@ .packages .pub/ .gradle/ +.orig + build/ gen/ -ios/.generated/ packages pubspec.lock .flutter-plugins + android/gradle android/gradlew android/gradlew.bat @@ -20,6 +22,8 @@ android/app/gradlew.bat android/app/local.properties android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java + +ios/.generated/ ios/Runner/GeneratedPluginRegistrant.h ios/Runner/GeneratedPluginRegistrant.m ios/Pods/ diff --git a/flutter_01.log b/flutter_01.log deleted file mode 100644 index f8de0e1..0000000 --- a/flutter_01.log +++ /dev/null @@ -1,85 +0,0 @@ -Flutter crash report; please file at https://github.com/flutter/flutter/issues. - -## command - -flutter --suppress-analytics build flx --target=lib/main.dart --output-file=/Users/ntrlab/semyon/apps/checker/ios/Flutter/app.flx --snapshot=build/snapshot_blob.bin --depfile=build/snapshot_blob.bin.d --working-dir=build/flx - -## exception - -FileSystemException: FileSystemException: Deletion failed, path = 'build/flx' (OS Error: Directory not empty, errno = 66) - -``` -#0 _Directory._deleteSync (dart:io/directory_impl.dart:162) -#1 FileSystemEntity.deleteSync (dart:io/file_system_entity.dart:411) -#2 ForwardingFileSystemEntity.deleteSync (package:file/src/forwarding/forwarding_file_system_entity.dart:68) -#3 _ZipToolBuilder.createZip (package:flutter_tools/src/zip.dart:69) - -#4 assemble (package:flutter_tools/src/flx.dart:142) - -#5 build (package:flutter_tools/src/flx.dart:79) - -#6 BuildFlxCommand.runCommand (package:flutter_tools/src/commands/build_flx.dart:44) - -#7 FlutterCommand.verifyThenRunCommand (package:flutter_tools/src/runner/flutter_command.dart:253) - -#8 FlutterCommand.run (package:flutter_tools/src/runner/flutter_command.dart:193) - -#9 CommandRunner.runCommand (package:args/command_runner.dart:194) - -#10 FlutterCommandRunner.runCommand (package:flutter_tools/src/runner/flutter_command_runner.dart:279) - -#11 CommandRunner.run. (package:args/command_runner.dart:109) -#12 new Future.sync (dart:async/future.dart:222) -#13 CommandRunner.run (package:args/command_runner.dart:109) -#14 FlutterCommandRunner.run (package:flutter_tools/src/runner/flutter_command_runner.dart:162) -#15 run. (package:flutter_tools/executable.dart:143) - -#16 AppContext._run (package:flutter_tools/src/base/context.dart:76) - -#17 AppContext.runInZone. (package:flutter_tools/src/base/context.dart:66) -#18 _rootRun (dart:async/zone.dart:1120) -#19 _CustomZone.run (dart:async/zone.dart:1001) -#20 runZoned (dart:async/zone.dart:1467) -#21 AppContext.runInZone (package:flutter_tools/src/base/context.dart:65) -#22 run (package:flutter_tools/executable.dart:114) - -#23 main (package:flutter_tools/executable.dart:67) - -#24 main (file:///Users/ntrlab/semyon/flutter/packages/flutter_tools/bin/flutter_tools.dart:16) -#25 _startIsolate. (dart:isolate-patch/isolate_patch.dart:263) -#26 _RawReceivePortImpl._handleMessage (dart:isolate-patch/isolate_patch.dart:151) -``` - -## flutter doctor - -``` -[✓] Flutter (on Mac OS X 10.12.6 16G29, locale en-RU, channel alpha) - • Flutter at /Users/ntrlab/flutter - • Framework revision 4424892c79 (2 weeks ago), 2017-10-10 16:45:11 -0700 - • Engine revision 2a84f18c79 - • Tools Dart version 1.25.0-dev.11.0 - -[✓] Android toolchain - develop for Android devices (Android SDK 26.0.2) - • Android SDK at /Users/ntrlab/Library/Android/sdk - • Platform android-26, build-tools 26.0.2 - • Java binary at: /Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java - • Java version OpenJDK Runtime Environment (build 1.8.0_112-release-b06) - -[✓] iOS toolchain - develop for iOS devices (Xcode 9.0) - • Xcode at /Applications/Xcode.app/Contents/Developer - • Xcode 9.0, Build version 9A235 - • ios-deploy 1.9.2 - • CocoaPods version 1.2.1 - -[✓] Android Studio (version 2.3) - • Android Studio at /Applications/Android Studio.app/Contents - • Java version OpenJDK Runtime Environment (build 1.8.0_112-release-b06) - -[✓] IntelliJ IDEA Community Edition (version 2017.2.5) - • Flutter plugin version 18.1 - • Dart plugin version 172.4155.35 - -[✓] Connected devices - • iPhone 6 • 2CED9AE2-FCDE-4D77-ABEA-728E320A28C5 • ios • iOS 11.0 (simulator) - -``` diff --git a/ios/Flutter/App.framework/App b/ios/Flutter/App.framework/App index 4c1b5fa..f439695 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 982332d..3d78fe1 100755 Binary files a/ios/Flutter/Flutter.framework/Flutter and b/ios/Flutter/Flutter.framework/Flutter differ diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig index c0dc9fe..9bd4244 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/ntrlab/flutter -FLUTTER_APPLICATION_PATH=/Users/ntrlab/semyon/apps/checker +FLUTTER_ROOT=/Users/dinect/projects/flutter +FLUTTER_APPLICATION_PATH=/Users/dinect/projects/checker FLUTTER_TARGET=lib/main.dart -FLUTTER_BUILD_MODE=debug +FLUTTER_BUILD_MODE=release FLUTTER_BUILD_DIR=build SYMROOT=${SOURCE_ROOT}/../build/ios -FLUTTER_FRAMEWORK_DIR=/Users/ntrlab/flutter/bin/cache/artifacts/engine/ios +FLUTTER_FRAMEWORK_DIR=/Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios-release #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/ios/Flutter/app.flx b/ios/Flutter/app.flx index 86e9f73..e41504e 100644 Binary files a/ios/Flutter/app.flx and b/ios/Flutter/app.flx differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1ae6766..f8d55f9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,6 +3,8 @@ PODS: - FMDB (2.6.2): - FMDB/standard (= 2.6.2) - FMDB/standard (2.6.2) + - image_picker (0.0.1): + - Flutter - path_provider (0.0.1): - Flutter - sqflite (0.0.1): @@ -10,24 +12,28 @@ PODS: - FMDB DEPENDENCIES: - - Flutter (from `/Users/ntrlab/flutter/bin/cache/artifacts/engine/ios`) - - path_provider (from `/Users/ntrlab/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.1+1/ios`) - - sqflite (from `/Users/ntrlab/.pub-cache/hosted/pub.dartlang.org/sqflite-0.2.4/ios`) + - 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.3/ios`) + - path_provider (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.1+1/ios`) + - sqflite (from `/Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.2.4/ios`) EXTERNAL SOURCES: Flutter: - :path: /Users/ntrlab/flutter/bin/cache/artifacts/engine/ios + :path: "/Users/dinect/projects/flutter/bin/cache/artifacts/engine/ios-release" + image_picker: + :path: "/Users/dinect/.pub-cache/hosted/pub.dartlang.org/image_picker-0.1.3/ios" path_provider: - :path: /Users/ntrlab/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.1+1/ios + :path: "/Users/dinect/.pub-cache/hosted/pub.dartlang.org/path_provider-0.2.1+1/ios" sqflite: - :path: /Users/ntrlab/.pub-cache/hosted/pub.dartlang.org/sqflite-0.2.4/ios + :path: "/Users/dinect/.pub-cache/hosted/pub.dartlang.org/sqflite-0.2.4/ios" SPEC CHECKSUMS: Flutter: d674e78c937094a75ac71dd77e921e840bea3dbf FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a + image_picker: a211f28b95a560433c00f5cd3773f4710a20404d path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 sqflite: 8e2d9fe1e7cdc95d4d537fc7eb2d23c8dc428e3c PODFILE CHECKSUM: 351e02e34b831289961ec3558a535cbd2c4965d2 -COCOAPODS: 1.2.1 +COCOAPODS: 1.1.0.rc.2 diff --git a/ios/Resources/ic_launcher_app.png b/ios/Resources/ic_launcher_app.png new file mode 100644 index 0000000..48ceacf Binary files /dev/null and b/ios/Resources/ic_launcher_app.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index e096d84..9d5d7e3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -66,6 +66,7 @@ 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 = ""; }; 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 = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -188,6 +189,7 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + 32DA147B1FBC3DCE008F0388 /* Runner.entitlements */, AC45BF911F9E408E009713E2 /* Info.plist */, AC73A4241F9F7F920026EBA4 /* Dinect.plist */, 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, @@ -319,7 +321,12 @@ ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { ACE861271F9F745B006FEF38 = { - DevelopmentTeam = DZRQLG966A; + DevelopmentTeam = 926V94K5Q8; + SystemCapabilities = { + com.apple.Push = { + enabled = 1; + }; + }; }; }; }; @@ -374,7 +381,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; ACE861291F9F745B006FEF38 /* Run Script */ = { @@ -564,198 +571,6 @@ }; name = Release; }; - ACB2A14B1F964D1C00030E6F /* Debug-develop */ = { - 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_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; - 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-develop"; - }; - ACE860EE1F9F567A006FEF38 /* Debug-autobonus */ = { - 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_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; - 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-autobonus"; - }; - ACE860F31F9F5FE9006FEF38 /* Debug-dinect */ = { - 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_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; - 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-dinect"; - }; - ACE860F71F9F6B59006FEF38 /* Debug-pip */ = { - 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_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR; - 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-pip"; - }; ACE8614D1F9F745B006FEF38 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; @@ -769,9 +584,10 @@ ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; + DEVELOPMENT_TEAM = 926V94K5Q8; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -785,7 +601,7 @@ "$(PROJECT_DIR)/ZBarSDK", ); ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; + PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; @@ -794,158 +610,6 @@ }; name = Debug; }; - ACE8614E1F9F745B006FEF38 /* Debug-develop */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ARCHS = ( - "$(ARCHS_STANDARD)", - arm7s, - armv7, - arm64, - ); - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = "$(SRCROOT)/Runner/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/ZBarSDK", - ); - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - }; - name = "Debug-develop"; - }; - ACE8614F1F9F745B006FEF38 /* Debug-pip */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ARCHS = ( - "$(ARCHS_STANDARD)", - arm7s, - armv7, - arm64, - ); - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = "$(SRCROOT)/Runner/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/ZBarSDK", - ); - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - }; - name = "Debug-pip"; - }; - ACE861501F9F745B006FEF38 /* Debug-dinect */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ARCHS = ( - "$(ARCHS_STANDARD)", - arm7s, - armv7, - arm64, - ); - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = "$(SRCROOT)/Runner/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/ZBarSDK", - ); - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - }; - name = "Debug-dinect"; - }; - ACE861511F9F745B006FEF38 /* Debug-autobonus */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ARCHS = ( - "$(ARCHS_STANDARD)", - arm7s, - armv7, - arm64, - ); - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = "$(SRCROOT)/Runner/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)/ZBarSDK", - ); - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - }; - name = "Debug-autobonus"; - }; ACE861521F9F745B006FEF38 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; @@ -959,9 +623,10 @@ ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = DZRQLG966A; + DEVELOPMENT_TEAM = 926V94K5Q8; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -974,12 +639,12 @@ "$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/ZBarSDK", ); - PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub; + PRODUCT_BUNDLE_IDENTIFIER = com.dinect.checker.autoclub.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "Autobonus-Swift.h"; SWIFT_VERSION = 3.0; - VALID_ARCHS = "arm64 armv7s"; + VALID_ARCHS = "arm64 arm7 armv7s"; }; name = Release; }; @@ -990,10 +655,6 @@ isa = XCConfigurationList; buildConfigurations = ( 97C147031CF9000F007C117D /* Debug */, - ACB2A14B1F964D1C00030E6F /* Debug-develop */, - ACE860F71F9F6B59006FEF38 /* Debug-pip */, - ACE860F31F9F5FE9006FEF38 /* Debug-dinect */, - ACE860EE1F9F567A006FEF38 /* Debug-autobonus */, 97C147041CF9000F007C117D /* Release */, ); defaultConfigurationIsVisible = 0; @@ -1003,10 +664,6 @@ isa = XCConfigurationList; buildConfigurations = ( ACE8614D1F9F745B006FEF38 /* Debug */, - ACE8614E1F9F745B006FEF38 /* Debug-develop */, - ACE8614F1F9F745B006FEF38 /* Debug-pip */, - ACE861501F9F745B006FEF38 /* Debug-dinect */, - ACE861511F9F745B006FEF38 /* Debug-autobonus */, ACE861521F9F745B006FEF38 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/ios/Runner.xcodeproj/xcuserdata/dinect.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/Runner.xcodeproj/xcuserdata/dinect.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..67990d5 --- /dev/null +++ b/ios/Runner.xcodeproj/xcuserdata/dinect.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SuppressBuildableAutocreation + + ACE861271F9F745B006FEF38 + + primary + + + + + diff --git a/ios/Runner.xcworkspace/xcuserdata/dinect.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Runner.xcworkspace/xcuserdata/dinect.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..f54e79f Binary files /dev/null and b/ios/Runner.xcworkspace/xcuserdata/dinect.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 7306ac9..073a14e 100644 --- a/ios/Runner/AppDelegate.m +++ b/ios/Runner/AppDelegate.m @@ -42,7 +42,7 @@ @"appTitle" : @"Autobonus (develop)", @"showBonus" : @YES, }, - @"com.dinect.checker.autoclub" : @{ + @"com.dinect.checker.autoclub.app" : @{ @"locale" : @"ru", @"flavor" : @"autobonus", @"currency" : @643, diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 0000000..3fd63ba Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1536.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1536.png new file mode 100644 index 0000000..014d1b6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1536.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_1x.png new file mode 100644 index 0000000..7bd0a79 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x-1.png new file mode 100644 index 0000000..197a78d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x.png new file mode 100644 index 0000000..7cd256d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_3x.png new file mode 100644 index 0000000..ac11412 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20_3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x-1.png new file mode 100644 index 0000000..a460bcb Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x.png new file mode 100644 index 0000000..8aa72df Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x-1.png new file mode 100644 index 0000000..40adef9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x.png new file mode 100644 index 0000000..b88d9ab Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3.png new file mode 100644 index 0000000..630ebeb Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3x.png new file mode 100644 index 0000000..2536713 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29_3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_1x.png new file mode 100644 index 0000000..ce6c5d8 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x-1.png new file mode 100644 index 0000000..bc65510 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x.png new file mode 100644 index 0000000..5f3799c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_3x.png new file mode 100644 index 0000000..36dbece Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40_3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_1x.png new file mode 100644 index 0000000..a2b4471 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_2x.png new file mode 100644 index 0000000..e06aa22 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 0000000..b46fd2c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_1x.png new file mode 100644 index 0000000..9c5c6d5 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_2x.png new file mode 100644 index 0000000..2f68793 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_1x.png new file mode 100644 index 0000000..9868ec2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_2x.png new file mode 100644 index 0000000..59491f6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_3x.png new file mode 100644 index 0000000..8f10f0b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60_3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_1x.png new file mode 100644 index 0000000..771778e Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_2x.png new file mode 100644 index 0000000..880217c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_1x.png new file mode 100644 index 0000000..0829cf4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_2x.png new file mode 100644 index 0000000..ec3728e Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_3x.png new file mode 100644 index 0000000..f0a9d4d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76_3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/83.5_2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/83.5_2x.png new file mode 100644 index 0000000..ce09f31 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/83.5_2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d225b3c..b53bd8d 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -3,114 +3,115 @@ { "size" : "20x20", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", + "filename" : "20_2x.png", "scale" : "2x" }, { "size" : "20x20", "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", + "filename" : "20_3x.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", + "filename" : "29_1x.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", + "filename" : "29_2x.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", + "filename" : "29_3x.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", + "filename" : "40_2x.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", + "filename" : "40_3x.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", + "filename" : "60_2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", + "filename" : "60_3x.png", "scale" : "3x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", + "filename" : "20_1x.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", + "filename" : "20_2x-1.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", + "filename" : "29_1x-1.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", + "filename" : "29_2x-1.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", + "filename" : "40_1x.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", + "filename" : "40_2x-1.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", + "filename" : "76_1x.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", + "filename" : "76_2x.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", + "filename" : "83.5_2x.png", "scale" : "2x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "1024.png", "scale" : "1x" } ], diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 28c6bf0..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cde121..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index dcdc230..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d16..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 6a84f41..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index d0e1f58..0000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 1f43f26..7532da3 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,11 +21,13 @@ CFBundleSignature ???? CFBundleVersion - 1 + 6 LSRequiresIPhoneOS NSCameraUsageDescription - Просто потому что + Для работы сканнера штрихкодов + NSPhotoLibraryUsageDescription + Для работы сканнера штрихкодов UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements new file mode 100644 index 0000000..903def2 --- /dev/null +++ b/ios/Runner/Runner.entitlements @@ -0,0 +1,8 @@ + + + + + aps-environment + development + + diff --git a/lib/common.dart b/lib/common.dart index 744445b..4dec9ab 100644 --- a/lib/common.dart +++ b/lib/common.dart @@ -4,6 +4,7 @@ import 'package:checker/screens/settings.dart'; import 'package:checker/screens/splash.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:image_picker/image_picker.dart'; import 'package:intl/intl.dart'; import 'db.dart'; @@ -213,3 +214,8 @@ getLocaleTitle(String code) { return 'Español'; } } + +// Добавил вызов, что-бы AOT компилер не выкинул либу. +getImage() { + return await ImagePicker.pickImage(); +} diff --git a/pubspec.yaml b/pubspec.yaml index 2a616a9..e4cf945 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,6 +8,7 @@ dependencies: sprintf: "^3.0.2" path_provider: "^0.2.1+1" sqflite: any + image_picker: '^0.1.3' # use for ask permissions @ iOS flutter: sdk: flutter @@ -73,4 +74,4 @@ flutter: # fonts: # - asset: fonts/TrajanPro.ttf # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 \ No newline at end of file + # weight: 700