From 65e061fd25e188ab7c6fb850623f4cc0c3fff065 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Wed, 20 Mar 2024 21:04:16 -0600
Subject: [PATCH 01/13] First changes to androidx

---
 app/build.gradle                              | 12 +--
 .../org/libre/agosto/p2play/AboutActivity.kt  |  4 +-
 .../p2play/AppCompatPreferenceActivity.kt     |  8 +-
 .../libre/agosto/p2play/ChannelActivity.kt    |  6 +-
 .../org/libre/agosto/p2play/HostActivity.kt   |  4 +-
 .../org/libre/agosto/p2play/LoginActivity.kt  |  3 +-
 .../org/libre/agosto/p2play/MainActivity.kt   | 43 ++++++-----
 .../libre/agosto/p2play/RegisterActivity.kt   |  2 +-
 .../agosto/p2play/ReproductorActivity.kt      | 11 ++-
 .../org/libre/agosto/p2play/SplashActivity.kt |  2 +-
 .../p2play/adapters/CommentariesAdapter.kt    | 11 +--
 .../agosto/p2play/adapters/VideosAdapter.kt   | 12 +--
 app/src/main/res/layout/activity_about.xml    |  8 +-
 app/src/main/res/layout/activity_channel.xml  |  4 +-
 app/src/main/res/layout/activity_host.xml     | 17 ++---
 app/src/main/res/layout/activity_login.xml    |  4 +-
 app/src/main/res/layout/activity_main.xml     |  6 +-
 app/src/main/res/layout/activity_splash.xml   |  4 +-
 app/src/main/res/layout/app_bar_main.xml      | 10 +--
 app/src/main/res/layout/content_main.xml      | 10 +--
 app/src/main/res/layout/view_video.xml        |  6 +-
 app/src/main/res/menu/main.xml                |  3 +-
 app/src/main/res/values/colors.xml            | 75 +++++++++++++++++++
 gradle.properties                             |  3 +
 24 files changed, 164 insertions(+), 104 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 089f7b7..cfda8bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,12 +36,12 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
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 cdb81e2..5bae4df 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
@@ -1,8 +1,8 @@
 package org.libre.agosto.p2play
 
