diff options
author | Hailey <me@haileyok.com> | 2024-12-06 09:52:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-06 17:52:08 +0000 |
commit | 1f6acc11abec91972e6e04abd55e09b2a9dc1433 (patch) | |
tree | 3d6a9b1e8a3aa6f06a4700e9b40519439fcb37da /app.config.js | |
parent | 3ab6c435df5dc3d17fe3e2531231ccf012a4860c (diff) | |
download | voidsky-1f6acc11abec91972e6e04abd55e09b2a9dc1433.tar.zst |
clean rn 0.76 upgrade (#6887)
* package upgrades * upgrade system ui * update patches * rename patch * rm * use .set/.set * resolve yarnlock * fix accidentally removed package * fix use permissions hook * fix some type errors * type fixes * more tweaking * clean * Discard changes to src/screens/Onboarding/StepProfile/index.tsx * oops * fix splash * use ios/android in config * Fix tests * add back patch * add to rn patch * fullscreen? * Revert "add to rn patch" This reverts commit 4716d2c643a29fc77b871ca8555d8d78cb4ac427. * try this * test with revert * test * maybe this * fix config * Bump @react-native-picker/picker * Bump some packages * Rm unused * Update lockfile * Rename expo-notifications+0.29.8.patch.md to expo-notifications+0.29.10.patch.md * Update react-native+0.76.3.patch.md * Update react-native+0.76.3.patch.md * Inline splash configs Jumping around the file is annoying and makes it harder to understand how this is structured. * Start fixing Android splash * Downgrade compressor This version isn't building for me due to https://github.com/numandev1/react-native-compressor/issues/322. * Make Android splash empty for now * Work around a bug * Bump the compressor * Bump again * Include splash fixes * Try updating * No custom Android splash * Revert to using icons * welp * Fix sizes * Make sizing work * Bump size --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Diffstat (limited to 'app.config.js')
-rw-r--r-- | app.config.js | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/app.config.js b/app.config.js index 650191758..895c4a6ef 100644 --- a/app.config.js +++ b/app.config.js @@ -1,26 +1,6 @@ const pkg = require('./package.json') -const SPLASH_CONFIG = { - backgroundColor: '#ffffff', - image: './assets/splash.png', - resizeMode: 'cover', -} -const DARK_SPLASH_CONFIG = { - backgroundColor: '#001429', - image: './assets/splash-dark.png', - resizeMode: 'cover', -} - -const SPLASH_CONFIG_ANDROID = { - backgroundColor: '#0c7cff', - image: './assets/splash.png', - resizeMode: 'cover', -} -const DARK_SPLASH_CONFIG_ANDROID = { - backgroundColor: '#0f141b', - image: './assets/splash-dark.png', - resizeMode: 'cover', -} +const DARK_SPLASH_ANDROID_BACKGROUND = '#0f141b' module.exports = function (config) { /** @@ -73,8 +53,6 @@ module.exports = function (config) { orientation: 'portrait', icon: './assets/app-icons/ios_icon_default_light.png', userInterfaceStyle: 'automatic', - splash: SPLASH_CONFIG, - // hsl(211, 99%, 53%), same as palette.default.brandText primaryColor: '#1083fe', ios: { supportsTablet: false, @@ -124,10 +102,6 @@ module.exports = function (config) { ], }, associatedDomains: ASSOCIATED_DOMAINS, - splash: { - ...SPLASH_CONFIG, - dark: DARK_SPLASH_CONFIG, - }, entitlements: { 'com.apple.developer.kernel.increased-memory-limit': true, 'com.apple.developer.kernel.extended-virtual-addressing': true, @@ -164,7 +138,7 @@ module.exports = function (config) { // Dark nav bar in light mode is better than light nav bar in dark mode androidNavigationBar: { barStyle: 'light-content', - backgroundColor: DARK_SPLASH_CONFIG_ANDROID.backgroundColor, + backgroundColor: DARK_SPLASH_ANDROID_BACKGROUND, }, android: { icon: './assets/app-icons/android_icon_default_light.png', @@ -193,10 +167,6 @@ module.exports = function (config) { category: ['BROWSABLE', 'DEFAULT'], }, ], - splash: { - ...SPLASH_CONFIG_ANDROID, - dark: DARK_SPLASH_CONFIG_ANDROID, - }, }, web: { favicon: './assets/favicon.png', @@ -236,10 +206,9 @@ module.exports = function (config) { newArchEnabled: false, }, android: { - compileSdkVersion: 34, - targetSdkVersion: 34, - buildToolsVersion: '34.0.0', - kotlinVersion: '1.8.0', + compileSdkVersion: 35, + targetSdkVersion: 35, + buildToolsVersion: '35.0.0', newArchEnabled: false, }, }, @@ -256,7 +225,6 @@ module.exports = function (config) { './plugins/starterPackAppClipExtension/withStarterPackAppClip.js', './plugins/withAndroidManifestPlugin.js', './plugins/withAndroidManifestFCMIconPlugin.js', - './plugins/withAndroidStylesWindowBackgroundPlugin.js', './plugins/withAndroidStylesAccentColorPlugin.js', './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js', './plugins/shareExtension/withShareExtensions.js', @@ -279,6 +247,33 @@ module.exports = function (config) { }, ], [ + 'expo-splash-screen', + { + ios: { + enableFullScreenImage_legacy: true, + backgroundColor: '#ffffff', + image: './assets/splash.png', + resizeMode: 'cover', + dark: { + enableFullScreenImage_legacy: true, + backgroundColor: '#001429', + image: './assets/splash-dark.png', + resizeMode: 'cover', + }, + }, + android: { + backgroundColor: '#0c7cff', + image: './assets/splash-android-icon.png', + imageWidth: 150, + dark: { + backgroundColor: '#0c2a49', + image: './assets/splash-android-icon-dark.png', + imageWidth: 150, + }, + }, + }, + ], + [ '@mozzius/expo-dynamic-app-icon', { /** |