From c5ffdbfe0a55a774943baf228412fb74949ede48 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Thu, 19 Jul 2018 21:19:18 -0300
Subject: [PATCH] Android - add a faster to load splash screen (LaunchScreen in
 Android terminology) and a progress indicator in our loading screen
 (SplashActivity), to reduce the 'frozen' nature of the app startup

---
 android/app/src/main/AndroidManifest.xml              |  3 ++-
 .../highfidelity/hifiinterface/PermissionChecker.java | 10 ++++++++++
 android/app/src/main/res/drawable/launch_screen.xml   | 11 +++++++++++
 android/app/src/main/res/layout/activity_splash.xml   |  8 ++++++++
 android/app/src/main/res/values/colors.xml            |  1 +
 android/app/src/main/res/values/styles.xml            |  6 ++++++
 6 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 android/app/src/main/res/drawable/launch_screen.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index aa70d88c52..7255e1f295 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
         android:icon="@drawable/ic_launcher"
         android:launchMode="singleTop"
         android:roundIcon="@drawable/ic_launcher">
-        <activity android:name="io.highfidelity.hifiinterface.PermissionChecker">
+        <activity android:name="io.highfidelity.hifiinterface.PermissionChecker"
+            android:theme="@style/Theme.AppCompat.Translucent.NoActionBar.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java b/android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java
index 10cfd85b50..78a6421746 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -135,4 +136,13 @@ public class PermissionChecker extends Activity {
             launchActivityWithPermissions();
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        View decorView = getWindow().getDecorView();
+        // Hide the status bar.
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+        decorView.setSystemUiVisibility(uiOptions);
+    }
 }
diff --git a/android/app/src/main/res/drawable/launch_screen.xml b/android/app/src/main/res/drawable/launch_screen.xml
new file mode 100644
index 0000000000..0693094ffa
--- /dev/null
+++ b/android/app/src/main/res/drawable/launch_screen.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:drawable="@android:color/black"/>
+    <item android:drawable="@drawable/hifi_logo_splash"
+        android:gravity="center_horizontal"
+        android:top="225dp"
+        android:height="242dp"
+        android:width="242dp">
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_splash.xml b/android/app/src/main/res/layout/activity_splash.xml
index ed25797917..8bb7cbffb6 100644
--- a/android/app/src/main/res/layout/activity_splash.xml
+++ b/android/app/src/main/res/layout/activity_splash.xml
@@ -7,9 +7,17 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 <ImageView
+    android:id="@+id/hifi_logo"
     android:layout_width="242dp"
     android:layout_height="242dp"
     android:src="@drawable/hifi_logo_splash"
     android:layout_centerHorizontal="true"
     android:layout_marginTop="225dp"/>
+    <ProgressBar
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:theme="@style/HifiCircularProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/hifi_logo"
+        android:layout_centerHorizontal="true"/>
 </RelativeLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 15895e4355..7e6cf52d36 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -17,4 +17,5 @@
     <color name="colorLoginError">#FF7171</color>
     <color name="black_060">#99000000</color>
     <color name="statusbar_color">#292929</color>
+    <color name="hifiLogoColor">#23B2E7</color>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 308c438fa6..25823214cd 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -19,6 +19,9 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
+    <style name="Theme.AppCompat.Translucent.NoActionBar.Launcher" parent="Theme.AppCompat.Translucent.NoActionBar">
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+    </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
@@ -62,4 +65,7 @@
         <item name="android:background">@color/white_opaque</item>
     </style>
 
+    <style name="HifiCircularProgress" parent="Theme.AppCompat.Light">
+        <item name="colorAccent">@color/hifiLogoColor</item>
+    </style>
 </resources>