-import android.support.v7.app.AppCompatActivity
+
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
+import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_about.*
 
 class AboutActivity : AppCompatActivity() {
diff --git a/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt b/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
index 39b3f04..73cb581 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
@@ -1,15 +1,15 @@
 package org.libre.agosto.p2play
 
+import androidx.appcompat.app.ActionBar
 import android.content.res.Configuration
 import android.os.Bundle
 import android.preference.PreferenceActivity
-import android.support.annotation.LayoutRes
-import android.support.v7.app.ActionBar
-import android.support.v7.app.AppCompatDelegate
-import android.support.v7.widget.Toolbar
 import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.widget.Toolbar
 
 /**
  * A [android.preference.PreferenceActivity] which implements and proxies the necessary calls
diff --git a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
index 34fb5dd..5ea9c8a 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
@@ -1,10 +1,10 @@
 package org.libre.agosto.p2play
 
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_channel.*
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 ea5d62a..f9f7e53 100644
--- a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
@@ -3,14 +3,12 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
-import android.util.Log
 import kotlinx.android.synthetic.main.activity_host.*
 import org.libre.agosto.p2play.ajax.Auth
-import org.libre.agosto.p2play.ajax.Client
 
 class HostActivity : AppCompatActivity() {
     lateinit var settings: SharedPreferences
diff --git a/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt b/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
index 656a7a0..68d33d1 100644
--- a/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
@@ -3,11 +3,10 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
-import android.util.Log
 import kotlinx.android.synthetic.main.activity_login.*
 import org.libre.agosto.p2play.ajax.Auth
 
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 c350fba..038ccd4 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -4,22 +4,21 @@ import android.content.Intent
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
-import android.support.design.widget.Snackbar
-import android.support.design.widget.NavigationView
-import android.support.v4.view.GravityCompat
-import android.support.v7.app.ActionBarDrawerToggle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
-import android.widget.ImageView
-import android.widget.SearchView
+
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.GravityCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.navigation.NavigationView
 import com.squareup.picasso.Picasso
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar_main.*
-import kotlinx.android.synthetic.main.content_main.*
+import kotlinx.android.synthetic.main.activity_main.drawer_layout
+import kotlinx.android.synthetic.main.activity_main.nav_view
+import kotlinx.android.synthetic.main.app_bar_main.toolbar
+import kotlinx.android.synthetic.main.content_main.swipeContainer
 import kotlinx.android.synthetic.main.nav_header_main.*
 import org.libre.agosto.p2play.adapters.VideosAdapter
 import org.libre.agosto.p2play.ajax.Videos
@@ -101,7 +100,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 }
             })
         }
-        // swipeContainer.isRefreshing = false
+        swipeContainer.isRefreshing = false
     }
 
     private fun addVideos(videos: ArrayList<VideoModel>){
@@ -251,10 +250,10 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
     override fun onBackPressed() {
         if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
-            drawer_layout.closeDrawer(GravityCompat.START)
+          drawer_layout.closeDrawer(GravityCompat.START)
         }
         else if(!section.equals("trending")) {
-            this.getTrengindVideos()
+           this.getTrengindVideos()
         }
         else {
             super.onBackPressed()
@@ -363,11 +362,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             if(ManagerSingleton.user.avatar!="" && side_imageView != null) {
                 Picasso.get().load("https://" + ManagerSingleton.url + ManagerSingleton.user.avatar).into(side_imageView)
             }
-//            side_imageView?.setOnClickListener {
-//                pagination = 0
-//                getMyVideos()
-//                drawer_layout.closeDrawer(GravityCompat.START)
-//            }
+           side_imageView?.setOnClickListener {
+               pagination = 0
+                getMyVideos()
+            drawer_layout.closeDrawer(GravityCompat.START)
+           }
             if(::myMenu.isInitialized){
                 myMenu.findItem(R.id.action_login).isVisible = false
                 myMenu.findItem(R.id.action_logout).isVisible = true
@@ -381,7 +380,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             myMenu.findItem(R.id.action_login).isVisible = true
             myMenu.findItem(R.id.action_logout).isVisible = false
         }
-        nav_view.menu.findItem(R.id.ml).isVisible = false
+        //nav_view.menu.findItem(R.id.ml).isVisible = false
         side_usernameTxt?.text = getString(R.string.nav_header_title)
         side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
         side_imageView?.setImageResource(R.drawable.default_avatar)
diff --git a/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt b/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
index 544b50c..a6609ff 100644
--- a/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
@@ -2,7 +2,7 @@ package org.libre.agosto.p2play
 
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 1f685a9..644118b 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -8,19 +8,18 @@ import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.util.Log
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.view.WindowManager
 import android.webkit.WebChromeClient
 import android.widget.EditText
 import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
diff --git a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
index 64bbe31..4a2150e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
@@ -3,7 +3,7 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
index d7545e5..be36410 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
@@ -1,25 +1,16 @@
 package org.libre.agosto.p2play.adapters
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.AsyncTask
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.CommentaryModel
-import org.libre.agosto.p2play.models.VideoModel
-import java.io.InputStream
-import java.io.Serializable
-import java.net.URL
 
 @Suppress("DEPRECATION")
 class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index 8281661..169fa9f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -1,24 +1,17 @@
 package org.libre.agosto.p2play.adapters
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.AsyncTask
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.VideoModel
-import java.io.InputStream
 import java.io.Serializable
-import java.net.URL
-import java.util.concurrent.TimeUnit
 
 class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         RecyclerView.Adapter<VideosAdapter.ViewHolder>() {
@@ -46,8 +39,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
     }
 
     // Create new views (invoked by the layout manager)
-    override fun onCreateViewHolder(parent: ViewGroup,
-                                    viewType: Int): VideosAdapter.ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         // create a new view
         val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.view_video, parent, false) as View
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 6c7ed94..23f1b48 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -135,7 +135,11 @@
                 android:text="@string/aboutLicense"
                 android:textAlignment="textStart"
                 android:textSize="16sp" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index c78b087..ee3af1c 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -151,4 +151,4 @@
     </ScrollView>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_host.xml b/app/src/main/res/layout/activity_host.xml
index 25f7f13..e22837e 100644
--- a/app/src/main/res/layout/activity_host.xml
+++ b/app/src/main/res/layout/activity_host.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -29,24 +29,23 @@
                 android:contentDescription="Logo"
                 app:srcCompat="@drawable/icon" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/hostInfoText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/hostInfoText"
                 android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
-                android:textColor="@android:color/black" />
+                />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
-            <EditText
+            <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/hostText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -54,7 +53,7 @@
                 android:hint="@string/hostText"
                 android:inputType="text" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button"
                 style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
@@ -63,4 +62,4 @@
 
         </LinearLayout>
     </FrameLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8ce0137..986a6f4 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -97,4 +97,4 @@
         </LinearLayout>
 
     </FrameLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c21e1aa..2ef19d2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -26,4 +26,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 890a265..d3ef7af 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -55,4 +55,4 @@
 
         </LinearLayout>
     </FrameLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 8b0cb7d..2aeff0f 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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=".MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/P2playTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/P2playTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 249eb35..4577734 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -8,7 +8,7 @@
     tools:context=".MainActivity"
     tools:showIn="@layout/app_bar_main">
 
-    <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.v7.widget.RecyclerView
+        <view class="androidx.recyclerview.widget.RecyclerView"
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,5 +24,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </android.support.v4.widget.SwipeRefreshLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index 0658aae..d51e791 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -64,10 +64,10 @@
 
     </LinearLayout>
 
-    <Space
+    <androidx.legacy.widget.Space
         android:layout_width="match_parent"
         android:layout_height="15dp"
         android:layout_weight="1"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 42a89ae..6a3e597 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,7 +5,8 @@
     <item
         android:id="@+id/app_bar_search"
         android:icon="@drawable/ic_search_black_24dp"
-        app:actionViewClass="android.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        android:title="@string/action_login"
         app:showAsAction="always"/>
 
     <item
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6cd591b..9d56e6b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,79 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</color>
+
+    <color name="colorPrimaryContainer">#3F51B5</color>
+    <color name="colorSecondaryContainer">#3F51B5</color>
+    <color name="colorTertiary">#3F51B5</color>
+    <color name="colorTertiaryContainer">#3F51B5</color>
+    <color name="colorErrorContainer">#3F51B5</color>
+    <color name="colorSurfaceVariant">#3F51B5</color>
+    <color name="colorOutline">#3F51B5</color>
+    <color name="colorOnSurfaceInverse">#3F51B5</color>
+    <color name="colorSurfaceInverse">#3F51B5</color>
+    <color name="colorPrimaryInverse">#3F51B5</color>
+
+    <color name="colorOnPrimaryContainer">#3F51B5</color>
+
+    <color name="seed">#f57721</color>
+    <color name="md_theme_light_primary">#9C4400</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#FFDBCA</color>
+    <color name="md_theme_light_onPrimaryContainer">#331200</color>
+    <color name="md_theme_light_secondary">#954906</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#FFDBC7</color>
+    <color name="md_theme_light_onSecondaryContainer">#311300</color>
+    <color name="md_theme_light_tertiary">#8F4E00</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#FFDCC2</color>
+    <color name="md_theme_light_onTertiaryContainer">#2E1500</color>
+    <color name="md_theme_light_error">#BA1A1A</color>
+    <color name="md_theme_light_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_background">#FFFBFF</color>
+    <color name="md_theme_light_onBackground">#2D1600</color>
+    <color name="md_theme_light_surface">#FFFBFF</color>
+    <color name="md_theme_light_onSurface">#2D1600</color>
+    <color name="md_theme_light_surfaceVariant">#F4DED4</color>
+    <color name="md_theme_light_onSurfaceVariant">#52443D</color>
+    <color name="md_theme_light_outline">#85746B</color>
+    <color name="md_theme_light_inverseOnSurface">#FFEEE1</color>
+    <color name="md_theme_light_inverseSurface">#4B2800</color>
+    <color name="md_theme_light_inversePrimary">#FFB68F</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#9C4400</color>
+    <color name="md_theme_light_outlineVariant">#D7C2B9</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_dark_primary">#FFB68F</color>
+    <color name="md_theme_dark_onPrimary">#542100</color>
+    <color name="md_theme_dark_primaryContainer">#773200</color>
+    <color name="md_theme_dark_onPrimaryContainer">#FFDBCA</color>
+    <color name="md_theme_dark_secondary">#FFB688</color>
+    <color name="md_theme_dark_onSecondary">#512400</color>
+    <color name="md_theme_dark_secondaryContainer">#733600</color>
+    <color name="md_theme_dark_onSecondaryContainer">#FFDBC7</color>
+    <color name="md_theme_dark_tertiary">#FFB77A</color>
+    <color name="md_theme_dark_onTertiary">#4C2700</color>
+    <color name="md_theme_dark_tertiaryContainer">#6D3A00</color>
+    <color name="md_theme_dark_onTertiaryContainer">#FFDCC2</color>
+    <color name="md_theme_dark_error">#FFB4AB</color>
+    <color name="md_theme_dark_errorContainer">#93000A</color>
+    <color name="md_theme_dark_onError">#690005</color>
+    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_background">#2D1600</color>
+    <color name="md_theme_dark_onBackground">#FFDCC0</color>
+    <color name="md_theme_dark_surface">#2D1600</color>
+    <color name="md_theme_dark_onSurface">#FFDCC0</color>
+    <color name="md_theme_dark_surfaceVariant">#52443D</color>
+    <color name="md_theme_dark_onSurfaceVariant">#D7C2B9</color>
+    <color name="md_theme_dark_outline">#9F8D84</color>
+    <color name="md_theme_dark_inverseOnSurface">#2D1600</color>
+    <color name="md_theme_dark_inverseSurface">#FFDCC0</color>
+    <color name="md_theme_dark_inversePrimary">#9C4400</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#FFB68F</color>
+    <color name="md_theme_dark_outlineVariant">#52443D</color>
+    <color name="md_theme_dark_scrim">#000000</color>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 743d692..ded9a9d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,9 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.enableJetifier=true
+android.useAndroidX=true
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

From bf35a75877fae7ba275b16f15a7cab3f5f60090b Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Thu, 21 Mar 2024 14:23:36 -0600
Subject: [PATCH 02/13] Add material theme

---
 app/src/main/AndroidManifest.xml         | 10 ++-
 app/src/main/res/layout/app_bar_main.xml |  7 +-
 app/src/main/res/values-es/strings.xml   |  1 +
 app/src/main/res/values-night/themes.xml | 21 +++++
 app/src/main/res/values/colors.xml       | 97 ++++++++++--------------
 app/src/main/res/values/strings.xml      |  1 +
 app/src/main/res/values/themes.xml       | 21 +++++
 7 files changed, 94 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4743f28..356f669 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,22 +11,24 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/P2playTheme">
+        android:theme="@style/Theme.P2play">
         <activity android:name=".ChannelActivity"
             android:theme="@style/P2playTheme.noBar" />
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.P2play.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=".HostActivity"
+            android:theme="@style/Theme.P2play.NoActionBar"/>
         <activity
             android:name=".MainActivity"
-            android:theme="@style/P2playTheme.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 2aeff0f..a260ff5 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -8,15 +8,12 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/P2playTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/P2playTheme.PopupOverlay" />
+            android:layout_height="?attr/actionBarSize"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1dc32f3..2ec2f95 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -25,6 +25,7 @@
     <string name="passwordTxt">Contraseña:</string>
     <string name="loginBtn">Ingresar</string>
     <string name="registerActionBtn">Crear una cuenta</string>
+    <string name="instance">Instancia</string>
     <!-- Toast msg -->
     <string name="loginSuccess_msg">Te has identificado</string>
     <string name="loginError_msg">Ha ocurrido un error</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..0b30c71
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,21 @@
+
+<resources>
+    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="actionBarItemBackground">@color/md_theme_dark_surface</item>
+    </style>
+
+    <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d56e6b..99fcf75 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,79 +10,66 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</color>
-
-    <color name="colorPrimaryContainer">#3F51B5</color>
-    <color name="colorSecondaryContainer">#3F51B5</color>
-    <color name="colorTertiary">#3F51B5</color>
-    <color name="colorTertiaryContainer">#3F51B5</color>
-    <color name="colorErrorContainer">#3F51B5</color>
-    <color name="colorSurfaceVariant">#3F51B5</color>
-    <color name="colorOutline">#3F51B5</color>
-    <color name="colorOnSurfaceInverse">#3F51B5</color>
-    <color name="colorSurfaceInverse">#3F51B5</color>
-    <color name="colorPrimaryInverse">#3F51B5</color>
-
-    <color name="colorOnPrimaryContainer">#3F51B5</color>
-
-    <color name="seed">#f57721</color>
-    <color name="md_theme_light_primary">#9C4400</color>
+ 
+    <color name="seed">#f16805</color>
+    <color name="md_theme_light_primary">#9F4200</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#FFDBCA</color>
-    <color name="md_theme_light_onPrimaryContainer">#331200</color>
-    <color name="md_theme_light_secondary">#954906</color>
+    <color name="md_theme_light_primaryContainer">#FFDBCB</color>
+    <color name="md_theme_light_onPrimaryContainer">#341100</color>
+    <color name="md_theme_light_secondary">#566500</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#FFDBC7</color>
-    <color name="md_theme_light_onSecondaryContainer">#311300</color>
-    <color name="md_theme_light_tertiary">#8F4E00</color>
+    <color name="md_theme_light_secondaryContainer">#D9EC7B</color>
+    <color name="md_theme_light_onSecondaryContainer">#181E00</color>
+    <color name="md_theme_light_tertiary">#904D00</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#FFDCC2</color>
-    <color name="md_theme_light_onTertiaryContainer">#2E1500</color>
+    <color name="md_theme_light_tertiaryContainer">#FFDCC3</color>
+    <color name="md_theme_light_onTertiaryContainer">#2F1500</color>
     <color name="md_theme_light_error">#BA1A1A</color>
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
-    <color name="md_theme_light_background">#FFFBFF</color>
-    <color name="md_theme_light_onBackground">#2D1600</color>
-    <color name="md_theme_light_surface">#FFFBFF</color>
-    <color name="md_theme_light_onSurface">#2D1600</color>
-    <color name="md_theme_light_surfaceVariant">#F4DED4</color>
+    <color name="md_theme_light_background">#F8FDFF</color>
+    <color name="md_theme_light_onBackground">#001F25</color>
+    <color name="md_theme_light_surface">#F8FDFF</color>
+    <color name="md_theme_light_onSurface">#001F25</color>
+    <color name="md_theme_light_surfaceVariant">#F4DED5</color>
     <color name="md_theme_light_onSurfaceVariant">#52443D</color>
-    <color name="md_theme_light_outline">#85746B</color>
-    <color name="md_theme_light_inverseOnSurface">#FFEEE1</color>
-    <color name="md_theme_light_inverseSurface">#4B2800</color>
-    <color name="md_theme_light_inversePrimary">#FFB68F</color>
+    <color name="md_theme_light_outline">#85736C</color>
+    <color name="md_theme_light_inverseOnSurface">#D6F6FF</color>
+    <color name="md_theme_light_inverseSurface">#00363F</color>
+    <color name="md_theme_light_inversePrimary">#FFB692</color>
     <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#9C4400</color>
+    <color name="md_theme_light_surfaceTint">#9F4200</color>
     <color name="md_theme_light_outlineVariant">#D7C2B9</color>
     <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#FFB68F</color>
-    <color name="md_theme_dark_onPrimary">#542100</color>
-    <color name="md_theme_dark_primaryContainer">#773200</color>
-    <color name="md_theme_dark_onPrimaryContainer">#FFDBCA</color>
-    <color name="md_theme_dark_secondary">#FFB688</color>
-    <color name="md_theme_dark_onSecondary">#512400</color>
-    <color name="md_theme_dark_secondaryContainer">#733600</color>
-    <color name="md_theme_dark_onSecondaryContainer">#FFDBC7</color>
-    <color name="md_theme_dark_tertiary">#FFB77A</color>
-    <color name="md_theme_dark_onTertiary">#4C2700</color>
-    <color name="md_theme_dark_tertiaryContainer">#6D3A00</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FFDCC2</color>
+    <color name="md_theme_dark_primary">#FFB692</color>
+    <color name="md_theme_dark_onPrimary">#562000</color>
+    <color name="md_theme_dark_primaryContainer">#793000</color>
+    <color name="md_theme_dark_onPrimaryContainer">#FFDBCB</color>
+    <color name="md_theme_dark_secondary">#BDD062</color>
+    <color name="md_theme_dark_onSecondary">#2C3400</color>
+    <color name="md_theme_dark_secondaryContainer">#404C00</color>
+    <color name="md_theme_dark_onSecondaryContainer">#D9EC7B</color>
+    <color name="md_theme_dark_tertiary">#FFB77C</color>
+    <color name="md_theme_dark_onTertiary">#4D2600</color>
+    <color name="md_theme_dark_tertiaryContainer">#6E3900</color>
+    <color name="md_theme_dark_onTertiaryContainer">#FFDCC3</color>
     <color name="md_theme_dark_error">#FFB4AB</color>
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_dark_background">#2D1600</color>
-    <color name="md_theme_dark_onBackground">#FFDCC0</color>
-    <color name="md_theme_dark_surface">#2D1600</color>
-    <color name="md_theme_dark_onSurface">#FFDCC0</color>
+    <color name="md_theme_dark_background">#001F25</color>
+    <color name="md_theme_dark_onBackground">#A6EEFF</color>
+    <color name="md_theme_dark_surface">#001F25</color>
+    <color name="md_theme_dark_onSurface">#A6EEFF</color>
     <color name="md_theme_dark_surfaceVariant">#52443D</color>
     <color name="md_theme_dark_onSurfaceVariant">#D7C2B9</color>
-    <color name="md_theme_dark_outline">#9F8D84</color>
-    <color name="md_theme_dark_inverseOnSurface">#2D1600</color>
-    <color name="md_theme_dark_inverseSurface">#FFDCC0</color>
-    <color name="md_theme_dark_inversePrimary">#9C4400</color>
+    <color name="md_theme_dark_outline">#A08D85</color>
+    <color name="md_theme_dark_inverseOnSurface">#001F25</color>
+    <color name="md_theme_dark_inverseSurface">#A6EEFF</color>
+    <color name="md_theme_dark_inversePrimary">#9F4200</color>
     <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#FFB68F</color>
+    <color name="md_theme_dark_surfaceTint">#FFB692</color>
     <color name="md_theme_dark_outlineVariant">#52443D</color>
     <color name="md_theme_dark_scrim">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ded5376..3e995e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="okButton">Accept</string>
     <string name="errorMsg">Error, try again</string>
     <string name="finallyMsg">Host saved</string>
+    <string name="instance">Instance</string>
     <!-- End Host strings -->
     <!-- Start Login strings -->
     <string name="loginInfo">Login or register new account</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..e7a1b1e
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,21 @@
+
+<resources>
+    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+        <item name="colorPrimary">@color/md_theme_light_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+        <item name="colorSecondary">@color/md_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+        <item name="colorError">@color/md_theme_light_error</item>
+        <item name="colorOnError">@color/md_theme_light_onError</item>
+        <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+        <item name="actionBarItemBackground">@color/md_theme_light_surface</item>
+    </style>
+
+    <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>

From b6ef9b8aca38610f55c95af201e0a8336da51e71 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Thu, 21 Mar 2024 17:47:54 -0600
Subject: [PATCH 03/13] Normalize theme

---
 app/src/main/AndroidManifest.xml              |  5 +-
 .../org/libre/agosto/p2play/MainActivity.kt   |  4 ++
 app/src/main/res/layout/activity_host.xml     | 25 +++++---
 app/src/main/res/layout/activity_login.xml    | 58 ++++++++++---------
 .../main/res/layout/activity_reproductor.xml  | 45 +++++++-------
 app/src/main/res/layout/view_video.xml        |  3 +-
 app/src/main/res/values-night/themes.xml      |  5 +-
 app/src/main/res/values/colors.xml            |  6 +-
 app/src/main/res/values/themes.xml            |  5 +-
 app/src/main/res/xml/pref_general.xml         |  2 +-
 app/src/main/res/xml/pref_headers.xml         |  7 ++-
 11 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 356f669..da1b4d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,13 +33,14 @@
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
-            android:theme="@style/P2playTheme.noBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".AboutActivity" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" />
+            android:label="@string/title_activity_settings"
+            android:theme="@style/Theme.P2play"/>
     </application>
 
 </manifest>
\ No newline at end of file
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 038ccd4..5d05638 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -2,10 +2,12 @@ package org.libre.agosto.p2play
 
 import android.content.Intent
 import android.os.AsyncTask
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.view.Menu
 import android.view.MenuItem
+import android.view.WindowManager
 
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
@@ -48,6 +50,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                     .setAction("Action", null).show()
         } */
 
+
+
         val toggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
         drawer_layout.addDrawerListener(toggle)
         toggle.syncState()
diff --git a/app/src/main/res/layout/activity_host.xml b/app/src/main/res/layout/activity_host.xml
index e22837e..3d3cbaf 100644
--- a/app/src/main/res/layout/activity_host.xml
+++ b/app/src/main/res/layout/activity_host.xml
@@ -45,21 +45,30 @@
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
-            <androidx.appcompat.widget.AppCompatEditText
-                android:id="@+id/hostText"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/hostText"
-                android:inputType="text" />
+                android:layout_margin="4dp"
+                android:hint="@string/instance"
+                app:expandedHintEnabled="false">
 
-            <androidx.appcompat.widget.AppCompatButton
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/hostText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/hostText"
+                    android:inputType="text" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/button"
-                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/okButton" />
 
         </LinearLayout>
     </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 986a6f4..a99fd12 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -29,7 +29,7 @@
                 android:contentDescription="Logo"
                 app:srcCompat="@drawable/icon" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -39,60 +39,62 @@
                 android:layout_height="wrap_content"
                 android:text="@string/loginInfo"
                 android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
-                android:textColor="@android:color/black" />
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"/>
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/userTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/userTxt" />
+                android:layout_margin="4dp"
+                android:hint="@string/userTxt">
 
-            <EditText
-                android:id="@+id/userText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/userText"
-                android:inputType="text" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/userText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/userText"
+                    android:inputType="text" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <TextView
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/passwordTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/passwordTxt" />
+                android:layout_margin="4dp"
+                app:endIconMode="password_toggle"
+                android:hint="@string/passwordTxt" >
 
-            <EditText
-                android:id="@+id/passwordText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/passwordText"
-                android:inputType="text|textPassword" />
+                <EditText
+                    android:id="@+id/passwordText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textPassword"/>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginBtn"
-                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/loginBtn"
                 android:textAlignment="center" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/registerActionBtn"
-                style="@style/Widget.AppCompat.Button.Borderless"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/registerActionBtn"
-                android:visibility="visible" />
+                android:visibility="invisible" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 4583b06..abe99b4 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -12,8 +12,8 @@
         android:layout_height="fill_parent"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:visibility="gone" />
 
     <ScrollView
@@ -37,17 +37,15 @@
             <WebView
                 android:id="@+id/videoView"
                 android:layout_width="match_parent"
-                android:layout_height="270dp"
-                android:layout_weight="1">
-
-            </WebView>
+                android:layout_height="222dp"
+                android:layout_weight="1" />
 
             <TextView
                 android:id="@+id/tittleVideoTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingStart="5dp"
-                android:textAppearance="@android:style/TextAppearance.Material.Large"
+                android:textAppearance="@android:style/TextAppearance.Material.Display1"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -59,7 +57,7 @@
                 android:paddingRight="5dp"
                 android:textSize="12sp" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/actionsLayout"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
@@ -67,7 +65,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/likeLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -94,7 +92,7 @@
                         android:layout_weight="1"
                         android:text="@string/likeBtn"
                         android:textAlignment="center" />
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <LinearLayout
                     android:id="@+id/dislikeLayout"
@@ -179,7 +177,7 @@
                         android:text="@string/shareBtn"
                         android:textAlignment="center" />
                 </LinearLayout>
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -210,7 +208,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textAppearance="@android:style/TextAppearance.Material.Large"
-                        android:textColor="@android:color/black"
                         android:textSize="18sp"
                         android:textStyle="bold" />
 
@@ -223,9 +220,8 @@
 
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/subscribeBtn"
-                    style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -257,9 +253,9 @@
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/showMoreBtn"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -272,7 +268,7 @@
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
                 android:layout_weight="1" />
@@ -285,11 +281,11 @@
                 android:text="@string/commentariesTxt"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="20dp" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/commentaryLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -319,17 +315,16 @@
 
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/commentaryBtn"
-                    style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:text="@string/commentaryText" />
 
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/listCommentaries"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -340,4 +335,4 @@
 
         </LinearLayout>
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index d51e791..da37fc6 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -50,7 +50,8 @@
                     android:layout_height="wrap_content"
                     android:maxLength="70"
                     android:textSize="14sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:theme="@style/MaterialAlertDialog.MaterialComponents.Title.Text"/>
 
                 <TextView
                     android:id="@+id/descriptionTxt"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0b30c71..c05bef2 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 
 <resources>
-    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+    <style name="Theme.P2play" parent="Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
         <item name="colorSecondary">@color/md_theme_dark_secondary</item>
@@ -11,7 +11,8 @@
         <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
-        <item name="actionBarItemBackground">@color/md_theme_dark_surface</item>
+        <item name="colorPrimaryDark">@color/colorAccent</item>
+        <item name="colorAccent">@color/md_theme_dark_onBackground</item>
     </style>
 
     <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 99fcf75..5d7a871 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#9F4200</color>
+    <color name="colorPrimaryDark">#F4DED5</color>
+    <color name="colorAccent">#0f3239</color>
     <color name="colorHeader">#ffffff</color>
     <color name="colorBody">#fff</color>
     <color name="colorMenu">#000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e7a1b1e..6210be7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 
 <resources>
-    <style name="Theme.P2play" parent="Theme.MaterialComponents">
+    <style name="Theme.P2play" parent="Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
         <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
         <item name="colorSecondary">@color/md_theme_light_secondary</item>
@@ -11,7 +11,8 @@
         <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
         <item name="colorSurface">@color/md_theme_light_surface</item>
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-        <item name="actionBarItemBackground">@color/md_theme_light_surface</item>
+        <item name="colorPrimaryDark">@color/md_theme_light_primary</item>
+        <item name="colorAccent">@color/md_theme_light_onPrimary</item>
     </style>
 
     <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index b0e6117..dcad1d7 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -5,7 +5,7 @@
     <EditTextPreference
         android:capitalize="words"
         android:defaultValue="@string/pref_hostname_error"
-        android:inputType="textCapWords"
+        android:inputType="text"
         android:key="hostP2play"
         android:maxLines="1"
         android:selectAllOnFocus="true"
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index e5fd625..12803d9 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -1,11 +1,14 @@
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- These settings headers are only used on tablets. -->
 
     <header
         android:fragment="org.libre.agosto.p2play.SettingsActivity$GeneralPreferenceFragment"
         android:icon="@drawable/ic_info_black_24dp"
-        android:title="@string/pref_header_general" />
+        android:title="@string/pref_header_general"
+        android:textColor="@color/md_theme_light_secondary"/>
 
     <!-- <header
         android:fragment="org.libre.agosto.p2play.SettingsActivity$NotificationPreferenceFragment"

From ef5c97dce1d745bd246aeb952e53b46279a331a9 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 12:28:39 -0600
Subject: [PATCH 04/13] Finish update to androidx

---
 .../agosto/p2play/ExampleInstrumentedTest.kt  | 24 -------------------
 app/src/main/res/layout/activity_channel.xml  |  2 +-
 app/src/main/res/layout/view_commentary.xml   |  4 ++--
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt

diff --git a/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
deleted file mode 100644
index d86c903..0000000
--- a/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.libre.agosto.p2play
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("org.libre.agosto.p2play", appContext.packageName)
-    }
-}
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index ee3af1c..2198786 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -141,7 +141,7 @@
                     tools:layout_editor_absoluteY="214dp" />
             </FrameLayout>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/listVideosChannel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_commentary.xml b/app/src/main/res/layout/view_commentary.xml
