Page MenuHomePhorge
Files F32204554

D14997.1765115991.diff
No OneTemporary
Actions

Size
19 KB
Referenced Files
None
Subscribers
None

D14997.1765115991.diff
View Options

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<LoggedOutMode>(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"
>
<intent-filter>
- <action android:name="app.comm.android.START_MAIN_ACTIVITY" />
- <category android:name="android.intent.category.DEFAULT" />
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
@@ -75,20 +76,6 @@
/>
</intent-filter>
</activity>
- <activity
- android:name=".SplashActivity"
- android:launchMode="singleTop"
- android:theme="@style/SplashTheme"
- android:label="@string/app_name"
- android:noHistory="true"
- android:screenOrientation="portrait"
- android:exported="true"
- >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/notif_icon"
diff --git a/native/android/app/src/main/java/app/comm/android/MainActivity.kt b/native/android/app/src/main/java/app/comm/android/MainActivity.kt
--- a/native/android/app/src/main/java/app/comm/android/MainActivity.kt
+++ b/native/android/app/src/main/java/app/comm/android/MainActivity.kt
@@ -19,7 +19,8 @@
// Set the theme to AppTheme BEFORE onCreate to support
// coloring the background, status bar, and navigation bar.
// This is required for expo-splash-screen.
- setTheme(R.style.AppTheme);
+ // setTheme(R.style.AppTheme);
+ SplashScreenManager.registerOnActivity(this)
super.onCreate(null)
}
diff --git a/native/android/app/src/main/java/app/comm/android/SplashActivity.java b/native/android/app/src/main/java/app/comm/android/SplashActivity.java
deleted file mode 100644
--- a/native/android/app/src/main/java/app/comm/android/SplashActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package app.comm.android;
-
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-
-public class SplashActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- forwardIntent(this.getIntent());
- }
-
- @Override
- public void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- setIntent(intent);
- forwardIntent(intent);
- }
-
- private void forwardIntent(Intent intent) {
- Intent mainIntent = new Intent(this, MainActivity.class);
- mainIntent.putExtras(intent);
- startActivity(mainIntent);
- finish();
- overridePendingTransition(0, 0);
- }
-}
diff --git a/native/android/app/src/main/res/drawable-hdpi/header.webp b/native/android/app/src/main/res/drawable-hdpi/header.webp
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/android/app/src/main/res/drawable-xhdpi/header.webp b/native/android/app/src/main/res/drawable-xhdpi/header.webp
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/android/app/src/main/res/drawable-xxhdpi/header.webp b/native/android/app/src/main/res/drawable-xxhdpi/header.webp
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/android/app/src/main/res/drawable-xxxhdpi/header.webp b/native/android/app/src/main/res/drawable-xxxhdpi/header.webp
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/android/app/src/main/res/drawable/header.webp b/native/android/app/src/main/res/drawable/header.webp
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/android/app/src/main/res/drawable/header.xml b/native/android/app/src/main/res/drawable/header.xml
new file mode 100644
--- /dev/null
+++ b/native/android/app/src/main/res/drawable/header.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="288dp"
+ android:height="288dp"
+ android:viewportWidth="288"
+ android:viewportHeight="288">
+ <path
+ android:pathData="M80.55,165.67C75.44,165.67 71.43,163.96 68.51,160.52C65.6,157.05 64.15,152.03 64.15,145.46C64.15,142.17 64.52,139.28 65.27,136.78C66.01,134.27 67.1,132.16 68.51,130.45C69.93,128.73 71.65,127.44 73.67,126.58C75.72,125.69 78.02,125.24 80.55,125.24C83.95,125.24 86.79,125.99 89.07,127.48C91.38,128.97 93.19,131.18 94.5,134.09L89.18,137C88.51,135.13 87.46,133.66 86.04,132.58C84.66,131.46 82.83,130.9 80.55,130.9C77.53,130.9 75.16,131.92 73.44,133.98C71.73,136.03 70.87,138.87 70.87,142.49V148.42C70.87,152.04 71.73,154.88 73.44,156.94C75.16,158.99 77.53,160.02 80.55,160.02C82.91,160.02 84.81,159.42 86.27,158.22C87.76,156.99 88.86,155.42 89.57,153.52L94.67,156.6C93.36,159.44 91.53,161.66 89.18,163.26C86.83,164.87 83.95,165.67 80.55,165.67ZM112.35,165.67C110.33,165.67 108.49,165.32 106.81,164.61C105.16,163.9 103.76,162.89 102.61,161.58C101.45,160.24 100.55,158.63 99.92,156.77C99.28,154.86 98.97,152.76 98.97,150.44C98.97,148.13 99.28,146.04 99.92,144.17C100.55,142.26 101.45,140.66 102.61,139.35C103.76,138.01 105.16,136.98 106.81,136.27C108.49,135.56 110.33,135.21 112.35,135.21C114.37,135.21 116.2,135.56 117.84,136.27C119.52,136.98 120.94,138.01 122.1,139.35C123.25,140.66 124.15,142.26 124.78,144.17C125.42,146.04 125.74,148.13 125.74,150.44C125.74,152.76 125.42,154.86 124.78,156.77C124.15,158.63 123.25,160.24 122.1,161.58C120.94,162.89 119.52,163.9 117.84,164.61C116.2,165.32 114.37,165.67 112.35,165.67ZM112.35,160.63C114.44,160.63 116.12,160 117.39,158.73C118.66,157.42 119.29,155.48 119.29,152.9V147.98C119.29,145.4 118.66,143.48 117.39,142.21C116.12,140.9 114.44,140.25 112.35,140.25C110.26,140.25 108.58,140.9 107.31,142.21C106.04,143.48 105.41,145.4 105.41,147.98V152.9C105.41,155.48 106.04,157.42 107.31,158.73C108.58,160 110.26,160.63 112.35,160.63ZM132.54,165V135.88H138.64V140.7H138.92C139.22,139.95 139.57,139.24 139.98,138.57C140.43,137.9 140.96,137.32 141.55,136.83C142.19,136.31 142.91,135.92 143.74,135.66C144.6,135.36 145.58,135.21 146.7,135.21C148.68,135.21 150.44,135.69 151.97,136.66C153.5,137.63 154.62,139.13 155.33,141.14H155.5C156.02,139.5 157.03,138.1 158.52,136.94C160.01,135.79 161.94,135.21 164.29,135.21C167.2,135.21 169.46,136.2 171.06,138.18C172.67,140.12 173.47,142.9 173.47,146.52V165H167.37V147.25C167.37,145.01 166.94,143.33 166.08,142.21C165.22,141.05 163.86,140.47 161.99,140.47C161.21,140.47 160.46,140.58 159.75,140.81C159.04,140.99 158.41,141.29 157.85,141.7C157.32,142.12 156.9,142.64 156.56,143.27C156.22,143.91 156.06,144.63 156.06,145.46V165H149.95V147.25C149.95,142.73 148.18,140.47 144.63,140.47C143.88,140.47 143.14,140.58 142.39,140.81C141.68,140.99 141.05,141.29 140.49,141.7C139.93,142.12 139.48,142.64 139.14,143.27C138.81,143.91 138.64,144.63 138.64,145.46V165H132.54ZM181.92,165V135.88H188.02V140.7H188.3C188.6,139.95 188.96,139.24 189.37,138.57C189.82,137.9 190.34,137.32 190.93,136.83C191.57,136.31 192.3,135.92 193.12,135.66C193.98,135.36 194.97,135.21 196.09,135.21C198.07,135.21 199.82,135.69 201.35,136.66C202.88,137.63 204,139.13 204.71,141.14H204.88C205.4,139.5 206.41,138.1 207.9,136.94C209.4,135.79 211.32,135.21 213.67,135.21C216.58,135.21 218.84,136.2 220.45,138.18C222.05,140.12 222.85,142.9 222.85,146.52V165H216.75V147.25C216.75,145.01 216.32,143.33 215.46,142.21C214.6,141.05 213.24,140.47 211.38,140.47C210.59,140.47 209.84,140.58 209.13,140.81C208.43,140.99 207.79,141.29 207.23,141.7C206.71,142.12 206.28,142.64 205.94,143.27C205.61,143.91 205.44,144.63 205.44,145.46V165H199.34V147.25C199.34,142.73 197.56,140.47 194.01,140.47C193.27,140.47 192.52,140.58 191.77,140.81C191.07,140.99 190.43,141.29 189.87,141.7C189.31,142.12 188.86,142.64 188.53,143.27C188.19,143.91 188.02,144.63 188.02,145.46V165H181.92Z"
+ android:fillColor="#ffffff"/>
+</vector>
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 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<inset
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:insetBottom="78dp"
- android:insetLeft="2dp"
->
- <bitmap
- android:src="@drawable/header"
- android:width="177dp"
- android:height="62dp"
- android:gravity="center"
- />
-</inset>
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 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <bitmap
- android:src="@drawable/splash_background"
- android:gravity="center"
- />
- </item>
- <item
- android:drawable="@drawable/splash_header"
- />
-</layer-list>
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 @@
-<resources>
- <style name="AppTheme" parent="AppThemeBase">
- <item name="android:windowTranslucentStatus">true</item>
- <item name="android:windowTranslucentNavigation">true</item>
- </style>
- <style name="NoSplashTheme" parent="SplashThemeBase">
- <item name="android:windowTranslucentStatus">true</item>
- <item name="android:windowTranslucentNavigation">true</item>
- </style>
-</resources>
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 @@
-<resources>
- <style name="SplashTheme" parent="NoSplashTheme">
- </style>
-</resources>
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 @@
-<resources>
- <style name="SplashTheme" parent="NoSplashTheme">
- </style>
-</resources>
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 @@
-<resources>
- <style name="SplashTheme" parent="NoSplashTheme">
- </style>
-</resources>
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 @@
-<resources>
- <style name="SplashTheme" parent="NoSplashTheme">
- </style>
-</resources>
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 @@
-<resources>
- <style name="SplashTheme" parent="NoSplashTheme">
- </style>
-</resources>
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 @@
<resources>
- <style name="AppThemeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
- <item name="android:editTextBackground">@android:color/transparent</item>
- <item name="android:forceDarkAllowed">false</item>
+ <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
</style>
- <style name="AppTheme" parent="AppThemeBase">
+ <style name="Theme.App.SplashScreen" parent="AppTheme">
+ <item name="android:windowSplashScreenBackground">#111727</item>
+ <item name="android:windowSplashScreenAnimatedIcon">@drawable/header</item>
</style>
- <style name="SplashThemeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowDrawsSystemBarBackgrounds">false</item>
- </style>
- <style name="NoSplashTheme" parent="SplashThemeBase">
- </style>
- <style name="SplashTheme" parent="NoSplashTheme">
- <item name="android:background">@drawable/splashscreen</item>
- </style>
-</resources>
+</resources>
\ 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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
- <viewController storyboardIdentifier="SplashScreenViewController" automaticallyAdjustsScrollViewInsets="NO" interfaceStyle="dark" id="01J-lp-oVM" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="SplashScreenViewController" automaticallyAdjustsScrollViewInsets="NO" id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nvi-kw-ZOr">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<subviews>
@@ -21,8 +21,8 @@
<color key="backgroundColor" red="1" green="0.0" blue="0.092869963400000005" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" red="1" green="0.0" blue="0.092869963400000005" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Header" translatesAutoresizingMaskIntoConstraints="NO" id="v97-50-knt">
- <rect key="frame" x="99" y="360" width="177" height="62"/>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Header" translatesAutoresizingMaskIntoConstraints="NO" id="v97-50-knt">
+ <rect key="frame" x="99" y="379" width="177" height="62"/>
<color key="tintColor" red="1" green="0.0" blue="0.092869963400000005" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
</subviews>

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 1:59 PM (14 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5844434
Default Alt Text
D14997.1765115991.diff (19 KB)

Event Timeline