diff --git a/app.config.js b/app.config.js index 7528e9010c..c2eab958ea 100644 --- a/app.config.js +++ b/app.config.js @@ -311,25 +311,25 @@ module.exports = function (_config) { 'expo-splash-screen', { ios: { - enableFullScreenImage_legacy: true, - backgroundColor: '#ffffff', - image: './assets/splash.png', + enableFullScreenImage_legacy: true, // iOS only + backgroundColor: '#A8CCFF', // primary_200 + image: './assets/splash/splash.png', resizeMode: 'cover', dark: { - enableFullScreenImage_legacy: true, - backgroundColor: '#001429', - image: './assets/splash-dark.png', + enableFullScreenImage_legacy: true, // iOS only + backgroundColor: '#00398A', // primary_800 + image: './assets/splash/splash-dark.png', resizeMode: 'cover', }, }, android: { - backgroundColor: '#0c7cff', - image: './assets/splash-android-icon.png', - imageWidth: 150, + backgroundColor: '#A8CCFF', // primary_200 + image: './assets/splash/android-splash-logo-white.png', + imageWidth: 105, dark: { - backgroundColor: '#0c2a49', - image: './assets/splash-android-icon-dark.png', - imageWidth: 150, + backgroundColor: '#00398A', // primary_800 + image: './assets/splash/android-splash-logo-white.png', + imageWidth: 105, }, }, }, diff --git a/assets/splash-android-icon-dark.png b/assets/splash-android-icon-dark.png deleted file mode 100644 index c19a01dc6d..0000000000 Binary files a/assets/splash-android-icon-dark.png and /dev/null differ diff --git a/assets/splash-android-icon.png b/assets/splash-android-icon.png deleted file mode 100644 index 280386c900..0000000000 Binary files a/assets/splash-android-icon.png and /dev/null differ diff --git a/assets/splash/android-splash-logo-white.png b/assets/splash/android-splash-logo-white.png new file mode 100644 index 0000000000..b2b570b933 Binary files /dev/null and b/assets/splash/android-splash-logo-white.png differ diff --git a/assets/splash/splash-mobile-dark.png b/assets/splash/illustration-mobile-dark.png similarity index 100% rename from assets/splash/splash-mobile-dark.png rename to assets/splash/illustration-mobile-dark.png diff --git a/assets/splash/splash-mobile.png b/assets/splash/illustration-mobile.png similarity index 100% rename from assets/splash/splash-mobile.png rename to assets/splash/illustration-mobile.png diff --git a/assets/splash-dark.png b/assets/splash/splash-dark.png similarity index 100% rename from assets/splash-dark.png rename to assets/splash/splash-dark.png diff --git a/assets/splash.png b/assets/splash/splash.png similarity index 100% rename from assets/splash.png rename to assets/splash/splash.png diff --git a/src/Splash.tsx b/src/Splash.tsx index 47e70b375f..7a99d36891 100644 --- a/src/Splash.tsx +++ b/src/Splash.tsx @@ -21,9 +21,9 @@ import * as SplashScreen from 'expo-splash-screen' import {Logotype} from '#/view/icons/Logotype' // @ts-ignore -import splashImagePointer from '../assets/splash.png' +import splashImagePointer from '../assets/splash/splash.png' // @ts-ignore -import darkSplashImagePointer from '../assets/splash-dark.png' +import darkSplashImagePointer from '../assets/splash/splash-dark.png' const splashImageUri = RNImage.resolveAssetSource(splashImagePointer).uri const darkSplashImageUri = RNImage.resolveAssetSource( darkSplashImagePointer, diff --git a/src/view/com/auth/SplashScreen.tsx b/src/view/com/auth/SplashScreen.tsx index 77973ed3d7..cc44776969 100644 --- a/src/view/com/auth/SplashScreen.tsx +++ b/src/view/com/auth/SplashScreen.tsx @@ -11,9 +11,9 @@ import {Logotype} from '#/view/icons/Logotype' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' // @ts-ignore -import splashImagePointer from '../../../../assets/splash/splash-mobile.png' +import splashImagePointer from '../../../../assets/splash/illustration-mobile.png' // @ts-ignore -import darkSplashImagePointer from '../../../../assets/splash/splash-mobile-dark.png' +import darkSplashImagePointer from '../../../../assets/splash/illustration-mobile-dark.png' const splashImageUri = RNImage.resolveAssetSource(splashImagePointer).uri const darkSplashImageUri = RNImage.resolveAssetSource( darkSplashImagePointer, @@ -78,7 +78,7 @@ export const SplashScreen = ({ + style={[a.px_5xl, a.gap_md, a.pb_sm]}>