index 5d0687f..c15dc9f 100644
--- a/app/src/main/res/layout/view_commentary.xml
+++ b/app/src/main/res/layout/view_commentary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -48,4 +48,4 @@
                 android:maxLines="10" />
         </LinearLayout>
     </LinearLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 815bafaee1201bec45676c341ace1cb34ac7ab18 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 16:55:52 -0600
Subject: [PATCH 05/13] Update edittext to materialTextview

---
 .../agosto/p2play/ReproductorActivity.kt      |  2 +-
 app/src/main/res/layout/activity_about.xml    | 22 +++++++--------
 .../main/res/layout/activity_reproductor.xml  | 25 ++++++++++-------
 app/src/main/res/layout/activity_splash.xml   |  7 +++--
 app/src/main/res/layout/report_dialog.xml     | 27 +++++++++++--------
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-night/themes.xml      |  1 +
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/values/themes.xml            |  1 +
 10 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 644118b..dae39e9 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -232,7 +232,7 @@ class ReproductorActivity : AppCompatActivity() {
             runOnUiThread {
                 if (res) {
                     ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg), this)
-                    commentaryText.text.clear()
+                    commentaryText.text?.clear()
                     this.getComments()
                 } else {
                     ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg), this)
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 23f1b48..a00b1d5 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -29,7 +29,7 @@
                 android:contentDescription="Logo"
                 app:srcCompat="@mipmap/ic_launcher" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -39,11 +39,10 @@
                 android:layout_height="wrap_content"
                 android:text="@string/aboutLabel"
                 android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
