Skip to content

Commit 8e1b1ae

Browse files
briansztamfaterbriansztamfater
committed
feat: implement new splash screen static version
1 parent 4dfd3af commit 8e1b1ae

File tree

19 files changed

+82
-16
lines changed

19 files changed

+82
-16
lines changed

‎android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ dependencies {
310310
implementation "com.facebook.react:react-native:+" // From node_modules
311311

312312
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
313+
implementation "androidx.core:core-splashscreen:1.0.0"
313314

314315
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
315316
exclude group:'com.facebook.fbjni'

‎android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
android:allowBackup="false"
3030
android:label="@string/app_name"
3131
android:icon="@mipmap/ic_launcher"
32-
android:theme="@style/AppTheme"
32+
android:theme="@style/Theme.AppSplash"
3333
android:name=".MainApplication"
3434
android:largeHeap="true"
3535
android:usesCleartextTraffic="true">
@@ -38,6 +38,7 @@
3838
android:name=".MainActivity"
3939
android:exported="true"
4040
android:label="@string/app_name"
41+
android:theme="@style/Theme.AppSplash"
4142
android:screenOrientation="portrait"
4243
android:windowSoftInputMode="adjustResize"
4344
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"

‎android/app/src/main/java/im/status/ethereum/MainActivity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.facebook.react.ReactFragmentActivity;
3232
import com.reactnativenavigation.NavigationActivity;
3333
import com.facebook.react.modules.core.PermissionListener;
34-
import org.devio.rn.splashscreen.SplashScreen;
34+
import androidx.core.splashscreen.SplashScreen;
3535

3636
import java.util.Properties;
3737
import im.status.ethereum.module.StatusThreadPoolExecutor;
@@ -121,21 +121,18 @@ public void onNewIntent(final Intent intent) {
121121

122122
@Override
123123
protected void onCreate(Bundle savedInstanceState) {
124+
SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
124125

125126
switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
126127
case Configuration.UI_MODE_NIGHT_YES:
127128
setTheme(R.style.DarkTheme);
128-
SplashScreen.show(this, R.style.DarkTheme, R.id.lottie);
129129
break;
130130
case Configuration.UI_MODE_NIGHT_NO:
131131
setTheme(R.style.LightTheme);
132-
SplashScreen.show(this, R.style.LightTheme, R.id.lottie);
133132
break;
134133
default:
135134
setTheme(R.style.LightTheme);
136-
SplashScreen.show(this, R.style.LightTheme, R.id.lottie);
137135
}
138-
SplashScreen.setAnimationFinished(true);
139136
// Make sure we get an Alert for every uncaught exceptions
140137
registerUncaughtExceptionHandler(MainActivity.this);
141138

‎android/app/src/main/res/drawable-hdpi/splash_logo.png

4.09 KB
Loading

‎android/app/src/main/res/drawable-mdpi/splash_logo.png

2.43 KB
Loading

‎android/app/src/main/res/drawable-xhdpi/splash_logo.png

5.25 KB
Loading

‎android/app/src/main/res/drawable-xxhdpi/splash_logo.png

10 KB
Loading

‎android/app/src/main/res/drawable-xxxhdpi/splash_logo.png

4.16 KB
Loading

‎android/app/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<resources>
33
<color name="alert_background">#ffffff</color>
44
<color name="alert_text">#000000</color>
5+
<color name="splash_background">#09101C</color>
6+
<color name="splash_status_bar_color">#ffffff</color>
57
</resources>

‎android/app/src/main/res/values/splash_theme.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<resources xmlns:tools="http://schemas.android.com/tools">
2+
<style name="Theme.AppSplash" parent="Theme.SplashScreen">
3+
<item name="windowSplashScreenBackground">@color/splash_background</item>
4+
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_logo</item>
5+
<item name="windowSplashScreenAnimationDuration">1000</item>
6+
7+
<!-- Status bar and Nav bar configs -->
8+
<item name="android:statusBarColor" tools:targetApi="l">@color/splash_status_bar_color</item>
9+
<item name="android:windowLightStatusBar">false</item>
10+
11+
<item name="postSplashScreenTheme">@style/DarkTheme</item>
12+
</style>
13+
</resources>

‎ios/StatusIm/Images.xcassets/launch_image.imageset/launch_image.png

-1.27 KB
Loading

‎ios/StatusIm/Images.xcassets/launch_image.imageset/[email protected]

-2.25 KB
Loading

‎ios/StatusIm/Images.xcassets/launch_image.imageset/[email protected]

-3.58 KB
Loading

‎ios/StatusIm/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
<array>
120120
<string>armv7</string>
121121
</array>
122+
<key>UIStatusBarStyle</key>
123+
<string>UIStatusBarStyleLightContent</string>
122124
<key>UISupportedInterfaceOrientations</key>
123125
<array>
124126
<string>UIInterfaceOrientationPortrait</string>

‎ios/StatusImPR/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
<string>armv7</string>
124124
<string>gamekit</string>
125125
</array>
126+
<key>UIStatusBarStyle</key>
127+
<string>UIStatusBarStyleLightContent</string>
126128
<key>UISupportedInterfaceOrientations</key>
127129
<array>
128130
<string>UIInterfaceOrientationPortrait</string>

‎ios/launch-image-universal.storyboard

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -20,7 +20,7 @@
2020
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch_image" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
2121
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2222
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
23+
<color key="backgroundColor" red="0.035294117647058823" green="0.062745098039215685" blue="0.10980392156862745" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2424
</imageView>
2525
</subviews>
2626
<viewLayoutGuide key="safeArea" id="2aN-f8-qiu"/>
@@ -33,7 +33,7 @@
3333
</scene>
3434
</scenes>
3535
<resources>
36-
<image name="launch_image" width="90" height="101"/>
36+
<image name="launch_image" width="84" height="88"/>
3737
<systemColor name="systemBackgroundColor">
3838
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3939
</systemColor>

‎nix/deps/gradle/deps.json

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,20 @@
447447
}
448448
},
449449

