diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java index f2dae7301a3422..ec4aa94fa3708f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java @@ -200,10 +200,8 @@ public void onChunkComplete( try { JSONObject progress = new JSONObject(body.readUtf8()); - String status = null; - if (progress.has("status")) { - status = progress.getString("status"); - } + String status = + progress.has("status") ? progress.getString("status") : "Bundling"; Integer done = null; if (progress.has("done")) { done = progress.getInt("done"); @@ -220,11 +218,9 @@ public void onChunkComplete( } @Override - public void onChunkProgress(Map headers, long loaded, long total) - throws IOException { + public void onChunkProgress(Map headers, long loaded, long total) { if ("application/javascript".equals(headers.get("Content-Type"))) { - callback.onProgress( - "Downloading JavaScript bundle", (int) (loaded / 1024), (int) (total / 1024)); + callback.onProgress("Downloading", (int) (loaded / 1024), (int) (total / 1024)); } } }); diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java index aec05670334acf..b718751f52971a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java @@ -37,8 +37,7 @@ public static void setDevLoadingEnabled(boolean enabled) { sEnabled = enabled; } - public DevLoadingViewController( - Context context, ReactInstanceManagerDevHelper reactInstanceManagerHelper) { + public DevLoadingViewController(ReactInstanceManagerDevHelper reactInstanceManagerHelper) { mReactInstanceManagerHelper = reactInstanceManagerHelper; } @@ -98,12 +97,7 @@ public void run() { message.append(status != null ? status : "Loading"); if (done != null && total != null && total > 0) { message.append( - String.format( - Locale.getDefault(), - " %.1f%% (%d/%d)", - (float) done / total * 100, - done, - total)); + String.format(Locale.getDefault(), " %.1f%%", (float) done / total * 100)); } message.append("\u2026"); // `...` character if (mDevLoadingView != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java index 0885f35ff94419..2e118ffa1ac93e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java @@ -217,8 +217,7 @@ public void onReceive(Context context, Intent intent) { setDevSupportEnabled(enableOnCreate); mRedBoxHandler = redBoxHandler; - mDevLoadingViewController = - new DevLoadingViewController(applicationContext, reactInstanceManagerHelper); + mDevLoadingViewController = new DevLoadingViewController(reactInstanceManagerHelper); mExceptionLoggers.add(new JSExceptionLogger()); diff --git a/ReactAndroid/src/main/res/devsupport/layout/dev_loading_view.xml b/ReactAndroid/src/main/res/devsupport/layout/dev_loading_view.xml index 9bf8bca6aabdaf..b7e6b8cc0df6d2 100644 --- a/ReactAndroid/src/main/res/devsupport/layout/dev_loading_view.xml +++ b/ReactAndroid/src/main/res/devsupport/layout/dev_loading_view.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#035900" + android:background="#404040" android:ellipsize="end" android:gravity="center" android:paddingTop="5dp"