-                android:textColor="@android:color/black"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -55,7 +54,7 @@
                 android:textAlignment="textStart"
                 android:textSize="16sp" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/gitlabUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -66,7 +65,7 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="20dp" />
 
@@ -88,7 +87,7 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -98,11 +97,10 @@
                 android:layout_height="wrap_content"
                 android:text="@string/aboutInstance"
                 android:textAlignment="center"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
-                android:textColor="@android:color/black"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="20dp" />
 
@@ -124,7 +122,7 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -136,7 +134,7 @@
                 android:textAlignment="textStart"
                 android:textSize="16sp" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index abe99b4..7ca7ae6 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -164,7 +164,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:adjustViewBounds="false"
-                        android:contentDescription="@string/dislikeBtn"
+                        android:contentDescription="@string/shareBtn"
                         android:cropToPadding="false"
                         android:visibility="visible"
                         app:srcCompat="@drawable/ic_share" />
@@ -200,7 +200,7 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="3"
                     android:orientation="vertical">
 
                     <TextView
@@ -222,11 +222,12 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/subscribeBtn"
+                    style="@style/Widget.MaterialComponents.Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/subscribeBtn"
-                    android:textSize="10sp"
+                    android:textSize="12sp"
                     android:visibility="invisible" />
             </LinearLayout>
 
@@ -304,14 +305,20 @@
                         android:layout_weight="1"
                         app:srcCompat="@drawable/default_avatar" />
 
-                    <EditText
-                        android:id="@+id/commentaryText"
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:ems="10"
-                        android:hint="@string/commentHolder"
-                        android:inputType="textMultiLine" />
+                        android:layout_margin="4dp"
+                        android:layout_weight="3"
+                        android:hint="@string/commentHolder">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/commentaryText"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:ems="10"
+                            android:inputType="textMultiLine" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index d3ef7af..b9336d1 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -29,7 +29,7 @@
                 android:contentDescription="@string/app_name"
                 app:srcCompat="@mipmap/ic_launcher" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
@@ -39,10 +39,9 @@
                 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" />
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
 
-            <Space
+            <androidx.legacy.widget.Space
                 android:layout_width="match_parent"
                 android:layout_height="30dp" />
 
diff --git a/app/src/main/res/layout/report_dialog.xml b/app/src/main/res/layout/report_dialog.xml
index 8c8b872..92e76f7 100644
--- a/app/src/main/res/layout/report_dialog.xml
+++ b/app/src/main/res/layout/report_dialog.xml
@@ -6,21 +6,26 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/reportTxt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/reportDialog"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <EditText
-        android:id="@+id/reportText"
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textMultiLine">
+        android:layout_margin="4dp"
+        android:layout_weight="3"
+        android:hint="@string/reportDialog">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/reportText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textMultiLine" >
+
+            <requestFocus />
+
+        </com.google.android.material.textfield.TextInputEditText>
+
+    </com.google.android.material.textfield.TextInputLayout>
 
-        <requestFocus />
 
-    </EditText>
 
 </LinearLayout>
\ 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 2ec2f95..27e8262 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,7 +9,7 @@
     <string name="aboutLabel">Sobre P2Play</string>
     <string name="aboutText">P2Play es una aplicacion no-oficial de PeerTube. Tu puedes ver y cntribuir con el codigo en GitLab:</string>
     <string name="aboutStatus">Puedes seguir nuestro blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">GNU GPLv3 License</string>
     <string name="aboutInstance">Sobre la instancia</string>
     <string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
     <!-- End About strings -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index dfd0cc4..877e37a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -5,7 +5,7 @@
     <string name="aboutLabel">Informazioni su P2Play</string>
     <string name="aboutText">P2Play è un\'applicazione Android non ufficiale per PeerTube. Puoi visualizzare e contribuire al codice su GitLab:</string>
     <string name="aboutStatus">Puoi seguire il nostro blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">GNU GPLv3 License</string>
     <string name="aboutInstance">Informazioni sull\'istanza</string>
     <string name="aboutInWeb">Puoi vedere in termini ed altro sul web:</string>
     <string name="hostInfoText">Scegliere l\'istanza</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c05bef2..5246f13 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,6 +13,7 @@
         <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
         <item name="colorPrimaryDark">@color/colorAccent</item>
         <item name="colorAccent">@color/md_theme_dark_onBackground</item>