450+
{
451+
"path": "androidx/core/core-splashscreen/1.0.0/core-splashscreen-1.0.0",
452+
"host": "https://dl.google.com/dl/android/maven2",
453+
"type": "aar",
454+
"pom": {
455+
"sha1": "763acf4fa60a08a3c059a4c50d3d54ac34a0cfa2",
456+
"sha256": "0arxyx9zlzwlr0h88xmgzlgbjfp3s79pd7mbk3ipfqwkfgbzzmq3"
457+
},
458+
"jar": {
459+
"sha1": "6b1eccca966811faafb13f6c2f88351504dc9eae",
460+
"sha256": "0wiarwyh5rk7ca54b0i47rs7ix49r2krrvhiqamw8gyaq4yv51iy"
461+
}
462+
},
463+
450464
{
451465
"path": "androidx/core/core/1.0.0/core-1.0.0",
452466
"host": "https://dl.google.com/dl/android/maven2",
@@ -8544,16 +8558,16 @@
85448558
},
85458559

85468560
{
8547-
"path": "org/checkerframework/checker-qual/3.31.0/checker-qual-3.31.0",
8561+
"path": "org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0",
85488562
"host": "https://repo.maven.apache.org/maven2",
85498563
"type": "jar",
85508564
"pom": {
8551-
"sha1": "a600a4210e8c3db6ea45ea0989920b0255dbb6f6",
8552-
"sha256": "0cajb4ivvw446lc3bcwl49difmpgg1rrcbzklxc87rs7pqz9qms3"
8565+
"sha1": "69d7d01436d892d55b202ccec8a7066f0ac41f98",
8566+
"sha256": "1kvxly5fpws3prsar57rmjqq6hcy2a0b5fpx60fgmpkf59jqhnkr"
85538567
},
85548568
"jar": {
8555-
"sha1": "eeefd4af42e2f4221d145c1791582f91868f99ab",
8556-
"sha256": "1fai6kk72j76ivgipgl7ckbcn8g8yl289pbx712zpii2dm3mzvqw"
8569+
"sha1": "54ebd61f46b58b862c779e034073a93489ab3faf",
8570+
"sha256": "1k9wsy7wvh5304aaqb51hlgpfciahg5avzgmnzq8bgx6l1fh4vmn"
85578571
}
85588572
},
85598573

