diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8deddd2c4..33fc14ec9 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -28,16 +28,25 @@ android:allowBackup="false" android:largeHeap="true" android:theme="@style/AppTheme"> + + + + + + + + + - - - - + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/android/app/src/main/java/app/esteem/SplashActivity.java b/android/app/src/main/java/app/esteem/SplashActivity.java new file mode 100644 index 000000000..79077f6ae --- /dev/null +++ b/android/app/src/main/java/app/esteem/SplashActivity.java @@ -0,0 +1,16 @@ +package app.esteem.mobile.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); + + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + finish(); + } +} \ No newline at end of file diff --git a/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java b/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java index c986d7a98..88316b583 100644 --- a/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java +++ b/android/app/src/main/java/app/esteem/mobile/android/MainActivity.java @@ -6,6 +6,8 @@ import com.facebook.react.ReactRootView; import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; import android.content.Intent; import android.content.res.Configuration; +import org.devio.rn.splashscreen.SplashScreen; +import android.os.Bundle; public class MainActivity extends ReactActivity { /** @@ -33,6 +35,11 @@ public class MainActivity extends ReactActivity { setIntent(intent); } + @Override + protected void onCreate(Bundle savedInstanceState) { + SplashScreen.show(this); + super.onCreate(savedInstanceState); + } //native side reference: https://github.com/facebook/react-native/issues/28823#issuecomment-642032481 @Override public void onConfigurationChanged(Configuration newConfig) { diff --git a/android/app/src/main/res/drawable/background_splash.xml b/android/app/src/main/res/drawable/background_splash.xml new file mode 100644 index 000000000..6b75ad17c --- /dev/null +++ b/android/app/src/main/res/drawable/background_splash.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml new file mode 100644 index 000000000..4fd71a15e --- /dev/null +++ b/android/app/src/main/res/layout/launch_screen.xml @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/splash_icon.png b/android/app/src/main/res/mipmap-hdpi/splash_icon.png new file mode 100644 index 000000000..42121ddd7 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/splash_icon.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/splash_icon.png b/android/app/src/main/res/mipmap-mdpi/splash_icon.png new file mode 100644 index 000000000..aebd222d8 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/splash_icon.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/splash_icon.png b/android/app/src/main/res/mipmap-xhdpi/splash_icon.png new file mode 100644 index 000000000..f1806ca5c Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/splash_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/splash_icon.png b/android/app/src/main/res/mipmap-xxhdpi/splash_icon.png new file mode 100644 index 000000000..d20d3ace1 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/splash_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/splash_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/splash_icon.png new file mode 100644 index 000000000..24402d58a Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/splash_icon.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 2ba7f8aaa..c0e91e516 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -3,4 +3,6 @@ #ffffff #ffffff #000000 + #ffffff + #ffffff \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 0ed280de7..8a82ba24d 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,6 +1,23 @@ + + - + + + + + \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7608fde70..203d3ade7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -839,4 +839,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0282022703ad578ab2d9afbf3147ba3b373b4311 -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2