Merge branch 'master' into master

Author: crazycodeboy

README.md

@@ -25,8 +25,8 @@ For React Native >= 0.47.0 use [v3.+](https://github.com/crazycodeboy/react-nati
 ## Examples  
 * [Examples](https://github.com/crazycodeboy/react-native-splash-screen/tree/master/examples)
 
-![react-native-splash-screen-Android](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/master/examples/Screenshots/react-native-splash-screen-Android.gif)
-![react-native-splash-screen-iOS](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/master/examples/Screenshots/react-native-splash-screen-iOS.gif)
+![react-native-splash-screen-Android](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/v3.0.0/examples/Screenshots/react-native-splash-screen-Android.gif)
+![react-native-splash-screen-iOS](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/v3.0.0/examples/Screenshots/react-native-splash-screen-iOS.gif)
 
 
 
@@ -45,7 +45,7 @@ Run `npm i react-native-splash-screen --save`
 
 **Android:**
 
-1. In your android/settings.gradle file, make the following additions:
+1. In your `android/settings.gradle` file, make the following additions:
 ```java
 include ':react-native-splash-screen'   
 project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
@@ -134,9 +134,10 @@ Update `AppDelegate.m` with the following additions:
 
 
 ```obj-c
-
 #import "AppDelegate.h"
-#import "RCTRootView.h"
+
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTRootView.h>
 #import "SplashScreen.h"  // here
 
 @implementation AppDelegate
@@ -181,7 +182,7 @@ You can create splash screens in the following folders:
 * `drawable-xxhdpi`
 * `drawable-xxxhdpi`
 
-To modify the status bar color, you can add a color called primary_dark in color.xml
+Add a color called `primary_dark` in `app/src/main/res/values/color.xml`
 
 ```
 <?xml version="1.0" encoding="utf-8"?>
@@ -233,12 +234,12 @@ Create a style definition for this in `android/app/src/main/res/values/colors.xm
 
 Change your `show` method to include your custom style:
 ```java
-SplashScreen.show(this, false, R.style.SplashScreenTheme);
+SplashScreen.show(this, R.style.SplashScreenTheme);
 ```
 
 ### iOS    
 
-Customize your splash screen via LaunchImage or LaunchScreen.xib,
+Customize your splash screen via `LaunchImage` or `LaunchScreen.xib`,
 
 **Learn more to see [examples](https://github.com/crazycodeboy/react-native-splash-screen/tree/master/examples)**
 
@@ -275,4 +276,4 @@ Pull requests are welcome. If you want to change the API or do something big it
 
 ---
 
-**MIT Licensed**
+**[MIT Licensed](https://github.com/crazycodeboy/react-native-splash-screen/blob/master/LICENSE)**

README.zh.md

@@ -23,8 +23,8 @@ React Native启动屏，解决iOS，Android启动白屏问题，支持Android和
 ## 演示  
 * [Examples](https://github.com/crazycodeboy/react-native-splash-screen/tree/master/examples)
 
-![react-native-splash-screen-Android](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/master/examples/Screenshots/react-native-splash-screen-Android.gif)
-![react-native-splash-screen-iOS](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/master/examples/Screenshots/react-native-splash-screen-iOS.gif)
+![react-native-splash-screen-Android](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/v3.0.0/examples/Screenshots/react-native-splash-screen-Android.gif)
+![react-native-splash-screen-iOS](https://raw.githubusercontent.com/crazycodeboy/react-native-splash-screen/v3.0.0/examples/Screenshots/react-native-splash-screen-iOS.gif)
 
 
 ## 改变
@@ -134,10 +134,11 @@ public class MainActivity extends ReactActivity {
 
 
 ```obj-c
-
 #import "AppDelegate.h"
-#import "RCTRootView.h"
-#import "SplashScreen.h"  // here
+
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTRootView.h>
+#import "SplashScreen.h"  // 添加这一句
 
 @implementation AppDelegate
 

android/src/main/AndroidManifest.xml

@@ -2,9 +2,7 @@
     package="org.devio.rn.splashscreen">
 
     <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true">
+        android:label="@string/app_name">
 
     </application>
 

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

@@ -14,27 +14,20 @@
  * 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, final int themeResId) {
+    public static void show(final Activity activity, 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,
-                            themeResId != NULL_ID ? themeResId
-                                    : fullScreen ? R.style.SplashScreen_Fullscreen
-                                    : R.style.SplashScreen_SplashTheme
-                    );
+                    mSplashDialog = new Dialog(activity, themeResId);
                     mSplashDialog.setContentView(R.layout.launch_screen);
                     mSplashDialog.setCancelable(false);
 
@@ -50,7 +43,9 @@ public void run() {
      * 打开启动屏
      */
     public static void show(final Activity activity, final boolean fullScreen) {
-        show(activity, fullScreen, 0);
+        int resourceId = fullScreen ? R.style.SplashScreen_Fullscreen : R.style.SplashScreen_SplashTheme;
+
+        show(activity, resourceId);
     }
 
     /**

examples/android/app/src/main/res/layout/launch_screen.xml

@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/launch_screen">
 
-</LinearLayout>
+ <RelativeLayout 
+  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@android:color/black">
+
+    <LinearLayout
+        android:layout_width="350dip"
+        android:layout_height="450dip"
+        android:layout_centerInParent="true"
+        android:background="@drawable/launch_screen"
+        android:orientation="vertical"
+        android:padding="30dip"
+        >
+    </LinearLayout>
+ </RelativeLayout>

index.d.ts

@@ -1,5 +1,6 @@
 declare module "react-native-splash-screen" {
     export default class SplashScreen {
         static hide(): void;
+        static show(): void;
     }
 }