From 97c85c7bba807e6f7553170862384d66131b762b Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Tue, 29 Jan 2019 16:23:33 -0600
Subject: [PATCH] Version name added +fix screen on reproductor

---
 app/src/main/AndroidManifest.xml                           | 4 +++-
 app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt | 2 ++
 app/src/main/java/org/libre/agosto/p2play/MainActivity.kt  | 5 ++++-
 app/src/main/res/layout/activity_reproductor.xml           | 4 ++--
 app/src/main/res/values-es/strings.xml                     | 1 -
 app/src/main/res/values/strings.xml                        | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 359a8dc..a8bca63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,9 @@
         <activity
             android:name=".MainActivity"
             android:theme="@style/P2playTheme.NoActionBar" />
-        <activity android:name=".ReproductorActivity" />
+        <activity
+            android:name=".ReproductorActivity"
+            android:configChanges="orientation|screenSize"/>
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".AboutActivity" />
diff --git a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
index 120432f..cdb81e2 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
@@ -12,5 +12,7 @@ class AboutActivity : AppCompatActivity() {
         setContentView(R.layout.activity_about)
 
         aboutUrl.text = "https://"+ManagerSingleton.url+"/about/instance"
+
+        aboutLabel.text = aboutLabel.text.toString() + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
     }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
index e236c93..016bdc5 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -40,6 +40,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
+        // Title for nav_bar
+        side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
+
         /* fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                     .setAction("Action", null).show()
@@ -275,7 +278,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
 
         side_usernameTxt?.text = getString(R.string.nav_header_title)
-        side_emailTxt?.text = getString(R.string.nav_header_subtitle)
+        side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
         side_imageView?.setImageResource(R.mipmap.ic_launcher_round)
         side_imageView?.setOnClickListener {  }
         _db.logout()
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 84974b6..1abc106 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -7,8 +7,8 @@
     tools:context=".ReproductorActivity">
 
     <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 848465d..11d0022 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -45,7 +45,6 @@
     <string name="view_text">vistas</string>
     <string name="time_text">segundos</string>
     <string name="nav_header_title">Inicia session</string>
-    <string name="nav_header_subtitle">P2Play (alfa)</string>
     <!-- Toast msg -->
     <string name="logout_msg">Te has desconectado</string>
     <!-- End Main strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47e541c..bef61a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
     <string name="view_text">views</string>
     <string name="time_text">seconds</string>
     <string name="nav_header_title">Log In</string>
-    <string name="nav_header_subtitle">P2Play</string>
+    <string name="nav_header_subtitle" translatable="false">P2Play</string>
     <!-- Toast msg -->
     <string name="logout_msg">You are disconnected</string>
     <!-- End Main strings -->