+        <item name="android:textColorLink">@color/md_theme_dark_secondary</item>
     </style>
 
     <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e995e5..af45e67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="aboutLabel">About P2Play</string>
     <string name="aboutText">P2Play is an unofficial Android application for PeerTube. You can watch and contribute with the code on GitLab:</string>
     <string name="aboutStatus">You can follow our blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">Licence GNU GPLv3 License</string>
     <string name="aboutInstance">About instance</string>
     <string name="aboutInWeb">You can see terms and more on the web:</string>
     <!-- End About strings -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6210be7..b71a40d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,6 +13,7 @@
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
         <item name="colorPrimaryDark">@color/md_theme_light_primary</item>
         <item name="colorAccent">@color/md_theme_light_onPrimary</item>
+        <item name="android:textColorLink">@color/md_theme_light_secondary</item>
     </style>
 
     <style name="Theme.P2play.NoActionBar" parent="Theme.P2play">

From ba0a298ea914995adf370d502996cbcbaa34ea45 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 17:20:42 -0600
Subject: [PATCH 06/13] Add new theme to Channel view

---
 app/src/main/AndroidManifest.xml             | 2 +-
 app/src/main/res/layout/activity_channel.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da1b4d5..e83f1ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.P2play">
         <activity android:name=".ChannelActivity"
-            android:theme="@style/P2playTheme.noBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity
             android:name=".SplashActivity"
             android:theme="@style/Theme.P2play.NoActionBar">
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index 2198786..e838d16 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -144,8 +144,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/listVideosChannel"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none" />
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
     </ScrollView>

From 40b193a81620799c726a19e1580a507539246be6 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 18:12:14 -0600
Subject: [PATCH 07/13] Update duration data to a floating text

---
 .../agosto/p2play/adapters/VideosAdapter.kt   | 19 +++++-------
 .../libre/agosto/p2play/helpers/mapSeconds.kt | 20 ++++++++++++
 app/src/main/res/drawable/round_text.xml      | 14 +++++++++
 app/src/main/res/layout/view_video.xml        | 31 ++++++++++++++++---
 app/src/main/res/values/colors.xml            |  3 ++
 5 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
 create mode 100644 app/src/main/res/drawable/round_text.xml

diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index 169fa9f..6e75709 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -9,7 +9,9 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.view_video.view.duration
 import org.libre.agosto.p2play.*
+import org.libre.agosto.p2play.helpers.mapSeconds
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.Serializable
 
@@ -27,6 +29,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         val tittle: TextView
         val description: TextView
         val context: Context
+        val duration: TextView
 
         init {
             // Define click listener for the ViewHolder's View
@@ -35,6 +38,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             thumb = view.findViewById(R.id.thumb)
             userImg = view.findViewById(R.id.userImg)
             context = view.context
+            duration = view.duration
         }
     }
 
@@ -71,19 +75,12 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             Picasso.get().load(R.drawable.default_avatar).into(holder.userImg)
 
         val viewsText = holder.context.getString(R.string.view_text)
-        var timeText = holder.context.getString(R.string.timeSec_text)
-        var timeString = myDataset[position].duration.toString()
         val seconds = myDataset[position].duration.toInt();
-        if(seconds > 60 && seconds < (60 * 60)){
-            timeText = holder.context.getString(R.string.timeMin_text)
-            timeString = (seconds / 60).toString() + ":" + (seconds % 60).toString()
-        }
-        else if(seconds > (60 * 60)){
-            timeText = holder.context.getString(R.string.timeHrs_text)
-            timeString = (seconds / 60 / 60).toString() + ":" + (seconds / 60 % 60).toString()
-        }
+        val timeString = mapSeconds(seconds)
 
-        holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText+" - "+timeString+" "+timeText
+        holder.duration.text = timeString
+
+        holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText
 
     }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
new file mode 100644
index 0000000..fd99d08
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
@@ -0,0 +1,20 @@
+package org.libre.agosto.p2play.helpers
+
+fun mapSeconds (inputSeconds: Int): String {
+    val seconds = (inputSeconds % 60)
+    var minutes = inputSeconds / 60
+    var hours = 0
+
+    if (minutes > 60) {
+        hours = minutes / 60
+        minutes = minutes % 60
+    }
+
+    var result = minutes.toString().padStart(2, '0') + ":" + seconds.toString().padStart(2, '0')
+
+    if (hours > 0) {
+        result = hours.toString().padStart(2, '0') + ":" + result
+    }
+
+    return result
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_text.xml b/app/src/main/res/drawable/round_text.xml
new file mode 100644
index 0000000..be16090
--- /dev/null
+++ b/app/src/main/res/drawable/round_text.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="5dp" />
+
+    <!-- This is the border color -->
+
+    <!--- This is the background color -->
+    <solid android:color="?attr/colorSecondary" />
+
+</shape>
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index da37fc6..2a69422 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -14,11 +14,34 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/thumb"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="230dp"
-            app:srcCompat="@android:drawable/ic_menu_gallery" />
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/thumb"
+                android:layout_width="match_parent"
+                android:layout_height="230dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@android:drawable/ic_menu_gallery" />
+
+            <TextView
+                android:id="@+id/duration"
+                android:layout_width="65dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="16dp"
+                android:textColor="?attr/colorOnSecondary"
+                android:background="@drawable/round_text"
+                android:ems="10"
+                android:text="00:00"
+                android:paddingHorizontal="3dp"
+                android:textAlignment="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5d7a871..9d801f7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,9 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</color>
+
+    <color name="durationBackground">#88000000</color>
+    <color name="durationColor">#ffffff</color>
  
     <color name="seed">#f16805</color>
     <color name="md_theme_light_primary">#9F4200</color>

From 0d9bd5410a094a9ee7c739f96dcd522eca0200f9 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Mon, 25 Mar 2024 18:53:01 -0600
Subject: [PATCH 08/13] Update to sdk 32

---
 app/build.gradle                              | 13 +++++----
 app/src/main/AndroidManifest.xml              | 27 +++++++++++--------
 .../org/libre/agosto/p2play/MainActivity.kt   |  6 ++---
 .../p2play/adapters/CommentariesAdapter.kt    |  9 +++++++
 .../agosto/p2play/adapters/VideosAdapter.kt   | 13 ++++++---
 .../agosto/p2play/models/CommentaryModel.kt   |  9 ++++++-
 app/src/main/res/layout/view_video.xml        |  5 +++-
 build.gradle                                  |  4 +--
 gradle.properties                             |  3 +++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 10 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cfda8bc..53b0094 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,14 +6,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     defaultConfig {
         applicationId "org.libre.agosto.p2play"
         minSdkVersion 26
-        //noinspection OldTargetApi
-        targetSdkVersion 28
-        versionCode 8
-        versionName "0.5.2"
+        targetSdkVersion 32
+        versionCode 9
+        versionName "0.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -22,7 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '30.0.2'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -31,6 +29,7 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    namespace 'org.libre.agosto.p2play'
 }
 
 dependencies {
@@ -40,7 +39,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.6.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e83f1ca..1078c0e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.libre.agosto.p2play">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -13,10 +12,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.P2play">
         <activity android:name=".ChannelActivity"
-            android:theme="@style/Theme.P2play.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/Theme.P2play.NoActionBar">
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,22 +26,26 @@
         </activity>
         <activity
             android:name=".HostActivity"
-            android:theme="@style/Theme.P2play.NoActionBar"/>
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
-            android:theme="@style/Theme.P2play.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
         <activity
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
-            android:theme="@style/Theme.P2play.NoActionBar" />
-        <activity android:name=".LoginActivity" />
-        <activity android:name=".RegisterActivity" />
-        <activity android:name=".AboutActivity" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
+        <activity android:name=".LoginActivity" android:exported="false" />
+        <activity android:name=".RegisterActivity" android:exported="false" />
+        <activity android:name=".AboutActivity" android:exported="false" />
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:theme="@style/Theme.P2play"/>
+            android:theme="@style/Theme.P2play"
+            android:exported="false"/>
     </application>
 
 </manifest>
\ No newline at end of file
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 5d05638..7efe98b 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -50,8 +50,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                     .setAction("Action", null).show()
         } */
 
-
-
         val toggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
         drawer_layout.addDrawerListener(toggle)
         toggle.syncState()
@@ -376,6 +374,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 myMenu.findItem(R.id.action_logout).isVisible = true
 
             }
+        } else {
+            nav_view.menu.findItem(R.id.ml).isVisible = false
         }
     }
 
@@ -394,7 +394,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
         this.refresh()
         ManagerSingleton.Toast(getString(R.string.logout_msg), this)
-
+        setSideData()
     }
 
     private fun loadMore(){
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
index be36410..b1b679c 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
@@ -1,6 +1,7 @@
 package org.libre.agosto.p2play.adapters
 
 import android.content.Context
+import android.content.Intent
 import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.view_video.view.userImg
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.CommentaryModel
 
@@ -42,6 +44,7 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
         // create a new view
         val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.view_commentary, parent, false) as View
+
         // set the view's size, margins, paddings and layout parameters
         return ViewHolder(view)
     }
@@ -63,6 +66,12 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
 
         holder.commentary.text = Html.fromHtml(myDataset[position].commentary)
 
+        // TODO: Support for view and account (is different than a video channel)
+        // holder.userImg.setOnClickListener {
+        //    val intent = Intent(holder.context, ChannelActivity::class.java)
+        //    intent.putExtra("channel", myDataset[position].getAccount())
+        //    holder.context.startActivity(intent)
+        // }
     }
 
     // Return the size of your dataset (invoked by the layout manager)
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index 6e75709..51f1de9 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -56,11 +56,12 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         // - get element from your dataset at this position
         // - replace the contents of the view with that element
         holder.tittle.text = myDataset[position].name
