From abec98d172ff9ec9cebd78177edfa6a0d061911d Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Mon, 28 Jan 2019 14:54:08 -0600
Subject: [PATCH] Splash screen + commentaries changes

---
 app/src/main/AndroidManifest.xml              | 11 ++-
 .../org/libre/agosto/p2play/HostActivity.kt   | 37 +-------
 .../org/libre/agosto/p2play/SplashActivity.kt | 95 +++++++++++++++++++
 .../main/res/layout/activity_reproductor.xml  | 22 +++--
 app/src/main/res/layout/activity_splash.xml   | 58 +++++++++++
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 182 insertions(+), 43 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
 create mode 100644 app/src/main/res/layout/activity_splash.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0fd316f..359a8dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,19 +7,22 @@
 
     <application
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_p2play"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_p2play"
         android:supportsRtl="true"
-        android:theme="@style/P2playTheme"
-        android:hardwareAccelerated="true">
-        <activity android:name=".HostActivity">
+        android:theme="@style/P2playTheme">
+        <activity
+            android:name=".SplashActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".HostActivity" />
         <activity
             android:name=".MainActivity"
             android:theme="@style/P2playTheme.NoActionBar" />
@@ -29,7 +32,7 @@
         <activity android:name=".AboutActivity" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"></activity>
+            android:label="@string/title_activity_settings" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
index ade6200..8c7ea2f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
@@ -29,48 +29,20 @@ class HostActivity : AppCompatActivity() {
             getKeys(hostText.text.toString())
         }
 
-        val host = settings.getString("hostP2play","")
-        val lastHost = settings.getString("last_host","")
+        val host = settings.getString("hostP2play", "")
+        val lastHost = settings.getString("last_host", "")
         if(host!=""){
             if(lastHost!=host){
                 _db.logout()
                 getKeys(host)
             }else{
                 ManagerSingleton.url=host
-                checkUser()
+                startApp()
             }
         }
     }
 
-    fun checkUser(){
-        val token = _db.getToken()
-        val user = _db.getUser()
-        AsyncTask.execute {
-            if (Looper.myLooper() == null)
-                Looper.prepare()
 
-            startApp()
-            if (token.status == 1 && user.status == 1) {
-                val client_id = settings.getString("client_id", "")
-                val client_secret = settings.getString("client_secret", "")
-
-                val newToken = client.refreshToken(token, client_id, client_secret)
-
-                when (token.status.toString()) {
-                    "1" -> {
-                        _db.newToken(newToken)
-                        ManagerSingleton.token = newToken
-                        ManagerSingleton.user = user
-                    }
-                    else -> _db.logout()
-                }
-            } else {
-                _db.logout()
-            }
-            
-            this.finish()
-        }
-    }
 
     fun saveHost(host: String){
         editor.putString("last_host",host)
@@ -78,7 +50,7 @@ class HostActivity : AppCompatActivity() {
         editor.apply()
         ManagerSingleton.Toast(getString(R.string.finallyMsg))
         ManagerSingleton.url=host
-        checkUser()
+        startApp()
     }
 
     private fun getKeys(hostText: String){
@@ -112,6 +84,7 @@ class HostActivity : AppCompatActivity() {
         runOnUiThread {
             val intent = Intent(ManagerSingleton.context,MainActivity::class.java)
             startActivity(intent)
+            this.finish()
         }
     }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
new file mode 100644
index 0000000..15ab068
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
@@ -0,0 +1,95 @@
+package org.libre.agosto.p2play
+
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.AsyncTask
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.preference.PreferenceManager
+import org.libre.agosto.p2play.ajax.Auth
+
+class SplashActivity : AppCompatActivity() {
+    lateinit var settings: SharedPreferences
+    lateinit var editor: SharedPreferences.Editor
+    val client: Auth = Auth()
+    val _db = Database(this)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash)
+
+        settings = PreferenceManager.getDefaultSharedPreferences(this)
+
+        editor = settings.edit()
+        ManagerSingleton.context = this
+
+        val host = settings.getString("hostP2play","")
+        val lastHost = settings.getString("last_host","")
+        if(host!=""){
+            if(lastHost!=host){
+                _db.logout()
+                Handler().postDelayed({
+                    startHostActivity()
+                }, 2000)
+            }else{
+                ManagerSingleton.url=host
+                checkUser()
+            }
+        }
+
+        Handler().postDelayed({
+            startHostActivity()
+        }, 2000)
+    }
+
+    private fun checkUser(){
+        val token = _db.getToken()
+        val user = _db.getUser()
+        AsyncTask.execute {
+            if (Looper.myLooper() == null)
+                Looper.prepare()
+
+
+            if (token.status == 1 && user.status == 1) {
+                val client_id = settings.getString("client_id", "")
+                val client_secret = settings.getString("client_secret", "")
+
+                val newToken = client.refreshToken(token, client_id, client_secret)
+
+                when (token.status.toString()) {
+                    "1" -> {
+                        _db.newToken(newToken)
+                        ManagerSingleton.token = newToken
+                        ManagerSingleton.user = user
+                    }
+                    else -> _db.logout()
+                }
+            } else {
+                _db.logout()
+            }
+
+            Handler().postDelayed({
+                startApp()
+            }, 2000)
+
+        }
+    }
+
+    private fun startApp() {
+        runOnUiThread {
+            val intent = Intent(ManagerSingleton.context, MainActivity::class.java)
+            startActivity(intent)
+            this.finish()
+        }
+    }
+
+    private fun startHostActivity() {
+        runOnUiThread {
+            val intent = Intent(ManagerSingleton.context, HostActivity::class.java)
+            startActivity(intent)
+            this.finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 18af040..e2dbbff 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -160,22 +160,22 @@
                 android:id="@+id/descriptionTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLength="1000"
+                android:maxLines="100"
                 android:paddingLeft="5dp"
                 android:text="@string/descriptionTxt" />
 
             <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="80dp">
+                android:layout_height="80dp"
+                android:scrollbarStyle="insideInset">
 
                 <TextView
                     android:id="@+id/descriptionVideoTxt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="none|textLongMessage"
                     android:maxLength="1000"
-                    android:maxLines="10"
-                    android:text="-"
-                    android:textStyle="italic" />
+                    android:maxLines="100" />
             </ScrollView>
 
             <View
@@ -184,6 +184,10 @@
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider" />
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
             <TextView
                 android:id="@+id/commentariesTxt"
                 android:layout_width="match_parent"
@@ -191,12 +195,16 @@
                 android:paddingLeft="5dp"
                 android:text="@string/commentariesTxt" />
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="20dp" />
+
             <LinearLayout
                 android:id="@+id/commentaryLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="visible">
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 0000000..b6af49d
--- /dev/null
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SplashActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="32dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/imageView2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/app_name"
+                app:srcCompat="@drawable/icon" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
+            <TextView
+                android:id="@+id/hostInfoText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/charging"
+                android:textAlignment="center"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
+                android:textColor="@android:color/black" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:backgroundTint="?attr/colorAccent"
+                android:indeterminate="true" />
+
+        </LinearLayout>
+    </FrameLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a0089c9..976888b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Start Global strings -->
     <string name="comming">Proximamente</string>
+    <string name="charging">Cargando...</string>
     <!-- End Global strings -->
 
     <!-- Start About strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 146758e..99c09a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
     <string name="nav_header_desc" translatable="false">Navigation header</string>
     <string name="comming">Coming soon!</string>
+    <string name="charging">Loading...</string>
     <!-- End Global string -->