diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png old mode 100755 new mode 100644 index 9f443d188..14e285cef Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-hdpi/splash_background.png b/android/app/src/main/res/drawable-hdpi/splash_background.png new file mode 100644 index 000000000..cd517d89a Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png old mode 100755 new mode 100644 index c2e37c49e..b400ad852 Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splash_background.png b/android/app/src/main/res/drawable-mdpi/splash_background.png new file mode 100644 index 000000000..ffd93985d Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-night-hdpi/ic_notif_action_reply.png b/android/app/src/main/res/drawable-night-hdpi/ic_notif_action_reply.png new file mode 100644 index 000000000..db4dc2575 Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/ic_notif_action_reply.png differ diff --git a/android/app/src/main/res/drawable-night-hdpi/splash.png b/android/app/src/main/res/drawable-night-hdpi/splash.png new file mode 100644 index 000000000..a8f05fbfe Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-hdpi/splash_background.png b/android/app/src/main/res/drawable-night-hdpi/splash_background.png new file mode 100644 index 000000000..c69fd3956 Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-night-mdpi/ic_notif_action_reply.png b/android/app/src/main/res/drawable-night-mdpi/ic_notif_action_reply.png new file mode 100644 index 000000000..d34c7a59b Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/ic_notif_action_reply.png differ diff --git a/android/app/src/main/res/drawable-night-mdpi/splash.png b/android/app/src/main/res/drawable-night-mdpi/splash.png new file mode 100644 index 000000000..0a9b325b0 Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-mdpi/splash_background.png b/android/app/src/main/res/drawable-night-mdpi/splash_background.png new file mode 100644 index 000000000..7c80a54ea Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-night-xhdpi/ic_notif_action_reply.png b/android/app/src/main/res/drawable-night-xhdpi/ic_notif_action_reply.png new file mode 100644 index 000000000..84c30ef30 Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/ic_notif_action_reply.png differ diff --git a/android/app/src/main/res/drawable-night-xhdpi/splash.png b/android/app/src/main/res/drawable-night-xhdpi/splash.png new file mode 100644 index 000000000..ff28d6dde Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-xhdpi/splash_background.png b/android/app/src/main/res/drawable-night-xhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-night-xxhdpi/ic_notif_action_reply.png b/android/app/src/main/res/drawable-night-xxhdpi/ic_notif_action_reply.png new file mode 100644 index 000000000..7bc94bf20 Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/ic_notif_action_reply.png differ diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxhdpi/splash.png new file mode 100644 index 000000000..e1621b4e8 Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png b/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/ic_notif_action_reply.png b/android/app/src/main/res/drawable-night-xxxhdpi/ic_notif_action_reply.png new file mode 100644 index 000000000..aec3580c6 Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/ic_notif_action_reply.png differ diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png new file mode 100644 index 000000000..1ec5a86f9 Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png b/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png old mode 100755 new mode 100644 index 7b41991b9..703b82197 Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splash_background.png b/android/app/src/main/res/drawable-xhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png old mode 100755 new mode 100644 index 81e42e8c0..4e1f07fbb Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash_background.png b/android/app/src/main/res/drawable-xxhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash_background.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png old mode 100755 new mode 100644 index 6f63e0b8d..5db69115d Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash_background.png b/android/app/src/main/res/drawable-xxxhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash_background.png differ diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml index e638f4097..6584e2cdc 100644 --- a/android/app/src/main/res/layout/launch_screen.xml +++ b/android/app/src/main/res/layout/launch_screen.xml @@ -1,19 +1,32 @@ - + android:background="@color/splashscreen_bg" + android:orientation="vertical"> + android:scaleType="centerCrop" + android:src="@drawable/splash_background" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + 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/styles.xml b/android/app/src/main/res/values/styles.xml index 53ffe603c..515ba7d61 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -3,8 +3,8 @@ diff --git a/assets/base/release/splash_screen/android/drawable-hdpi/splash.png b/assets/base/release/splash_screen/android/drawable-hdpi/splash.png old mode 100755 new mode 100644 index 9f443d188..14e285cef Binary files a/assets/base/release/splash_screen/android/drawable-hdpi/splash.png and b/assets/base/release/splash_screen/android/drawable-hdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-hdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-hdpi/splash_background.png new file mode 100644 index 000000000..cd517d89a Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-hdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-mdpi/splash.png b/assets/base/release/splash_screen/android/drawable-mdpi/splash.png old mode 100755 new mode 100644 index c2e37c49e..b400ad852 Binary files a/assets/base/release/splash_screen/android/drawable-mdpi/splash.png and b/assets/base/release/splash_screen/android/drawable-mdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-mdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-mdpi/splash_background.png new file mode 100644 index 000000000..ffd93985d Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-mdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-hdpi/splash.png b/assets/base/release/splash_screen/android/drawable-night-hdpi/splash.png new file mode 100644 index 000000000..a8f05fbfe Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-hdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-hdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-night-hdpi/splash_background.png new file mode 100644 index 000000000..c69fd3956 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-hdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-mdpi/splash.png b/assets/base/release/splash_screen/android/drawable-night-mdpi/splash.png new file mode 100644 index 000000000..0a9b325b0 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-mdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-mdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-night-mdpi/splash_background.png new file mode 100644 index 000000000..7c80a54ea Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-mdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash.png new file mode 100644 index 000000000..ff28d6dde Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash.png new file mode 100644 index 000000000..e1621b4e8 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xxhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash.png new file mode 100644 index 000000000..1ec5a86f9 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash_background.png new file mode 100644 index 000000000..10c92012c Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-night-xxxhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png old mode 100755 new mode 100644 index 7b41991b9..703b82197 Binary files a/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png and b/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-xhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png old mode 100755 new mode 100644 index 81e42e8c0..4e1f07fbb Binary files a/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png and b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xxhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png old mode 100755 new mode 100644 index 6f63e0b8d..5db69115d Binary files a/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png and b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png differ diff --git a/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash_background.png b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash_background.png new file mode 100644 index 000000000..b1ad2b7e1 Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash_background.png differ diff --git a/assets/base/release/splash_screen/android/layout/launch_screen.xml b/assets/base/release/splash_screen/android/layout/launch_screen.xml index e638f4097..6584e2cdc 100644 --- a/assets/base/release/splash_screen/android/layout/launch_screen.xml +++ b/assets/base/release/splash_screen/android/layout/launch_screen.xml @@ -1,19 +1,32 @@ - + android:background="@color/splashscreen_bg" + android:orientation="vertical"> + android:scaleType="centerCrop" + android:src="@drawable/splash_background" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + 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 e73c48892..bab75aea8 100644 --- a/assets/base/release/splash_screen/ios/LaunchScreen.storyboard +++ b/assets/base/release/splash_screen/ios/LaunchScreen.storyboard @@ -1,10 +1,11 @@ - - + + - + + @@ -12,32 +13,43 @@ - - + + - - + + + + + - - + + - - - - - + + + + + + + + + - + - + + + + + 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/assets/base/release/splash_screen/ios/splash.png b/assets/base/release/splash_screen/ios/splash.png deleted file mode 100644 index dd85ba1f8..000000000 Binary files a/assets/base/release/splash_screen/ios/splash.png and /dev/null differ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index dea76a8fe..923dd6f1d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -506,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 diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index c56762783..f01ce3a0d 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -7,7 +7,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.1.1) - aws-partitions (1.485.0) + aws-partitions (1.486.0) aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index b9e786e0d..b6c85e507 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -41,7 +41,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 */; }; @@ -198,7 +197,6 @@ 7F240ADA220E089300637665 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = ""; }; 7F240ADC220E094A00637665 /* TeamsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamsViewController.swift; sourceTree = ""; }; 7F292A701E8AB73400A450A3 /* SplashScreenResource */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SplashScreenResource; sourceTree = ""; }; - 7F292AA51E8ABB1100A450A3 /* splash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = splash.png; path = SplashScreenResource/splash.png; sourceTree = ""; }; 7F325D6DAAF1047EB948EFF7 /* Pods-Mattermost-MattermostTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost-MattermostTests.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost-MattermostTests/Pods-Mattermost-MattermostTests.debug.xcconfig"; sourceTree = ""; }; 7F43D6051F6BF9EB001FC614 /* libPods-Mattermost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-Mattermost.a"; path = "../../../../../../../Library/Developer/Xcode/DerivedData/Mattermost-czlinsdviifujheezzjvmisotjrm/Build/Products/Debug-iphonesimulator/libPods-Mattermost.a"; sourceTree = ""; }; 7F54ABFAE6CE4A6DB11D1ED7 /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; }; @@ -356,7 +354,6 @@ 7FEB109B1F61019C0039A015 /* UIImage+ImageEffects.h */, 7FEB109C1F61019C0039A015 /* UIImage+ImageEffects.m */, 7F151D40221B069200FAD8F3 /* 0155-keys.png */, - 7F292AA51E8ABB1100A450A3 /* splash.png */, 7F5BA34522B99B7B005B05D3 /* Mattermost+RCTUITextView.h */, 7F5BA34622B99B7B005B05D3 /* Mattermost+RCTUITextView.m */, 7F0F4B0924BA173900E14C60 /* LaunchScreen.storyboard */, @@ -662,7 +659,6 @@ 7F151D41221B069200FAD8F3 /* 0155-keys.png in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 7F0F4B0A24BA173900E14C60 /* LaunchScreen.storyboard in Resources */, - 7F292AA71E8ABB1100A450A3 /* splash.png in Resources */, 7FF2AF8B2086483E00FFBDF4 /* KeyShareConsumer.storyboard in Resources */, 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */, 9358B95F95184EE0A4DCE629 /* OpenSans-Bold.ttf in Resources */, 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/SplashScreenResource/LaunchScreen.storyboard b/ios/SplashScreenResource/LaunchScreen.storyboard index d7a2a5ea3..bab75aea8 100644 --- a/ios/SplashScreenResource/LaunchScreen.storyboard +++ b/ios/SplashScreenResource/LaunchScreen.storyboard @@ -1,10 +1,11 @@ - - + + - + + @@ -12,32 +13,43 @@ - - + + - - + + + + + - - + + - - - - - + + + + + + + + + - + - + + + + + diff --git a/ios/SplashScreenResource/splash.png b/ios/SplashScreenResource/splash.png deleted file mode 100644 index dd85ba1f8..000000000 Binary files a/ios/SplashScreenResource/splash.png and /dev/null differ