@@ -9833,6 +9847,20 @@
98339847
}
98349848
},
98359849

9850+
{
9851+
"path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21",
9852+
"host": "https://repo.maven.apache.org/maven2",
9853+
"type": "jar",
9854+
"pom": {
9855+
"sha1": "747a8ea8a8a4328946cf0252c5ceb2aa0ceb054f",
9856+
"sha256": "18kbabqzyiv5rzcvxzn28wsk6cxnh7aliiayian2sg7xfgp5dhav"
9857+
},
9858+
"jar": {
9859+
"sha1": "5e5b55c26dbc80372a920aef60eb774b714559b8",
9860+
"sha256": "0qr34h6pkf6bw6vagc06y78ln6gikj3qq3hrgfai8flzrmcyqfqq"
9861+
}
9862+
},
9863+
98369864
{
98379865
"path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10",
98389866
"host": "https://repo.maven.apache.org/maven2",
@@ -10253,6 +10281,20 @@
1025310281
}
1025410282
},
1025510283

10284+
{
10285+
"path": "org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21",
10286+
"host": "https://repo.maven.apache.org/maven2",
10287+
"type": "jar",
10288+
"pom": {
10289+
"sha1": "f44be76009ce4253eaa59b914f4dccc384442016",
10290+
"sha256": "0d0zmvx7znha69ir50z72n7nzgw4yr6rfzb6mb6kdn0vl1dp4hnf"
10291+
},
10292+
"jar": {
10293+
"sha1": "11ef67f1900634fd951bad28c53ec957fabbe5b8",
10294+
"sha256": "14m428q4m7y8srb7z5m0qfq8ic3f62layqwgn9rpacxvf9k5573k"
10295+
}
10296+
},
10297+
1025610298
{
1025710299
"path": "org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10",
1025810300
"host": "https://repo.maven.apache.org/maven2",

‎nix/deps/gradle/deps.list

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ androidx.constraintlayout:constraintlayout:2.0.4
2525
androidx.coordinatorlayout:coordinatorlayout:1.0.0
2626
androidx.coordinatorlayout:coordinatorlayout:1.1.0
2727
androidx.core:core-ktx:1.6.0
28+
androidx.core:core-splashscreen:1.0.0
2829
androidx.core:core:1.0.1
2930
androidx.core:core:1.1.0
3031
androidx.core:core:1.6.0
@@ -517,6 +518,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
517518
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31
518519
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10
519520
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30
521+
org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
520522
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
521523
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
522524
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
@@ -536,6 +538,7 @@ org.jetbrains.kotlin:kotlin-stdlib:1.3.50
536538
org.jetbrains.kotlin:kotlin-stdlib:1.4.31
537539
org.jetbrains.kotlin:kotlin-stdlib:1.5.10
538540
org.jetbrains.kotlin:kotlin-stdlib:1.5.30
541+
org.jetbrains.kotlin:kotlin-stdlib:1.6.21
539542
org.jetbrains.kotlin:kotlin-util-io:1.3.50
540543
org.jetbrains.kotlin:kotlin-util-io:1.4.31
541544
org.jetbrains.kotlin:kotlin-util-klib:1.4.31

‎nix/deps/gradle/deps.urls

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayo
3030
https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0.pom
3131
https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0.pom
3232
https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.6.0.pom
33+
https://dl.google.com/dl/android/maven2/androidx/core/core-splashscreen/1.0.0/core-splashscreen-1.0.0.pom
3334
https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
3435
https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1.pom
3536
https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0.pom
@@ -636,7 +637,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov
636637
https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
637638
https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.70/bcprov-jdk15on-1.70.pom
638639
https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
639-
https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.31.0/checker-qual-3.31.0.pom
640+
https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0.pom
640641
https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
641642
https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
642643
https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -733,6 +734,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
733734
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10.pom
734735
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.30/kotlin-stdlib-common-1.5.30.pom
735736
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
737+
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
736738
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
737739
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.pom
738740
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
@@ -763,6 +765,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.31/k
763765
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10.pom
764766
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.30/kotlin-stdlib-1.5.30.pom
765767
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom
768+
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
766769
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
767770
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.pom
768771
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom

0 commit comments

Comments
 (0)