diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8e49c43b2..b3cb70322 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,5 @@ - + @@ -43,16 +44,23 @@ - - - - - - + + + + + + - - - + + + + android:background="@color/splashscreen_bg" + android:orientation="vertical"> + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 index 299b5a920..88a23931f 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-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index d674d6f90..1b93b5c64 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index da548680f..6dc7f729c 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index f59aad904..d1f58b4df 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_notification.png b/android/app/src/main/res/mipmap-hdpi/ic_notification.png index b6e001ffb..eb89cd8fb 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_notification.png and b/android/app/src/main/res/mipmap-hdpi/ic_notification.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 old mode 100755 new mode 100644 index fbac021a2..3ee707ebe 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-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index 0aaf8edb9..562baee4a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 99ea4ce57..d1126eace 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 9ecf39ad2..8f316094b 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_notification.png b/android/app/src/main/res/mipmap-mdpi/ic_notification.png index 67eca1220..137a2e26f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_notification.png and b/android/app/src/main/res/mipmap-mdpi/ic_notification.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 old mode 100755 new mode 100644 index b72345388..fa1b6a1e2 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-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 07fa1edb9..98e61dfb5 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 27aa0d983..e238e2ffb 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 3147ea9b0..1608e3758 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xhdpi/ic_notification.png index 907bb09fe..9b97092c5 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_notification.png and b/android/app/src/main/res/mipmap-xhdpi/ic_notification.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 old mode 100755 new mode 100644 index 08adcd2f5..d602a8aa3 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-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index d54637f12..c0900130a 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 6a58fee88..6926cf810 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index f94e8730a..9e00117fa 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png index 60f55f4bf..6ec8dc5f4 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_notification.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_notification.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 old mode 100755 new mode 100644 index 490d8b7b5..52f7e0ed4 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/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index fbc261db2..406509cb4 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 5961692b2..40859eb88 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 5b85d43a8..f8f8cabfe 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png index 58a5fef91..3da85e8fb 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification.png differ diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 000000000..7011bc7f6 --- /dev/null +++ b/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1,6 @@ + + + #FFFFFF + #00000000 + #1E325C + diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index aae649f08..d976f54da 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -2,4 +2,5 @@ #FFFFFF #00000000 - \ No newline at end of file + #FFFFFF + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index e14e36d44..21de094db 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -18,4 +18,6 @@ How long in milliseconds the mobile app should wait for the server to respond. EMM Vendor or Company Name Name of the EMM vendor or company deploying the app. Used in help text when prompting for passcodes so users are aware why the app is being protected. + In-App Session Auth + Instead of default flow from the mobile browser, enforce SSO with the WebView. diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 166843b94..515ba7d61 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,18 +1,9 @@ - - - - - diff --git a/android/app/src/main/res/xml/app_restrictions.xml b/android/app/src/main/res/xml/app_restrictions.xml index 27a0e9e2e..2287350b5 100644 --- a/android/app/src/main/res/xml/app_restrictions.xml +++ b/android/app/src/main/res/xml/app_restrictions.xml @@ -7,6 +7,12 @@ android:description="@string/inAppPinCode_description" android:restrictionType="string" android:defaultValue="false" /> + + android:background="@color/splashscreen_bg" + android:orientation="vertical"> + + diff --git a/assets/base/release/splash_screen/android/values-night/colors.xml b/assets/base/release/splash_screen/android/values-night/colors.xml new file mode 100644 index 000000000..7011bc7f6 --- /dev/null +++ b/assets/base/release/splash_screen/android/values-night/colors.xml @@ -0,0 +1,6 @@ + + + #FFFFFF + #00000000 + #1E325C + diff --git a/assets/base/release/splash_screen/android/values/colors.xml b/assets/base/release/splash_screen/android/values/colors.xml new file mode 100644 index 000000000..d976f54da --- /dev/null +++ b/assets/base/release/splash_screen/android/values/colors.xml @@ -0,0 +1,6 @@ + + + #FFFFFF + #00000000 + #FFFFFF + diff --git a/assets/base/release/splash_screen/android/values/styles.xml b/assets/base/release/splash_screen/android/values/styles.xml new file mode 100644 index 000000000..515ba7d61 --- /dev/null +++ b/assets/base/release/splash_screen/android/values/styles.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/assets/base/release/splash_screen/ios/LaunchScreen.storyboard b/assets/base/release/splash_screen/ios/LaunchScreen.storyboard index 6c6a7c9be..bab75aea8 100644 --- a/assets/base/release/splash_screen/ios/LaunchScreen.storyboard +++ b/assets/base/release/splash_screen/ios/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -13,33 +13,41 @@ - - + + - - + + + + + - - + + - - + + + + + + - + - + + diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground.png new file mode 100644 index 000000000..ffd93985d Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground.png differ diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@2x.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@2x.png new file mode 100644 index 000000000..cd517d89a Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@2x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@3x.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@3x.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackground@3x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark.png new file mode 100644 index 000000000..7c80a54ea Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark.png differ diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@2x.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@2x.png new file mode 100644 index 000000000..c69fd3956 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@2x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@3x.png b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@3x.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashBackground.imageset/SplashBackgroundDark@3x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon.png new file mode 100644 index 000000000..81477fbdf Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@2x.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@2x.png new file mode 100644 index 000000000..19e0e6a09 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@2x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@3x.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@3x.png new file mode 100644 index 000000000..03ce548a9 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon@3x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark.png new file mode 100644 index 000000000..f727f6fc0 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@2x.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@2x.png new file mode 100644 index 000000000..8ce1f3e7b Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@2x.png differ diff --git a/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@3x.png b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@3x.png new file mode 100644 index 000000000..e89ac3397 Binary files /dev/null and b/assets/base/release/splash_screen/ios/SplashIcon.imageset/SplashIcon_Dark@3x.png differ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f5f908dde..109b0cefb 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,6 +11,8 @@ is_build_pr = false # Executes before anything else use to setup the script before_all do + ENV['SPACESHIP_SKIP_2FA_UPGRADE'] = '1' + is_build_pr = ENV['BUILD_PR'] == 'true' if is_build_pr && ENV['CIRCLECI'] == 'true' ENV['BRANCH_TO_BUILD'] = ENV['CIRCLE_BRANCH'] @@ -82,11 +84,11 @@ lane :set_app_version do unless version_number.nil? || version_number.empty? package = load_config_json('../package.json') package['version'] = version_number - save_config_json('../package.json', package) + save_json_as_file('../package.json', package) lock = load_config_json('../package-lock.json') lock['version'] = version_number - save_config_json('../package-lock.json', lock) + save_json_as_file('../package-lock.json', lock) android_set_version_name( gradle_file: './android/app/build.gradle', @@ -164,7 +166,7 @@ lane :configure do end # Save the config.json file - save_config_json('../dist/assets/config.json', json) + save_json_as_file('../dist/assets/config.json', json) configured = true end @@ -429,12 +431,13 @@ platform :ios do # Set the deep link prefix app_scheme = ENV['APP_SCHEME'] || 'mattermost' + app_auth_scheme = ENV['BETA_BUILD'] == 'true' ? 'mmauthbeta' : 'mmauth' update_info_plist( xcodeproj: './ios/Mattermost.xcodeproj', plist_path: 'Mattermost/Info.plist', block: proc do |plist| urlScheme = plist["CFBundleURLTypes"].find{|scheme| scheme["CFBundleURLName"] == "com.mattermost"} - urlScheme[:CFBundleURLSchemes] = [app_scheme] + urlScheme[:CFBundleURLSchemes] = [app_scheme, app_auth_scheme] end ) @@ -503,7 +506,9 @@ platform :ios do lane :replace_assets do if ENV['REPLACE_ASSETS'] == 'true' sh 'cp -R ../dist/assets/release/icons/ios/* ../ios/Mattermost/Images.xcassets/AppIcon.appiconset/' - sh 'cp -R ../dist/assets/release/splash_screen/ios/* ../ios/SplashScreenResource/' + sh 'cp -R ../dist/assets/release/splash_screen/ios/LaunchScreen.storyboard ../ios/SplashScreenResource/LaunchScreen.storyboard' + sh 'cp -R ../dist/assets/release/splash_screen/ios/SplashBackground.imageset ../ios/Mattermost/Images.xcassets/' + sh 'cp -R ../dist/assets/release/splash_screen/ios/SplashIcon.imageset ../ios/Mattermost/Images.xcassets/' end end @@ -589,7 +594,6 @@ platform :android do unless configured configure end - configure_telemetry_android update_identifiers replace_assets link_sentry_android @@ -639,6 +643,15 @@ platform :android do new_string: "scheme=\'#{app_scheme}\'" ) + if ENV['BETA_BUILD'] != 'true' + find_replace_string( + path_to_file: "./android/app/src/main/AndroidManifest.xml", + old_string: 'scheme="mmauthbeta"', + new_string: 'scheme="mmauth"', + ) + end + + helpers_dir = './android/app/src/main/java/com/mattermost/helpers/' beta_dir = './android/app/src/main/java/com/mattermost/rnbeta/' release_dir = "./android/app/src/main/java/#{package_id.gsub '.', '/'}/" if ENV['BUILD_FOR_RELEASE'] == 'true' @@ -664,17 +677,17 @@ platform :android do Dir.glob(".#{release_dir}*.java") do |item| find_replace_string( - path_to_file: ".#{release_dir}MainApplication.java", + path_to_file: item[1..-1], old_string: 'package com.mattermost.rnbeta;', new_string: "package #{package_id};" ) end find_replace_string( - path_to_file: item[1..-1], + path_to_file: "#{release_dir}MainApplication.java", old_string: 'import com.mattermost.rnbeta.generated.BasePackageList;', new_string: "import #{package_id}.generated.BasePackageList;" - ) + ) Dir.glob('../android/app/src/main/java/com/mattermost/share/*.java') do |item| find_replace_string( @@ -683,6 +696,14 @@ platform :android do new_string: "import #{package_id}.MainApplication;" ) end + + Dir.glob('../android/app/src/main/java/com/mattermost/helpers/*.java') do |item| + find_replace_string( + path_to_file: item[1..-1], + old_string: 'import com.mattermost.rnbeta.*;', + new_string: "import #{package_id}.*;" + ) + end end end @@ -739,13 +760,21 @@ platform :android do app_name = ENV['APP_NAME'] || 'Mattermost Beta' app_name_sub = app_name.gsub(" ", "_") apks = lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] - outputJson = load_config_json(lane_context[SharedValues::GRADLE_OUTPUT_JSON_OUTPUT_PATH]) + json_path = lane_context[SharedValues::GRADLE_OUTPUT_JSON_OUTPUT_PATH] + + if json_path.nil? || json_path.empty? + dir_name = File.dirname(apks.first) + json_path = Dir.glob(File.join(dir_name, '*.json')).first + end + + UI.message("JSON PATH APK #{json_path}") + outputJson = load_config_json(json_path) paths = [] apks.each do |apk| filename = File.basename(apk) - output = outputJson.find { |o| o["path"] === filename } + output = outputJson["elements"].find { |o| o["outputFile"] == filename } unless output.nil? - filterName = output["apkData"]["filterName"] + filterName = output["filters"].empty? ? '' : output["filters"].first["value"] name = "#{app_name_sub}" unless filterName.nil? || filterName.empty? name += "-#{filterName}" @@ -783,7 +812,7 @@ def load_config_json(json_path) JSON.parse(config_file) end -def save_config_json(json_path, json) +def save_json_as_file(json_path, json) File.open(json_path, 'w') do |f| f.write(JSON.pretty_generate(json)) f.write("\n") @@ -823,9 +852,37 @@ def submit_to_testflight(ipa_path) if !ipa.nil? UI.success("ipa file #{ipa}") - pilot( - ipa: ipa - ) + unless ENV['IOS_API_KEY_ID'].nil? || ENV['IOS_API_KEY_ID'].empty? || + ENV['IOS_API_ISSUER_ID'].nil? || ENV['IOS_API_ISSUER_ID'].empty? || + ENV['IOS_API_KEY'].nil? || ENV['IOS_API_KEY'].empty? + api_key_path = "#{ENV['IOS_API_KEY_ID']}.p8" + File.open("../#{api_key_path}", 'w') do |f| + key_string = ENV['IOS_API_KEY'] + p8_array = key_string.split('\n') + p8_array.each_with_index do |value, index| + f.write(value) + f.write("\n") unless index == p8_array.length - 1 + end + end + + api_key = app_store_connect_api_key( + key_id: ENV['IOS_API_KEY_ID'], + issuer_id: ENV['IOS_API_ISSUER_ID'], + key_filepath: "./#{api_key_path}", + in_house: ENV['IOS_IN_HOUSE'] == 'true', # optional but may be required if using match/sigh + ) + + File.delete("../#{api_key_path}") + pilot( + ipa: ipa, + api_key: api_key + ) + else + UI.success("Uploading with Username / Password") + pilot( + ipa: ipa + ) + end else UI.user_error! "ipa file does not exist #{ipa}" return diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index 20515e09b..fe835f6c3 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -1,58 +1,75 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - addressable (2.7.0) + CFPropertyList (3.0.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.388.0) - aws-sdk-core (3.109.1) + aws-eventstream (1.1.1) + aws-partitions (1.492.0) + aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.47.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.100.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) + commander (4.6.0) + highline (~> 2.0.0) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.1) - rake (~> 13.0) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.0) - excon (0.78.0) - faraday (1.1.0) + emoji_regex (3.2.2) + excon (0.85.0) + faraday (1.7.1) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday_middleware (1.1.0) faraday (~> 1.0) - fastimage (2.2.0) - fastlane (2.165.0) + fastimage (2.2.5) + fastlane (2.192.0) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored - commander-fastlane (>= 4.4.6, < 5.0.0) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -61,18 +78,20 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) @@ -87,65 +106,79 @@ GEM fastlane-plugin-find_replace_string (0.1.0) fastlane-plugin-versioning_android (0.1.0) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.10.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-cloud-core (1.5.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.7.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-playcustomapp_v1 (0.5.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-storage_v1 (0.6.0) + google-apis-core (>= 0.4, < 2.a) + google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) + google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.29.1) + google-cloud-errors (1.1.0) + google-cloud-storage (1.34.1) addressable (~> 2.5) digest-crc (~> 0.4) - google-api-client (~> 0.33) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.14.0) + googleauth (0.17.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + highline (2.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.4.0) - json (2.3.1) - jwt (2.2.2) + json (2.5.1) + jwt (2.2.3) memoist (0.16.2) - mini_magick (4.10.1) - mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_magick (4.11.0) + mini_mime (1.1.1) + mini_portile2 (2.6.1) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) - naturally (2.2.0) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + naturally (2.2.1) + nokogiri (1.12.4) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + optparse (0.1.1) os (1.1.1) - plist (3.5.0) + plist (3.6.0) public_suffix (4.0.6) - rake (13.0.1) - representable (3.0.4) + racc (1.5.2) + rake (13.0.6) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) + rexml (3.2.5) rouge (2.0.7) - ruby2_keywords (0.0.2) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) security (0.1.3) - signet (0.14.0) + signet (0.15.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) @@ -153,10 +186,10 @@ GEM simctl (1.6.8) CFPropertyList naturally - slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.1) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -166,16 +199,18 @@ GEM unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) + webrick (1.7.0) word_wrap (1.0.0) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) + xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 8dbc8539b..603a58d31 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -33,7 +33,6 @@ 7F240ADB220E089300637665 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADA220E089300637665 /* Item.swift */; }; 7F240ADD220E094A00637665 /* TeamsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADC220E094A00637665 /* TeamsViewController.swift */; }; 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */ = {isa = PBXBuildFile; fileRef = 7F292A701E8AB73400A450A3 /* SplashScreenResource */; }; - 7F292AA71E8ABB1100A450A3 /* splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F292AA51E8ABB1100A450A3 /* splash.png */; }; 7F581D35221ED5C60099E66B /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F581D34221ED5C60099E66B /* NotificationService.swift */; }; 7F581D39221ED5C60099E66B /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7F581D32221ED5C60099E66B /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 7F581F78221EEA7C0099E66B /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; }; @@ -669,7 +668,6 @@ 279A77DD26A6F1BE00B515F1 /* compass-icons.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 7F0F4B0A24BA173900E14C60 /* LaunchScreen.storyboard in Resources */, - 7F292AA71E8ABB1100A450A3 /* splash.png in Resources */, 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */, 9358B95F95184EE0A4DCE629 /* OpenSans-Bold.ttf in Resources */, 55C6561DDBBA45929D88B6D1 /* OpenSans-BoldItalic.ttf in Resources */, diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png index 36dcc65ef..58b8d2282 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png index e41db4fc3..55fa0d6f2 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png index 5ef52e191..c781aca2d 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png index c1572e9de..4dd313bf9 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png index d406280be..4318ee812 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png index 9e17096b5..971f8c2d7 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png index e41db4fc3..75d7a60a6 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png index 7476cb6c4..52efdb41a 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png index 2d79d8a3f..236271812 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png index 39f6778a8..5253bdbe6 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png index e961bc385..01fe29ae2 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/76@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png index 658e19895..bab13065a 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/83.5@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png index 2d79d8a3f..1f37cb2cd 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png index d49c72b92..700f6e0a8 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png index bb14608eb..0245ad14f 100644 Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png and b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/Contents.json b/ios/Mattermost/Images.xcassets/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/ios/Mattermost/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/Contents.json b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/Contents.json new file mode 100644 index 000000000..957d8e4ea --- /dev/null +++ b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "SplashBackground.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashBackgroundDark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "SplashBackground@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashBackgroundDark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "SplashBackground@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashBackgroundDark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground.png new file mode 100644 index 000000000..ffd93985d Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@2x.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@2x.png new file mode 100644 index 000000000..cd517d89a Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@3x.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@3x.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackground@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark.png new file mode 100644 index 000000000..7c80a54ea Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@2x.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@2x.png new file mode 100644 index 000000000..c69fd3956 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@3x.png b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@3x.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashBackground.imageset/SplashBackgroundDark@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashBackgroundColor.colorset/Contents.json b/ios/Mattermost/Images.xcassets/SplashBackgroundColor.colorset/Contents.json new file mode 100644 index 000000000..dd918d4c3 --- /dev/null +++ b/ios/Mattermost/Images.xcassets/SplashBackgroundColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x5C", + "green" : "0x32", + "red" : "0x1E" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/Contents.json b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/Contents.json new file mode 100644 index 000000000..b279658c9 --- /dev/null +++ b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "SplashIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashIcon_Dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "SplashIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashIcon_Dark@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "SplashIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashIcon_Dark@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon.png new file mode 100644 index 000000000..81477fbdf Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@2x.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@2x.png new file mode 100644 index 000000000..19e0e6a09 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@3x.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@3x.png new file mode 100644 index 000000000..03ce548a9 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon@3x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark.png new file mode 100644 index 000000000..f727f6fc0 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@2x.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@2x.png new file mode 100644 index 000000000..8ce1f3e7b Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@2x.png differ diff --git a/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@3x.png b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@3x.png new file mode 100644 index 000000000..e89ac3397 Binary files /dev/null and b/ios/Mattermost/Images.xcassets/SplashIcon.imageset/SplashIcon_Dark@3x.png differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f467a3c93..5edb4a92c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -710,7 +710,7 @@ SPEC CHECKSUMS: EXFileSystem: 0a04aba8da751b9ac954065911bcf166503f8267 ExpoModulesCore: 2734852616127a6c1fc23012197890a6f3763dc7 FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: d35931295aacfe996e833c01a3701d4aa7a80cb4 + FBReactNativeSpec: cef0cc6d50abc92e8cf52f140aa22b5371cfec0b glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 jail-monkey: 07b83767601a373db876e939b8dbf3f5eb15f073 libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0 diff --git a/ios/SplashScreenResource/LaunchScreen.storyboard b/ios/SplashScreenResource/LaunchScreen.storyboard index 6c6a7c9be..bab75aea8 100644 --- a/ios/SplashScreenResource/LaunchScreen.storyboard +++ b/ios/SplashScreenResource/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -13,33 +13,41 @@ - - + + - - + + + + + - - + + - - + + + + + + - + - + + diff --git a/ios/SplashScreenResource/splash.png b/ios/SplashScreenResource/splash.png deleted file mode 100644 index ebcdad786..000000000 Binary files a/ios/SplashScreenResource/splash.png and /dev/null differ diff --git a/ios/react-native-xcode.sh b/ios/react-native-xcode.sh index 82b978ec2..cc2867fac 100755 --- a/ios/react-native-xcode.sh +++ b/ios/react-native-xcode.sh @@ -74,7 +74,7 @@ if [[ "$ENTRY_FILE" ]]; then elif [[ -s "index.ios.js" ]]; then ENTRY_FILE=${1:-index.ios.js} else - ENTRY_FILE=${1:-index.js} + ENTRY_FILE=${1:-index.ts} fi # Path to react-native folder inside node_modules