diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..95927f7ee019d99cd1ec7f379ff4ba0574e86cb2 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,29 @@ +stages: +- build + +build-apk: + except: + - ios-build + variables: + LANG: en_US.UTF-8 + stage: build + artifacts: + paths: + - ./build/app/outputs/apk/development/release/app-development-release.apk + tags: + - macos + script: + - cp $HOME/key.properties ./android/key.properties + - make build-android + +build-ios: + only: + - ios-build + variables: + LANG: en_US.UTF-8 + stage: build + tags: + - macos + script: + - make build-ios + diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..33d3165f7a426e1a766cd25386244a5656951698 --- /dev/null +++ b/Makefile @@ -0,0 +1,51 @@ +flavor=development +entryPoint=main-dev.dart +iosBundleName=Vereign-dev +iosScheme=development +iosConfiguration=Release-development + + +ifeq ($(target), development) + flavor=production + entryPoint=main.dart + iosBundleName=Vereign + iosScheme=production + iosConfiguration=Release-production +endif + +.PHONY: all build-ios build-android + +all: build-ios build-android + +run: + flutter run --flavor ${flavor} -t lib/${entryPoint} + +build-ios: flutter-build-ios archive-ios export-ios ## Builds ios bundle and uploads it to the AppStore + +build-android: ## Builds android bundle + flutter build apk --flavor ${flavor} -t lib/${entryPoint} + # For PlayMarket + # flutter build appbundle --target-platform android-arm,android-arm64 + + +flutter-build-ios: ## Performs flutter build + flutter build ios --flavor $(flavor) -t lib/$(entryPoint) + +archive-ios: ## Creates .xarchive from fullter build + xcodebuild \ + -workspace ios/Runner.xcworkspace \ + -scheme ${iosScheme} \ + -sdk iphoneos \ + -configuration ${iosConfiguration} \ + archive -archivePath \ + build/ios/$(iosBundleName).xcarchive + +export-ios: ## Exports ipa and uploads it to AppStore + xcodebuild \ + -exportArchive \ + -archivePath build/ios/${iosBundleName}.xcarchive \ + -exportOptionsPlist ios/exportOptions-dev.plist \ + -exportPath build/ios/${iosBundleName} + +clean: ## Removes build directory + flutter clean \ No newline at end of file diff --git a/README.md b/README.md index b58180110683bd2d9daf3246ee5cff1d750d67a7..46180c9376118425e696fbf0d35b786544ea4d4b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,20 @@ # Vereign mobile application. -## Application flavors -### Build application in debug mode -- With development flavor `flutter run --flavor development -t lib/main-dev.dart` -- With production flavor `flutter run --flavor production -t lib/main.dart` +## Debug +- Development `make run` +- Production `make target=production run` +## Build + +`make all` or `make target=production all` + +#### iOS +- Development `make build-ios` +- Production `make target=production build-ios` + +#### Android +- Development `make build-android` +- Production `make target=production build-android` ## Flutter Getting Started diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index dd269adc2b526bbabc38edde2c65564fb1fe7501..8d5a0cc67c1d779ecc1e25552956389f1a11c0a6 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index b7947eb8236f0a4dfeec6f0b1f70c1e06268a268..53efac380889a20433b982feb484b28361c5c247 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 5ce71bc44f1f9fb5e024b8d4caf284e70145a188..a377502080a6593cf695affc26f3596b65a32466 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 745f22a2e42c05e0b25fec7d42f5bd5dda884eb3..8efbb0f9638d65480a439503085c002d12b3fe0a 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2363d1122e2a485c6723faa50f12c2e1c794032b..72ab421c44253df6de98ef626ca762fe4d64e0f6 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/images/vereign_icon.png b/assets/images/vereign_icon.png deleted file mode 100644 index 722f385cd1cb9ee44286425a99ddbe9c52e2b6df..0000000000000000000000000000000000000000 Binary files a/assets/images/vereign_icon.png and /dev/null differ diff --git a/assets/images/vereign_logo.png b/assets/images/vereign_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..772c988c762c904258f6a0d2ced286e111ab312a Binary files /dev/null and b/assets/images/vereign_logo.png differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 19291101caa84057045aaf294209c0ffb6389f01..50d9faef58a1a8b093c4d6052a4ab1554adf61fb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -18,7 +18,7 @@ PODS: - Flutter DEPENDENCIES: - - Flutter (from `.symlinks/flutter/ios`) + - Flutter (from `.symlinks/flutter/ios-release`) - flutter_app_auth_wrapper (from `.symlinks/plugins/flutter_app_auth_wrapper/ios`) - flutter_web_browser (from `.symlinks/plugins/flutter_web_browser/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) @@ -31,7 +31,7 @@ SPEC REPOS: EXTERNAL SOURCES: Flutter: - :path: ".symlinks/flutter/ios" + :path: ".symlinks/flutter/ios-release" flutter_app_auth_wrapper: :path: ".symlinks/plugins/flutter_app_auth_wrapper/ios" flutter_web_browser: diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4f5087c5c593c409f673e6910779f4745dc615ad..972cd3fcbe14b2c594eca533b49a94259173f9d7 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -50,6 +49,7 @@ 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; }; 4E9F4BAD0684D8942060287A /* Pods-Runner.debug-development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-development.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-development.xcconfig"; sourceTree = "<group>"; }; 545ED105C35A59118B58FA1D /* Pods-Runner.debug-production.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-production.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-production.xcconfig"; sourceTree = "<group>"; }; + 78B61D5722FB247200204AFD /* dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = dev.entitlements; sourceTree = "<group>"; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; @@ -113,6 +113,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + 78B61D5722FB247200204AFD /* dev.entitlements */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, @@ -193,13 +194,14 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = 825ANDQ593; LastSwiftMigration = 1020; + ProvisioningStyle = Manual; }; }; }; @@ -228,7 +230,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -399,6 +400,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -414,6 +418,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-development"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; @@ -483,6 +488,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -498,6 +506,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-development"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; @@ -534,7 +543,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -561,6 +570,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = dev.entitlements; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -576,6 +588,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-appstore"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; @@ -611,7 +624,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -638,6 +651,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -653,6 +669,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-appstore"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; @@ -715,6 +732,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -730,6 +749,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-development"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; @@ -821,7 +841,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -848,6 +868,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -863,6 +885,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-development"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; @@ -876,6 +899,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 825ANDQ593; ENABLE_BITCODE = NO; @@ -891,6 +916,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Vereign-appstore"; SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h"; SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 1d282c2183df878feb2bc6ee202793299b5ffe33..63ebf6b377007606e565d9325ed0b41124c5d0e5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ 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 index d92fcdea8e64697530a3cb19be92d5abc9e041b0..61ecc17ea163327f2169a328abe66a3861f546f2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png 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 index 49b0623e3946f643c0732735212cf6bed4134c2c..33fd8e02357abe1eada99e6293a07a2ed53044e1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png 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 index 79173d6eed52721a9fc6212ed7c488904ba8e8b4..7209dd1657e0b4f13447d714c8832892c83200cd 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png 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 index f805c5b09a3af4a64c6e460533301dec9350df50..99ed45fd491dd3ce871e34ad0135d6d7608ac1c4 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png 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 index 6cd72f7da77309e2907daac1ad1f43b10c267b38..86e59899fced44011c596420a01e7d6a05d3db24 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png 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 index b7757d771e8f8783b9a4db66f7173ae2667c5f70..3eb1e7d44e1844ff4f906f603d17b420a2b54f03 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png 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 index 49b0623e3946f643c0732735212cf6bed4134c2c..33fd8e02357abe1eada99e6293a07a2ed53044e1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png 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 index 67c0b134fafa0b365c5f3bbd607a4eb612569819..2abed7c5baad3ba14a62b338efde945f5ac420ae 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png 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 index ba9de6f431c0bda81778aa64433fa143701b4a44..7a5059e1a29fdc1ed489cd642061afe3831194f5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png 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 index ba9de6f431c0bda81778aa64433fa143701b4a44..7a5059e1a29fdc1ed489cd642061afe3831194f5 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png 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 index 48cf6f681cd7c9ea963eafbb2dd9404d8834dfea..bddc655aa7e2f51573d7e7766c6121448e7c45e1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png 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 index 678724994583cb863279947970284b5813668692..caf3f5a34252495423c54628e3199f53574e5266 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png 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 index 472e20f7b6e3524350f4af82331809e7f5899614..f0f21446ab1cdf02e1ac6c96d5b819a12d5de169 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png 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 index f7c5749ad1d5985f293910ee8a500e89dc9bb642..e6923b6b3991f36bc2b5d29d27bd7000d41043ba 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 41d33c2d12c39f10e7816017e51c54980819a45b..14068eb6aa155cd8801b1f7890fa4b15c61decee 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -22,21 +22,11 @@ <string>????</string> <key>CFBundleURLTypes</key> <array> - <dict> - <key>CFBundleIdentifier</key> - <string></string> - <key>CFBundleTypeRole</key> - <string>Editor</string> - <key>CFBundleURLSchemes</key> - <array> - <string>app://com.vereign.app/oauth2</string> - </array> - </dict> <dict> <key>CFBundleTypeRole</key> <string>Editor</string> <key>CFBundleURLName</key> - <string>com.vereign.app/authorize</string> + <string>com.vereign.app</string> <key>CFBundleURLSchemes</key> <array> <string>app</string> diff --git a/ios/dev.entitlements b/ios/dev.entitlements new file mode 100644 index 0000000000000000000000000000000000000000..9b5f5bbbf122b01c7ca015adae09ef840ce39f30 --- /dev/null +++ b/ios/dev.entitlements @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>application-identifier</key> + <string>825ANDQ593.com.vereign.app.dev</string> + <key>keychain-access-groups</key> + <array> + <string>825ANDQ593.com.vereign.app.dev</string> + </array> +</dict> +</plist> diff --git a/ios/exportOptions-dev.plist b/ios/exportOptions-dev.plist new file mode 100644 index 0000000000000000000000000000000000000000..84d84f7b64f60d4805cf27d3664166124b542f33 --- /dev/null +++ b/ios/exportOptions-dev.plist @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>method</key> + <string>app-store</string> + <key>provisioningProfiles</key> + <dict> + <key>com.vereign.app.dev</key> + <string>Vereign-appstore</string> + </dict> + <key>teamID</key> + <string>825ANDQ593</string> + <key>uploadBitcode</key> + <false/> + <key>uploadSymbols</key> + <true/> + <key>destination</key> + <string>upload</string> + </dict> +</plist> \ No newline at end of file diff --git a/lib/config.dart b/lib/config.dart index 2194fde776d6cc4645101506dbdaedaaa5053f08..f8e401de597e6e255f275b5087ae288fcb5501ba 100644 --- a/lib/config.dart +++ b/lib/config.dart @@ -5,7 +5,7 @@ enum Flavor { class Config { static Flavor appFlavor; - static const DEFAULT_APP_HOST = "https://demo1.vereign.com"; + static const DEFAULT_APP_HOST = "https://app.vereign.com"; static const HOSTS = [ 'https://demo1.vereign.com', 'https://demo2.vereign.com', diff --git a/pubspec.yaml b/pubspec.yaml index 34c820bf9eaad106bffbac3f75627471a6ef1920..aafcccdd05e3248a87fb334e4f4ffd4a10613834 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: flutter_icons: android: true ios: true - image_path: "assets/images/vereign_icon.png" + image_path: "assets/images/vereign_logo.png" # For information on the generic Dart part of this file, see the