+        holder.tittle.setOnClickListener {
+            this.launchChannelActivity(myDataset[position] as Serializable, holder.context)
+        }
         Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].thumbUrl).into(holder.thumb)
         holder.thumb.setOnClickListener {
-            val intent = Intent(holder.context, ReproductorActivity::class.java)
-            intent.putExtra("video", myDataset[position] as Serializable)
-            holder.context.startActivity(intent)
+            this.launchChannelActivity(myDataset[position] as Serializable, holder.context)
         }
 
         holder.userImg.setOnClickListener {
@@ -98,5 +99,9 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         notifyItemRangeInserted(lastPos, newItems.size)
     }
 
-
+    private fun launchChannelActivity (data: Serializable, context: Context) {
+        val intent = Intent(context, ReproductorActivity::class.java)
+        intent.putExtra("video", data)
+        context.startActivity(intent)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
index 55543c2..cf83884 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
@@ -11,7 +11,8 @@ class CommentaryModel (
         var userImageUrl: String = "",
         var commentary: String = "",
         var userHost: String = "",
-        var replies: Int = 0
+        var replies: Int = 0,
+        var nameChannel: String = ""
 ) {
     fun parseCommentary(data: JsonReader) {
         data.beginObject()
@@ -46,6 +47,7 @@ class CommentaryModel (
                             }
                             "uuid" -> this.userUuid = data.nextString()
                             "host" -> this.userHost = data.nextString()
+                            "name" -> this.nameChannel = data.nextString()
                             else -> data.skipValue()
                         }
                     }
@@ -56,4 +58,9 @@ class CommentaryModel (
         }
         data.endObject()
     }
