diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -67,20 +67,21 @@ modeValue: string, keyboardHeightValue: number, contentHeightValue: number, + topInset: number, ): number { 'worklet'; - const headerHeight = Platform.OS === 'ios' ? 62.33 : 58.54; - let containerSize = headerHeight; - if (modeValue === 'loading' || modeValue === 'prompt') { - containerSize += Platform.OS === 'ios' ? 40 : 61; - } else if (modeValue === 'log-in') { + let containerSize = 66; + if (modeValue === 'log-in') { containerSize += 140; } else if (modeValue === 'siwe') { containerSize += 250; } const freeSpace = contentHeightValue - keyboardHeightValue - containerSize; - const targetPanelPaddingTop = Math.max(freeSpace, 0) / 2; + const targetPanelPaddingTop = Math.max(freeSpace, 0) / 2 - topInset; + if (modeValue === 'loading' || modeValue === 'log-in') { + return targetPanelPaddingTop; + } return withTiming(targetPanelPaddingTop, timingConfig); } @@ -252,7 +253,8 @@ const nextModeRef = React.useRef(initialMode); const dimensions = useSelector(derivedDimensionsInfoSelector); - const contentHeight = useSharedValue(dimensions.safeAreaHeight); + const contentHeight = useSharedValue(dimensions.height); + const modeValue = useSharedValue(initialMode); const buttonOpacity = useSharedValue(canStartAuth ? 1 : 0); @@ -267,7 +269,7 @@ prevOnPromptRef.current = onPrompt; }, [onPrompt, buttonOpacity]); - const curContentHeight = dimensions.safeAreaHeight; + const curContentHeight = dimensions.height; const prevContentHeightRef = React.useRef(curContentHeight); React.useEffect(() => { if (curContentHeight === prevContentHeightRef.current) { @@ -535,6 +537,7 @@ modeValue.value, keyboardHeightValue.value, contentHeight.value, + dimensions.topInset, ), })); const animatedContentStyle = React.useMemo( diff --git a/native/android/app/src/main/AndroidManifest.xml b/native/android/app/src/main/AndroidManifest.xml --- a/native/android/app/src/main/AndroidManifest.xml +++ b/native/android/app/src/main/AndroidManifest.xml @@ -52,10 +52,11 @@ android:windowSoftInputMode="adjustResize" android:exported="true" android:screenOrientation="portrait" + android:theme="@style/Theme.App.SplashScreen" > - - + + @@ -75,20 +76,6 @@ /> - - - - - - + + diff --git a/native/android/app/src/main/res/drawable/splash_header.xml b/native/android/app/src/main/res/drawable/splash_header.xml deleted file mode 100644 --- a/native/android/app/src/main/res/drawable/splash_header.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/native/android/app/src/main/res/drawable/splashscreen.xml b/native/android/app/src/main/res/drawable/splashscreen.xml deleted file mode 100644 --- a/native/android/app/src/main/res/drawable/splashscreen.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/native/android/app/src/main/res/values-v21/styles.xml b/native/android/app/src/main/res/values-v21/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/native/android/app/src/main/res/values-w481dp-xxhdpi/styles.xml b/native/android/app/src/main/res/values-w481dp-xxhdpi/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-w481dp-xxhdpi/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/native/android/app/src/main/res/values-w481dp-xxxhdpi/styles.xml b/native/android/app/src/main/res/values-w481dp-xxxhdpi/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-w481dp-xxxhdpi/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/native/android/app/src/main/res/values-w801dp-xhdpi/styles.xml b/native/android/app/src/main/res/values-w801dp-xhdpi/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-w801dp-xhdpi/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/native/android/app/src/main/res/values-w801dp/styles.xml b/native/android/app/src/main/res/values-w801dp/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-w801dp/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/native/android/app/src/main/res/values-w961dp-hdpi/styles.xml b/native/android/app/src/main/res/values-w961dp-hdpi/styles.xml deleted file mode 100644 --- a/native/android/app/src/main/res/values-w961dp-hdpi/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/native/android/app/src/main/res/values/styles.xml b/native/android/app/src/main/res/values/styles.xml --- a/native/android/app/src/main/res/values/styles.xml +++ b/native/android/app/src/main/res/values/styles.xml @@ -1,17 +1,9 @@ - - - - - - + \ No newline at end of file diff --git a/native/ios/SplashScreen.storyboard b/native/ios/SplashScreen.storyboard --- a/native/ios/SplashScreen.storyboard +++ b/native/ios/SplashScreen.storyboard @@ -1,9 +1,9 @@ - + - + @@ -12,7 +12,7 @@ - + @@ -21,8 +21,8 @@ - - + +