Merge pull request #125 from christophermark/custom-android-theming

Optional theming to Android splash screen

Author: crazycodeboy

README.md

@@ -99,7 +99,7 @@ public class MainApplication extends Application implements ReactApplication {
 2. Go to `node_modules` ➜ `react-native-splash-screen` and add `SplashScreen.xcodeproj`
 3. In XCode, in the project navigator, select your project. Add `libSplashScreen.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
 4. To fix `'SplashScreen.h' file not found`, you have to select your project → Build Settings → Search Paths → Header Search Paths to add:
-   
+
    `$(SRCROOT)/../node_modules/react-native-splash-screen/ios`
 
 
@@ -203,14 +203,29 @@ Open `android/app/src/main/res/values/styles.xml` and add `<item name="android:w
 
 If you want to customize the color of the status bar when the splash screen is displayed:
 
-Create `android/app/src/main/res/values/colors.xml` and add 
+Create `android/app/src/main/res/values/colors.xml` and add
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary_dark"><!-- Colour of your status bar here --></color>
+    <color name="status_bar_color"><!-- Colour of your status bar here --></color>
 </resources>
 ```
 
+Create a style definition for this in `android/app/src/main/res/values/colors.xml`:
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="SplashScreenTheme" parent="SplashScreen_SplashTheme">
+        <item name="colorPrimaryDark">@color/status_bar_color</item>
+    </style>
+</resources>
+```
+
+Change your `show` method to include your custom style:
+```java
+SplashScreen.show(this, false, R.style.SplashScreenTheme);
+```
+
 ### iOS    
 
 Customize your splash screen via LaunchImage or LaunchScreen.xib,

android/src/main/java/org/devio/rn/splashscreen/SplashScreen.java

@@ -14,21 +14,27 @@
  * Email:crazycodeboy@gmail.com
  */
 public class SplashScreen {
+    private static int NULL_ID = 0;
     private static Dialog mSplashDialog;
     private static WeakReference<Activity> mActivity;
 
     /**
      * 打开启动屏
      */
-    public static void show(final Activity activity, final boolean fullScreen) {
+    public static void show(final Activity activity, final boolean fullScreen, final int themeResId) {
         if (activity == null) return;
         mActivity = new WeakReference<Activity>(activity);
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 if (!activity.isFinishing()) {
 
-                    mSplashDialog = new Dialog(activity, fullScreen ? R.style.SplashScreen_Fullscreen : R.style.SplashScreen_SplashTheme);
+                    mSplashDialog = new Dialog(
+                            activity,
+                            themeResId != NULL_ID ? themeResId
+                                    : fullScreen ? R.style.SplashScreen_Fullscreen
+                                    : R.style.SplashScreen_SplashTheme
+                    );
                     mSplashDialog.setContentView(R.layout.launch_screen);
                     mSplashDialog.setCancelable(false);
 
@@ -40,6 +46,13 @@ public void run() {
         });
     }
 
+    /**
+     * 打开启动屏
+     */
+    public static void show(final Activity activity, final boolean fullScreen) {
+        show(activity, fullScreen, 0);
+    }
+
     /**
      * 打开启动屏
      */

android/src/main/res/values/refs.xml

@@ -3,7 +3,4 @@
     <item type="layout" name="launch_screen">
         @layout/launch_screen
     </item>
-    <item type="color" name="primary_dark">
-        @color/primary_dark
-    </item>
 </resources>

android/src/main/res/values/styles.xml

@@ -5,7 +5,6 @@
 
     <style name="SplashScreen_SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowAnimationStyle">@style/SplashScreen_SplashAnimation</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
     </style>
     <style name="SplashScreen_Fullscreen" parent="SplashScreen_SplashTheme">
         <item name="android:windowFullscreen">true</item>