+
+    fun getAccount(): String {
+            return "$nameChannel@$userHost"
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index 2a69422..fef3772 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -16,12 +16,15 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/thumb"
                 android:layout_width="match_parent"
                 android:layout_height="230dp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/build.gradle b/build.gradle
index 3c4e1cc..95cf88a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index ded9a9d..1974226 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,9 @@
 org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1bfc49c..24a0581 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Mar 18 13:17:32 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From eeb20f1f9d0905290b65afbbfd7bea2e44311b41 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Mon, 25 Mar 2024 19:57:22 -0600
Subject: [PATCH 09/13] Update function name to the correct one

---
 .../java/org/libre/agosto/p2play/ReproductorActivity.kt   | 8 +++-----
 .../org/libre/agosto/p2play/adapters/VideosAdapter.kt     | 2 +-
 app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt  | 3 ---
 .../java/org/libre/agosto/p2play/models/VideoModel.kt     | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index dae39e9..c5df116 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -1,8 +1,6 @@
 package org.libre.agosto.p2play
 
 import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
@@ -96,7 +94,7 @@ class ReproductorActivity : AppCompatActivity() {
 
         userImg.setOnClickListener {
             val intent = Intent(this, ChannelActivity::class.java)
-            intent.putExtra("channel", video.getAccount())
+            intent.putExtra("channel", video.getChannel())
             startActivity(intent)
         }
     }
@@ -105,7 +103,7 @@ class ReproductorActivity : AppCompatActivity() {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
-            val res = this._actions.subscribe(ManagerSingleton.token.token, video.getAccount())
+            val res = this._actions.subscribe(ManagerSingleton.token.token, video.getChannel())
             if (res == 1) {
                 runOnUiThread {
                     ManagerSingleton.Toast(getString(R.string.subscribeMsg), this)
@@ -119,7 +117,7 @@ class ReproductorActivity : AppCompatActivity() {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
-            val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getAccount())
+            val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getChannel())
             if (res == 1) {
                 runOnUiThread {
                     ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this)
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index 51f1de9..ecfde66 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -66,7 +66,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
 
         holder.userImg.setOnClickListener {
             val intent = Intent(holder.context, ChannelActivity::class.java)
-            intent.putExtra("channel", myDataset[position].getAccount())
+            intent.putExtra("channel", myDataset[position].getChannel())
             holder.context.startActivity(intent)
         }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
index 2a948f5..8a16998 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
@@ -10,8 +10,6 @@ import java.net.HttpURLConnection
 import java.net.URL
 
 open class Client {
-
-
     protected fun _newCon(uri: String, method: String, token: String = ""): HttpURLConnection {
         val url = URL("https://${ManagerSingleton.url}/api/v1/$uri")
         val con = url.openConnection() as HttpURLConnection
@@ -67,5 +65,4 @@ open class Client {
         return keys
     }
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index 6059a94..74fce53 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -19,7 +19,7 @@ class VideoModel(
         var userHost: String = "",
         var nameChannel: String = ""
 ):Serializable {
-    fun getAccount(): String {
+    fun getChannel(): String {
         return "$nameChannel@$userHost"
     }
 

From 2fcd3b21f8709667b7e2a07c1b6c56e2cb25ff6d Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Mon, 25 Mar 2024 19:57:49 -0600
Subject: [PATCH 10/13] Add isLive indicator

---
 .../agosto/p2play/adapters/VideosAdapter.kt   |  8 +++-
 .../agosto/p2play/models/StreamingModel.kt    | 25 ++++++++++++
 .../libre/agosto/p2play/models/VideoModel.kt  | 40 +++++++++++++------
 app/src/main/res/drawable/live_shape.xml      | 14 +++++++
 app/src/main/res/layout/view_video.xml        | 17 ++++++++
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  2 +-
 7 files changed, 91 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
 create mode 100644 app/src/main/res/drawable/live_shape.xml

diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index ecfde66..de04ae0 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.squareup.picasso.Picasso
-import kotlinx.android.synthetic.main.view_video.view.duration
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.helpers.mapSeconds
 import org.libre.agosto.p2play.models.VideoModel
@@ -30,6 +29,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         val description: TextView
         val context: Context
         val duration: TextView
+        val isLive: TextView
 
         init {
             // Define click listener for the ViewHolder's View
@@ -38,7 +38,8 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             thumb = view.findViewById(R.id.thumb)
             userImg = view.findViewById(R.id.userImg)
             context = view.context
-            duration = view.duration
+            duration = view.findViewById(R.id.duration)
+            isLive = view.findViewById(R.id.isLive)
         }
     }
 
@@ -83,6 +84,9 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
 
         holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText
 
+        if (myDataset[position].isLive) {
+            holder.isLive.visibility = View.VISIBLE
+        }
     }
 
     // Return the size of your dataset (invoked by the layout manager)
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
new file mode 100644
index 0000000..5438b5f
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
@@ -0,0 +1,25 @@
+package org.libre.agosto.p2play.models
+
+import android.util.JsonReader
+
+class StreamingModel(
+    var playlistUrl: String = "",
+    var segmentsSha256Url: String = "",
+    // TODO: Download Files
+) {
+    fun parse(data: JsonReader) {
+        data.beginObject()
+        while (data.hasNext()) {
+            val key = data.nextName()
+            when (key.toString()) {
+                "playlistUrl"->{
+                    this.playlistUrl = data.nextString()
+                }
+                "segmentsSha256Url"->{
+                    this.segmentsSha256Url = data.nextString()
+                }
+                else -> data.skipValue()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index 74fce53..5062faa 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -5,19 +5,21 @@ import android.util.JsonToken
 import java.io.Serializable
 
 class VideoModel(
-        var id: Int = 0,
-        var uuid: String = "",
-        var name: String = "",
-        var description: String = "",
-        var thumbUrl: String = "",
-        var userImageUrl: String = "",
-        var embedUrl: String = "",
-        var duration: Number = 0,
-        var username: String = "",
-        var views: Number = 0,
-        var userUuid: String = "",
-        var userHost: String = "",
-        var nameChannel: String = ""
+    var id: Int = 0,
+    var uuid: String = "",
+    var name: String = "",
+    var description: String = "",
+    var thumbUrl: String = "",
+    var userImageUrl: String = "",
+    var embedUrl: String = "",
+    var duration: Number = 0,
+    var username: String = "",
+    var views: Number = 0,
+    var userUuid: String = "",
+    var userHost: String = "",
+    var nameChannel: String = "",
+    var isLive: Boolean = false,
+    var streamingData: StreamingModel? = null
 ):Serializable {
     fun getChannel(): String {
         return "$nameChannel@$userHost"
@@ -55,6 +57,18 @@ class VideoModel(
                 "views"->{
                     this.views = data.nextInt()
                 }
+                "isLive"-> {
+                    this.isLive = data.nextBoolean()
+                }
+                "streamingPlaylists"-> {
+                    data.beginArray()
+                    if (data.hasNext()) {
+                        val streamingData = StreamingModel()
+                        streamingData.parse(data)
+                        this.streamingData = streamingData
+                    }
+                    data.endArray()
+                }
                 "channel"->{
                     data.beginObject()
                     while (data.hasNext()){
diff --git a/app/src/main/res/drawable/live_shape.xml b/app/src/main/res/drawable/live_shape.xml
new file mode 100644
index 0000000..fd5f4ca
--- /dev/null
+++ b/app/src/main/res/drawable/live_shape.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="5dp" />
+
+    <!-- This is the border color -->
+
+    <!--- This is the background color -->
+    <solid android:color="@color/colorDislike" />
+
+</shape>
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index fef3772..db6d5d6 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -30,6 +30,23 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@android:drawable/ic_menu_gallery" />
 
+            <TextView
+                android:id="@+id/isLive"
+                android:layout_width="65dp"
+                android:layout_height="19dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginBottom="16dp"
+                android:background="@drawable/live_shape"
+                android:ems="10"
+                android:paddingHorizontal="3dp"
+                android:text="@string/is_live_video"
+                android:textAlignment="center"
+                android:textColor="@color/durationColor"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:visibility="invisible" />
+
             <TextView
                 android:id="@+id/duration"
                 android:layout_width="65dp"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 27e8262..abe45dc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -48,6 +48,7 @@
     <string name="timeMin_text">minutos</string>
     <string name="timeHrs_text">horas</string>
     <string name="nav_header_title">Inicia session</string>
+    <string name="is_live_video">En vivo</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 af45e67..502467a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="charging">Loading…</string>
     <!-- End Global string -->
 
-
     <!-- Start About strings -->
     <string name="aboutGitUrl" translatable="false">https://gitlab.com/agosto182/p2play/</string>
     <string name="aboutGnuUrl" translatable="false">https://personaljournal.ca/p2play/</string>
@@ -60,6 +59,7 @@
     <string name="timeHrs_text">hours</string>
     <string name="nav_header_title">Log In</string>
     <string name="nav_header_subtitle" translatable="false">P2Play</string>
+    <string name="is_live_video">Live</string>
     <!-- Toast msg -->
     <string name="logout_msg">You are now disconnected</string>
     <!-- End Main strings -->

From 6f0b97dbc4c566f974fbedadfe1e9037d0238044 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Wed, 27 Mar 2024 20:44:52 -0600
Subject: [PATCH 11/13] Exo player first integration

---
 app/build.gradle                              |   8 +-
 .../agosto/p2play/ReproductorActivity.kt      |  32 +++++-
 .../agosto/p2play/adapters/VideosAdapter.kt   |  31 ++---
 .../org/libre/agosto/p2play/ajax/Videos.kt    |  18 +++
 .../agosto/p2play/models/StreamingModel.kt    |   1 +
 .../main/res/drawable/ic_forward_10_24.xml    |   9 ++
 .../main/res/drawable/ic_fullscreen_24.xml    |   5 +
 app/src/main/res/drawable/ic_pause_24.xml     |   5 +
 .../main/res/drawable/ic_play_arrow_24.xml    |   5 +
 app/src/main/res/drawable/ic_replay_10_24.xml |   9 ++
 .../main/res/layout/activity_reproductor.xml  |   8 ++
 .../res/layout/custom_player_controls.xml     | 107 ++++++++++++++++++
 12 files changed, 211 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_forward_10_24.xml
 create mode 100644 app/src/main/res/drawable/ic_fullscreen_24.xml
 create mode 100644 app/src/main/res/drawable/ic_pause_24.xml
 create mode 100644 app/src/main/res/drawable/ic_play_arrow_24.xml
 create mode 100644 app/src/main/res/drawable/ic_replay_10_24.xml
 create mode 100644 app/src/main/res/layout/custom_player_controls.xml

diff --git a/app/build.gradle b/app/build.gradle
index 53b0094..739c08b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 34
     defaultConfig {
         applicationId "org.libre.agosto.p2play"
         minSdkVersion 26
@@ -14,6 +14,7 @@ android {
         versionCode 9
         versionName "0.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -39,8 +40,13 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.android.support:appcompat-v7:23.2.0'
     implementation 'com.google.android.material:material:1.6.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    implementation 'androidx.media3:media3-exoplayer:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.1.1'
+    implementation 'androidx.media3:media3-ui:1.1.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.1.1'
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index c5df116..5eb9591 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -16,6 +16,8 @@ import android.widget.EditText
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.media3.common.MediaItem
+import androidx.media3.exoplayer.ExoPlayer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
@@ -27,12 +29,9 @@ import org.libre.agosto.p2play.ajax.Videos
 import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 
-
-
-
-
 @Suppress("NAME_SHADOWING")
 class ReproductorActivity : AppCompatActivity() {
+    private val clientVideo: Videos = Videos()
     lateinit var video: VideoModel
     private val _actions: Actions = Actions()
     private val client: Comments = Comments()
@@ -58,7 +57,7 @@ class ReproductorActivity : AppCompatActivity() {
         videoView.settings.domStorageEnabled = true
 
         try {
-            this.video = this.intent.extras?.getSerializable("video") as VideoModel
+            video = this.intent.extras?.getSerializable("video") as VideoModel
             tittleVideoTxt.text = this.video.name
             viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
             userTxt.text = this.video.username
@@ -97,6 +96,29 @@ class ReproductorActivity : AppCompatActivity() {
             intent.putExtra("channel", video.getChannel())
             startActivity(intent)
         }
+
+
+        AsyncTask.execute {
+            val video = this.clientVideo.getVideo(this.video.uuid)
+            runOnUiThread {
+                try {
+                    val player = ExoPlayer.Builder(this.baseContext).build()
+                    exoPlayer.player = player
+
+                    println("----- video --------")
+                    println(video.streamingData?.playlistUrl)
+                    val mediaItem = MediaItem.fromUri(video.streamingData?.playlistUrl!!)
+                    // Set the media item to be played.
+                    player.setMediaItem(mediaItem)
+                    // Prepare the player.
+                    player.prepare()
+                    // Start the playback.
+                    player.play()
+                } catch(err: Exception) {
+                    err.printStackTrace()
+                }
+            }
+        }
     }
 
     private fun subscribe() {
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index de04ae0..724189f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -22,25 +22,14 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
     // Complex data items may need more than one view per item, and
     // you provide access to all the views for a data item in a view holder.
     // Each data item is just a string in this case that is shown in a TextView.
-    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view){
-        val thumb: ImageView
-        val userImg: ImageView
-        val tittle: TextView
-        val description: TextView
-        val context: Context
-        val duration: TextView
-        val isLive: TextView
-
-        init {
-            // Define click listener for the ViewHolder's View
-            tittle = view.findViewById(R.id.tittleTxt)
-            description = view.findViewById(R.id.descriptionTxt)
-            thumb = view.findViewById(R.id.thumb)
-            userImg = view.findViewById(R.id.userImg)
-            context = view.context
-            duration = view.findViewById(R.id.duration)
-            isLive = view.findViewById(R.id.isLive)
-        }
+    class ViewHolder(private val view: View) : RecyclerView.ViewHolder(view){
+        val thumb: ImageView = view.findViewById(R.id.thumb)
+        val userImg: ImageView = view.findViewById(R.id.userImg)
+        val title: TextView = view.findViewById(R.id.tittleTxt)
+        val description: TextView = view.findViewById(R.id.descriptionTxt)
+        val context: Context = view.context
+        val duration: TextView = view.findViewById(R.id.duration)
+        val isLive: TextView = view.findViewById(R.id.isLive)
     }
 
     // Create new views (invoked by the layout manager)
@@ -56,8 +45,8 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         // - get element from your dataset at this position
         // - replace the contents of the view with that element
-        holder.tittle.text = myDataset[position].name
-        holder.tittle.setOnClickListener {
+        holder.title.text = myDataset[position].name
+        holder.title.setOnClickListener {
             this.launchChannelActivity(myDataset[position] as Serializable, holder.context)
         }
         Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].thumbUrl).into(holder.thumb)
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 5472c38..6599dc9 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -200,4 +200,22 @@ class Videos: Client() {
     fun getMostLikedVideos(start:Int = 0): ArrayList<VideoModel>{
         return this.getVideos(start,"-likes")
     }
+
+    fun getVideo(uuid: String): VideoModel {
+        val con = this._newCon("videos/$uuid","GET")
+        val video = VideoModel()
+        try {
+            if (con.responseCode == 200) {
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
+                video.parseVideo(data)
+                data.close()
+            }
+        } catch(err:Exception){
+            err.printStackTrace()
+        }
+
+        con.disconnect()
+        return video
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
index 5438b5f..e150e92 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
@@ -21,5 +21,6 @@ class StreamingModel(
                 else -> data.skipValue()
             }
         }
+        data.endObject()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_forward_10_24.xml b/app/src/main/res/drawable/ic_forward_10_24.xml
new file mode 100644
index 0000000..93c2bb6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forward_10_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#fff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_24.xml b/app/src/main/res/drawable/ic_fullscreen_24.xml
new file mode 100644
index 0000000..42323b2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#fff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_pause_24.xml b/app/src/main/res/drawable/ic_pause_24.xml
new file mode 100644
index 0000000..f5b1804
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#fff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_24.xml b/app/src/main/res/drawable/ic_play_arrow_24.xml
new file mode 100644
index 0000000..e38e9e2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#fff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_replay_10_24.xml b/app/src/main/res/drawable/ic_replay_10_24.xml
new file mode 100644
index 0000000..4d90ec6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_replay_10_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#fff" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 7ca7ae6..c9fd31b 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -40,6 +40,14 @@
                 android:layout_height="222dp"
                 android:layout_weight="1" />
 
+            <androidx.media3.ui.PlayerView
+                android:id="@+id/exoPlayer"
+                android:layout_width="match_parent"
+                android:layout_height="222dp"
+                app:use_controller="true"
+                app:controller_layout_id="@layout/custom_player_controls"
+                app:player_layout_id="@layout/exo_player_view"/>
+
             <TextView
                 android:id="@+id/tittleVideoTxt"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/custom_player_controls.xml b/app/src/main/res/layout/custom_player_controls.xml
new file mode 100644
index 0000000..357dcc1
--- /dev/null
+++ b/app/src/main/res/layout/custom_player_controls.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:background="#aa000000"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:id="@+id/exo_rew"
+            android:src="@drawable/ic_replay_10_24"
+            />
+
+        <ImageView
+            android:id="@+id/exo_play_pause"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginHorizontal="30dp"/>
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:id="@+id/exo_ffwd"
+            android:src="@drawable/ic_forward_10_24"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginBottom="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/exo_position"
+                android:textColor="#fff"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="/"
+                android:textColor="#CBCDC8"
+                android:layout_marginHorizontal="4dp"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:id="@+id/exo_duration"
+                android:textColor="#CBCDC8"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal">
+
+            <androidx.media3.ui.DefaultTimeBar
+                android:id="@+id/exo_progress"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+
+            <ImageView
+                android:id="@+id/exo_fullscreen"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:src="@drawable/ic_fullscreen_24"
+                android:layout_weight="0"
+                android:layout_gravity="center"/>
+
+            <ImageView
+                android:id="@+id/exo_fullscreen2"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:src="@drawable/ic_fullscreen_24" />
+        </LinearLayout>
+    </LinearLayout>
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1f90e21f68cd00550a6df3091b15402a872b69b5 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Wed, 27 Mar 2024 21:31:41 -0600
Subject: [PATCH 12/13] Fix: Fullscreen bug

---
 .../org/libre/agosto/p2play/ReproductorActivity.kt  |  8 ++------
 .../libre/agosto/p2play/helpers/setFullscreen.kt    | 13 +++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/helpers/setFullscreen.kt

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 5eb9591..b0934ff 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -26,6 +26,7 @@ import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
 import org.libre.agosto.p2play.ajax.Comments
 import org.libre.agosto.p2play.ajax.Videos
+import org.libre.agosto.p2play.helpers.setFullscreen
 import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 
@@ -388,12 +389,7 @@ class ReproductorActivity : AppCompatActivity() {
 
                 this@ReproductorActivity.fullScreen.addView(paramView, FrameLayout.LayoutParams(match_parent, match_parent))
 
-
-                val attrs = this@ReproductorActivity.window.attributes
-                attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
-                attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                window.attributes = attrs
-                this@ReproductorActivity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE
+                setFullscreen(this@ReproductorActivity.window)
 
                 this@ReproductorActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
             }
diff --git a/app/src/main/java/org/libre/agosto/p2play/helpers/setFullscreen.kt b/app/src/main/java/org/libre/agosto/p2play/helpers/setFullscreen.kt
new file mode 100644
index 0000000..1b3922c
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/helpers/setFullscreen.kt
@@ -0,0 +1,13 @@
+package org.libre.agosto.p2play.helpers
+
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+
+fun setFullscreen (window: Window) {
+    val attrs = window.attributes
+    attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
+    attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+    window.attributes = attrs
+    window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+}
\ No newline at end of file

From e022fe5e964a503f7f6121c987ca23bd78f8d292 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Thu, 28 Mar 2024 17:29:32 -0600
Subject: [PATCH 13/13] Add fullscreen to exoplayer

---
 .../agosto/p2play/ReproductorActivity.kt      | 54 ++++++++++++++++++-
 .../libre/agosto/p2play/helpers/mapSeconds.kt |  2 +-
 .../libre/agosto/p2play/models/VideoModel.kt  | 20 +++++++
 .../main/res/layout/activity_reproductor.xml  | 37 +++++++++++--
 .../res/layout/custom_player_controls.xml     | 10 +---
 app/src/main/res/layout/view_video.xml        |  2 +-
 6 files changed, 108 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index b0934ff..8916288 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.media.Image
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Looper
@@ -14,6 +15,7 @@ import android.view.WindowManager
 import android.webkit.WebChromeClient
 import android.widget.EditText
 import android.widget.FrameLayout
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.media3.common.MediaItem
@@ -43,11 +45,20 @@ class ReproductorActivity : AppCompatActivity() {
     private lateinit var viewAdapter: RecyclerView.Adapter<*>
     private lateinit var viewManager: RecyclerView.LayoutManager
 
+    // Exoplayer
+    private lateinit var player: ExoPlayer
+
+    // Fullscreen info
+    private var isFullscreen = false
+
     @SuppressLint("SetJavaScriptEnabled", "SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reproductor)
 
+        val fullscreenButton: ImageView = exoPlayer.findViewById(R.id.exo_fullscreen_custom)
+        val fullscreenButton2 = fullscreenPlayer.findViewById<ImageView>(R.id.exo_fullscreen_custom)
+
         videoView.webChromeClient = WebClient()
         videoView.settings.javaScriptEnabled = true
         videoView.settings.allowContentAccess = true
@@ -91,6 +102,8 @@ class ReproductorActivity : AppCompatActivity() {
         showMoreBtn.setOnClickListener { getDescription() }
         shareLayout.setOnClickListener { shareIntent() }
         reportLayout.setOnClickListener { reportIntent() }
+        fullscreenButton.setOnClickListener { toggleFullscreen() }
+        fullscreenButton2.setOnClickListener { toggleFullscreen() }
 
         userImg.setOnClickListener {
             val intent = Intent(this, ChannelActivity::class.java)
@@ -103,7 +116,7 @@ class ReproductorActivity : AppCompatActivity() {
             val video = this.clientVideo.getVideo(this.video.uuid)
             runOnUiThread {
                 try {
-                    val player = ExoPlayer.Builder(this.baseContext).build()
+                    player = ExoPlayer.Builder(this.baseContext).build()
                     exoPlayer.player = player
 
                     println("----- video --------")
@@ -114,7 +127,7 @@ class ReproductorActivity : AppCompatActivity() {
                     // Prepare the player.
                     player.prepare()
                     // Start the playback.
-                    player.play()
+                    // player.play()
                 } catch(err: Exception) {
                     err.printStackTrace()
                 }
@@ -332,6 +345,43 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
+    private fun toggleFullscreen () {
+        if (isFullscreen) {
+            nonFullScreen.visibility = View.VISIBLE
+            fullScreenExo.visibility = View.GONE
+            exoPlayer.player = player
+            fullscreenPlayer.player = null
+            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+
+            val attrs = window.attributes
+            attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
+            attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON.inv()
+            window.attributes = attrs
+            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+
+            isFullscreen = false
+        }
+        else {
+            val matchParent = WindowManager.LayoutParams.MATCH_PARENT
+
+            nonFullScreen.visibility = View.GONE
+            fullScreenExo.visibility = View.VISIBLE
+
+            exoPlayer.player = null
+            fullscreenPlayer.player = player
+
+            setFullscreen(window)
+
+            requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+            isFullscreen = true
+        }
+    }
+
+    override fun onDestroy() {
+        player.release()
+        super.onDestroy()
+    }
+
     internal inner class WebClient: WebChromeClient() {
         private var mCustomView: View? = null
         private var mCustomViewCallback: WebChromeClient.CustomViewCallback? = null
diff --git a/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
index fd99d08..8ab458f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
@@ -7,7 +7,7 @@ fun mapSeconds (inputSeconds: Int): String {
 
     if (minutes > 60) {
         hours = minutes / 60
-        minutes = minutes % 60
+        minutes %= 60
     }
 
     var result = minutes.toString().padStart(2, '0') + ":" + seconds.toString().padStart(2, '0')
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index 5062faa..f3f4a0f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -69,6 +69,26 @@ class VideoModel(
                     }
                     data.endArray()
                 }
+                "files" -> {
+                    if (streamingData === null) {
+                        data.beginArray()
+                        if (data.hasNext()) {
+                            data.beginObject()
+                            while (data.hasNext()) {
+                                val key2 = data.nextName()
+                                when (key2.toString()) {
+                                    "fileDownloadUrl"->{
+                                        streamingData = StreamingModel()
+                                        streamingData!!.playlistUrl = data.nextString()
+                                    }
+                                    else -> data.skipValue()
+                                }
+                            }
+                            data.endObject()
+                        }
+                        data.endArray()
+                    }
+                }
                 "channel"->{
                     data.beginObject()
                     while (data.hasNext()){
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index c9fd31b..ae84106 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -10,11 +10,39 @@
         android:id="@+id/fullScreen"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:visibility="gone" />
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/fullScreenExo"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" >
+        <androidx.media3.ui.PlayerView
+            android:id="@+id/fullscreenPlayer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#000"
+            app:use_controller="true"
+            app:controller_layout_id="@layout/custom_player_controls"
+            app:player_layout_id="@layout/exo_player_view"/>
+    </RelativeLayout>
+
 
     <ScrollView
         android:id="@+id/nonFullScreen"
@@ -38,7 +66,8 @@
                 android:id="@+id/videoView"
                 android:layout_width="match_parent"
                 android:layout_height="222dp"
-                android:layout_weight="1" />
+                android:layout_weight="1"
+                android:visibility="gone" />
 
             <androidx.media3.ui.PlayerView
                 android:id="@+id/exoPlayer"
diff --git a/app/src/main/res/layout/custom_player_controls.xml b/app/src/main/res/layout/custom_player_controls.xml
index 357dcc1..0da9007 100644
--- a/app/src/main/res/layout/custom_player_controls.xml
+++ b/app/src/main/res/layout/custom_player_controls.xml
@@ -84,20 +84,12 @@
                 android:layout_weight="2" />
 
             <ImageView
-                android:id="@+id/exo_fullscreen"
+                android:id="@+id/exo_fullscreen_custom"
                 android:layout_width="42dp"
                 android:layout_height="42dp"
                 android:src="@drawable/ic_fullscreen_24"
                 android:layout_weight="0"
                 android:layout_gravity="center"/>
-
-            <ImageView
-                android:id="@+id/exo_fullscreen2"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_gravity="center"
-                android:layout_weight="0"
-                android:src="@drawable/ic_fullscreen_24" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index db6d5d6..fcccb02 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -23,7 +23,7 @@
             <ImageView
                 android:id="@+id/thumb"
                 android:layout_width="match_parent"
-                android:layout_height="230dp"
+                android:layout_height="222dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"