From 21c7cf2498cb9f74bb10b96f359d25113257f1ef Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 17 Dec 2018 18:55:15 +0100
Subject: [PATCH] Add splash screen faking toolbar

---
 app/src/main/AndroidManifest.xml              |  7 ++++-
 .../riotredesign/features/MainActivity.kt     | 27 +++++++++++++++++++
 .../features/login/LoginActivity.kt           | 15 ++++++-----
 app/src/main/res/drawable/bg_splash.xml       | 16 +++++++++++
 app/src/main/res/values/themes.xml            |  4 +++
 app/src/main/res/values/themes_base.xml       |  1 +
 6 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/im/vector/riotredesign/features/MainActivity.kt
 create mode 100644 app/src/main/res/drawable/bg_splash.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a07bbbeb6c..05b64b0ee3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,14 +13,19 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Riot">
-        <activity android:name=".features.login.LoginActivity">
+
+        <activity
+            android:name=".features.MainActivity"
+            android:theme="@style/Theme.Riot.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity android:name=".features.home.HomeActivity" />
+        <activity android:name=".features.login.LoginActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/app/src/main/java/im/vector/riotredesign/features/MainActivity.kt
new file mode 100644
index 0000000000..d56ebe72c0
--- /dev/null
+++ b/app/src/main/java/im/vector/riotredesign/features/MainActivity.kt
@@ -0,0 +1,27 @@
+package im.vector.riotredesign.features
+
+import android.os.Bundle
+import im.vector.matrix.android.api.Matrix
+import im.vector.riotredesign.core.platform.RiotActivity
+import im.vector.riotredesign.features.home.HomeActivity
+import im.vector.riotredesign.features.login.LoginActivity
+import org.koin.android.ext.android.inject
+
+
+class MainActivity : RiotActivity() {
+
+    private val matrix by inject<Matrix>()
+    private val authenticator = matrix.authenticator()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val intent = if (authenticator.hasActiveSessions()) {
+            HomeActivity.newIntent(this)
+        } else {
+            LoginActivity.newIntent(this)
+        }
+        startActivity(intent)
+        finish()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt b/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
index e3acb888e0..e39faf73d4 100644
--- a/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
@@ -1,5 +1,7 @@
 package im.vector.riotredesign.features.login
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -21,7 +23,6 @@ class LoginActivity : RiotActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
-        checkActiveSessions()
         authenticateButton.setOnClickListener { authenticate() }
     }
 
@@ -49,11 +50,6 @@ class LoginActivity : RiotActivity() {
         })
     }
 
-    private fun checkActiveSessions() {
-        if (authenticator.hasActiveSessions()) {
-            goToHome()
-        }
-    }
 
     private fun goToHome() {
         val intent = HomeActivity.newIntent(this)
@@ -61,4 +57,11 @@ class LoginActivity : RiotActivity() {
         finish()
     }
 
+    companion object {
+        fun newIntent(context: Context): Intent {
+            return Intent(context, LoginActivity::class.java)
+        }
+
+    }
+
 }
diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml
new file mode 100644
index 0000000000..ede95098d3
--- /dev/null
+++ b/app/src/main/res/drawable/bg_splash.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item>
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+
+    <item android:gravity="top">
+        <shape android:shape="rectangle">
+            <size android:height="80dp" />
+            <solid android:color="?colorPrimary" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f9f41d5870..751344c717 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,5 +5,9 @@
 
     </style>
 
+    <style name="Theme.Riot.Splash">
+        <item name="android:windowBackground">@drawable/bg_splash</item>
+    </style>
+
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 4773884c1f..04ea854aaf 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -11,4 +11,5 @@
     <style name="Base.Theme.Riot" parent="Base.V1.Theme.Riot" />
 
 
+
 </resources>
\ No newline at end of file