Updates of descriptions and screenshots

Fix video preview sizes
Merge branch 'feature/add-exo-player' into 'master'
2024-03-28 19:06:38 -06:00 · 2024-03-28 18:41:49 -06:00 · 2024-03-28 23:58:25 +00:00 · 2024-03-28 17:29:32 -06:00 · 2024-03-27 21:31:41 -06:00 · 2024-03-27 20:57:17 -06:00
82 changed files with 1321 additions and 558 deletions
--- a/README.md
+++ b/README.md
@ -1,20 +1,20 @@
 # P2Play
-P2Play is an Android Application for Peertube.
+P2Play is an unoficial Peertube android application.

 [What is Peertube?](https://github.com/Chocobozzz/PeerTube/)

+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/org.libre.agosto.p2play/)
+
 ## Screenshots

-![screenshot](screenshots/screenshot.png)
-![screenshot](screenshots/screenshot2.png)
-![screenshot](screenshots/screenshot3.png)
-![screenshot](screenshots/screenshot4.png)
-![screenshot](screenshots/screenshot5.png)
-![screenshot](screenshots/screenshot6.png)
-
-
-## Documentation
-Comming soon!
+<img src="metadata/en-US/images/phoneScreenshots/1.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/2.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/3.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/4.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/5.jpg" alt="Screenshot" width="14%">/
+<img src="metadata/en-US/images/phoneScreenshots/6.jpg" alt="Screenshot" width="14%"/>

 ## Realeases (apk's)

@ -37,33 +37,40 @@ Comming soon!
 - Share videos
 - Report videos
 - Peertube profiles
+- Day/Night theme

-## What to do? (in next version)
+## What to do? (on incomming updates)

+- Playlists
+- Manage subscriptions
+- Better commentaries
+- Account channels view
 - Notifications
- Upload videos

 ## Demostrations

-Demostration P2play Beta 0.2: https://peertube.video/videos/watch/730fa68e-32c4-4cdb-a7bb-1a819c9d3a46
+P2play beta 0.6.0: https://fediverse.tv/w/suFPkm9zJstSrQU7WmVARv

-Demostration P2Play Beta 0.1: https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8
+**Dead links**

-[Spanish] Demostracion P2Play Beta 0.1: https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848
+~~Demostration P2play Beta 0.2: https://peertube.video/videos/watch/730fa68e-32c4-4cdb-a7bb-1a819c9d3a46~~
+
+~~Demostration P2Play Beta 0.1: https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8~~
+
+~~[Spanish] Demostracion P2Play Beta 0.1: https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848~~

 ## Contact
-You can follow our accounts for get news and contact with the developers.
+You can follow our accounts to get news and contact with the developer(s).

 - WriteFreely (ActivityPub): https://personaljournal.ca/p2play/
- Peertube Channel: https://peertube.video/video-channels/90df4e5f-c834-4720-a5d7-c9faa0af0af5/videos

 ## About
-P2Play is made in Android Studio with Kotlin code.
+P2Play is made in Android Studio with Kotlin languaje.

 ![kotlin](https://weblizar.com/blog/wp-content/uploads/2017/11/Kotlin-A-New-Programming-Platform-For-Android-Developers.png)

 ### Developers
- Ivan Agosto: [https://nerdica.net/profile/agosto182](https://gnusocial.ml/agosto182)
+- Ivan Agosto: [https://mast.lat/@agosto182](https://mast.lat/@agosto182)

 ## License
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,19 +1,20 @@
-apply plugin: 'com.android.application'

-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-android-extensions"
+}

 android {
-    compileSdkVersion 27
+    compileSdkVersion 34
    defaultConfig {
        applicationId "org.libre.agosto.p2play"
-        minSdkVersion 21
-        //noinspection OldTargetApi
-        targetSdkVersion 27
-        versionCode 7
-        versionName "0.5.1"
+        minSdkVersion 26
+        targetSdkVersion 32
+        versionCode 9
+        versionName "0.6.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        release {
@ -21,26 +22,31 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
-    buildToolsVersion '28.0.3'
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }
    lintOptions {
        checkReleaseBuilds false
        abortOnError false
    }
+    namespace 'org.libre.agosto.p2play'
 }

 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    implementation 'com.android.support:support-v4:27.1.0'
-    implementation 'com.android.support:design:27.1.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.android.support:appcompat-v7:23.2.0'
+    implementation 'com.google.android.material:material:1.6.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'
+    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'
 }
--- a/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
@ -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)
-    }
-}
--- 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" />
@ -11,33 +10,42 @@
        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:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
        <activity
            android:name=".SplashActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="true">
            <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"
+            android:exported="false" />
        <activity
            android:name=".MainActivity"
-            android:theme="@style/P2playTheme.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar"
+            android:exported="false" />
        <activity
            android:name=".ReproductorActivity"
            android:configChanges="orientation|screenSize"
            android:hardwareAccelerated="true"
-            android:theme="@style/P2playTheme.noBar" />
-        <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:label="@string/title_activity_settings"
+            android:theme="@style/Theme.P2play"
+            android:exported="false"/>
    </application>

 </manifest>
--- 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() {
--- 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
--- 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.*
@ -31,7 +31,7 @@ class ChannelActivity : AppCompatActivity() {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_channel)

-        channelId = this.intent.extras.getString("channel")
+        channelId = this.intent.extras?.getString("channel")!!

        viewManager = LinearLayoutManager(this)

--- 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
@ -35,7 +33,7 @@ class HostActivity : AppCompatActivity() {
            if(lastHost!=host){
                _db.logout()
                ManagerSingleton.logout()
-                getKeys(host)
+                getKeys(host!!)
            }else{
                ManagerSingleton.url=host
                startApp()
--- 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

@ -25,8 +24,8 @@ class LoginActivity : AppCompatActivity() {
        _db = Database(this)

        settings = PreferenceManager.getDefaultSharedPreferences(this)
-        client_id = settings.getString("client_id", "")
-        client_secret = settings.getString("client_secret", "")
+        client_id = settings.getString("client_id", "")!!
+        client_secret = settings.getString("client_secret", "")!!

        registerActionBtn.setOnClickListener { startActivity(Intent(this, RegisterActivity::class.java)) }
        loginBtn.setOnClickListener { tryLogin() }
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@ -2,24 +2,25 @@ 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.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 android.view.WindowManager
+
+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
@ -89,8 +90,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
            adapter = viewAdapter

            this.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                    super.onScrolled(recyclerView, dx, dy)
+                    // super.onScrolled(recyclerView!!, dx, dy)

                    if(!swipeContainer.isRefreshing){
                        if(!canScrollVertically(1)){
@ -100,7 +102,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                }
            })
        }
-        // swipeContainer.isRefreshing = false
+        swipeContainer.isRefreshing = false
    }

    private fun addVideos(videos: ArrayList<VideoModel>){
@ -250,10 +252,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()
@ -362,16 +364,18 @@ 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

            }
+        } else {
+            nav_view.menu.findItem(R.id.ml).isVisible = false
        }
    }

@ -380,7 +384,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)
@ -390,7 +394,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte

        this.refresh()
        ManagerSingleton.Toast(getString(R.string.logout_msg), this)
-
+        setSideData()
    }

    private fun loadMore(){
--- 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
@ -22,8 +22,8 @@ class RegisterActivity : AppCompatActivity() {
        setTitle(R.string.registerActionBtn)

        settings = PreferenceManager.getDefaultSharedPreferences(this)
-        client_id = settings.getString("client_id", "")
-        client_secret = settings.getString("client_secret", "")
+        client_id = settings.getString("client_id", "")!!
+        client_secret = settings.getString("client_secret", "")!!

        registerBtn.setOnClickListener { registerUser() }
    }
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@ -1,41 +1,40 @@
 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
 import android.graphics.BitmapFactory
+import android.media.Image
 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 android.widget.ImageView
+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
 import kotlinx.android.synthetic.main.activity_reproductor.*
 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

-
-
-
-
@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()
@ -46,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
@ -61,7 +69,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
@ -94,19 +102,44 @@ 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)
-            intent.putExtra("channel", video.getAccount())
+            intent.putExtra("channel", video.getChannel())
            startActivity(intent)
        }
+
+
+        AsyncTask.execute {
+            val video = this.clientVideo.getVideo(this.video.uuid)
+            runOnUiThread {
+                try {
+                    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() {
        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)
@ -120,7 +153,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)
@ -233,7 +266,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)
@ -312,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
@ -369,12 +439,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
            }
--- 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
@ -25,7 +25,7 @@ class SplashActivity : AppCompatActivity() {
        settings = PreferenceManager.getDefaultSharedPreferences(this)

        ManagerSingleton.nfsw = settings.getBoolean("show_nfsw", false)
-        ManagerSingleton.videos_count = settings.getString("videos_count", "15").toInt()
+        ManagerSingleton.videos_count = settings.getString("videos_count", "15")!!.toInt()


        val host = settings.getString("hostP2play","")
@ -59,8 +59,8 @@ class SplashActivity : AppCompatActivity() {


                if (token.status == 1 && user.status == 1) {
-                    val client_id = settings.getString("client_id", "")
-                    val client_secret = settings.getString("client_secret", "")
+                    val client_id = settings.getString("client_id", "")!!
+                    val client_secret = settings.getString("client_secret", "")!!

                    val newToken = client.refreshToken(token, client_id, client_secret)

--- 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,18 @@
 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 kotlinx.android.synthetic.main.view_video.view.userImg
 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>) :
@ -51,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)
    }
@ -72,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)
--- 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,18 @@
 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.helpers.mapSeconds
 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>() {
@ -28,26 +22,18 @@ 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
-
-        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
-        }
+    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)
-    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
@ -59,17 +45,18 @@ 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.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)
        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 {
            val intent = Intent(holder.context, ChannelActivity::class.java)
-            intent.putExtra("channel", myDataset[position].getAccount())
+            intent.putExtra("channel", myDataset[position].getChannel())
            holder.context.startActivity(intent)
        }

@ -79,20 +66,16 @@ 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
+
+        if (myDataset[position].isLive) {
+            holder.isLive.visibility = View.VISIBLE
+        }
    }

    // Return the size of your dataset (invoked by the layout manager)
@ -109,5 +92,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)
+    }
 }
--- 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,13 +10,11 @@ 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

-        con.setRequestProperty("User-Agent", "P2play/0.1")
+        con.setRequestProperty("User-Agent", "P2play/0.5.3")
        con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
        con.setRequestProperty("Accept", "*/*")

@ -67,5 +65,4 @@ open class Client {
        return keys
    }

-
 }
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@ -1,7 +1,6 @@
 package org.libre.agosto.p2play.ajax

 import android.util.JsonReader
-import android.util.JsonToken
 import org.libre.agosto.p2play.ManagerSingleton
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.InputStreamReader
@ -30,12 +29,11 @@ class Videos: Client() {
        return videos
    }

-    private fun getVideos(start:Int, sort:String = "-publishedAt", filter:String = ""):ArrayList<VideoModel>{
+    private fun getVideos(start:Int, sort:String = "-publishedAt", isLocal:Boolean = false):ArrayList<VideoModel>{
        val nsfw = ManagerSingleton.nfsw
        val count = ManagerSingleton.videos_count
-        var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw"
-        if(filter != "")
-            params+="&filter=$filter"
+        var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw&isLocal=$isLocal"
+
        val con = this._newCon("videos?$params","GET")
        var videos = arrayListOf<VideoModel>()
        try {
@ -65,7 +63,7 @@ class Videos: Client() {
    }

    fun getLocalVideos(start:Int = 0): ArrayList<VideoModel>{
-        return this.getVideos(start,"-publishedAt", "local")
+        return this.getVideos(start,"-publishedAt", true)
    }

    fun myVideos(token: String, start: Int = 0): ArrayList<VideoModel>{
@ -99,6 +97,10 @@ class Videos: Client() {
                val data = JsonReader(response)
                videos = parseVideos(data)
                data.close()
+            } else {
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
+                print(data)
            }
        } catch(err:Exception){
            err.printStackTrace()
@ -198,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
+    }
 }
--- a/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
+++ 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 %= 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
+}
--- a/app/src/main/java/org/libre/agosto/p2play/helpers/setFullscreen.kt
+++ 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
+}
--- 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"
+    }
+
 }
--- a/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/StreamingModel.kt
@ -0,0 +1,26 @@
+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()
+            }
+        }
+        data.endObject()
+    }
+}
--- 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,21 +5,23 @@ 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 getAccount(): String {
+    fun getChannel(): String {
        return "$nameChannel@$userHost"
    }

@ -55,6 +57,38 @@ 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()
+                }
+                "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()){
--- a/app/src/main/res/drawable/ic_forward_10_24.xml
+++ 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>
--- a/app/src/main/res/drawable/ic_fullscreen_24.xml
+++ 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>
--- a/app/src/main/res/drawable/ic_pause_24.xml
+++ 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>
--- a/app/src/main/res/drawable/ic_play_arrow_24.xml
+++ 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>
--- a/app/src/main/res/drawable/ic_replay_10_24.xml
+++ 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>
--- a/app/src/main/res/drawable/live_shape.xml
+++ 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>
--- a/app/src/main/res/drawable/round_text.xml
+++ 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>
--- 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"
@ -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" />

@ -135,7 +133,11 @@
                android:text="@string/aboutLicense"
                android:textAlignment="textStart"
                android:textSize="16sp" />
+
+            <androidx.legacy.widget.Space
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
        </LinearLayout>
    </ScrollView>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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"
@ -141,14 +141,13 @@
                    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"
-                android:scrollbars="none" />
+                android:layout_height="wrap_content" />

        </LinearLayout>
    </ScrollView>


-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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,38 +29,46 @@
                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
-                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">

-            <Button
+                <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>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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"
@ -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,62 +39,64 @@
                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>

    </FrameLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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>
--- 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"
@ -10,11 +10,39 @@
        android:id="@+id/fullScreen"
        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:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:visibility="gone" />
+        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"
@ -37,17 +65,24 @@
            <WebView
                android:id="@+id/videoView"
                android:layout_width="match_parent"
-                android:layout_height="270dp"
-                android:layout_weight="1">
+                android:layout_height="222dp"
+                android:layout_weight="1"
+                android:visibility="gone" />

-            </WebView>
+            <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"
                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 +94,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 +102,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 +129,7 @@
                        android:layout_weight="1"
                        android:text="@string/likeBtn"
                        android:textAlignment="center" />
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>

                <LinearLayout
                    android:id="@+id/dislikeLayout"
@ -166,7 +201,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" />
@ -179,7 +214,7 @@
                        android:text="@string/shareBtn"
                        android:textAlignment="center" />
                </LinearLayout>
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>

            <LinearLayout
                android:layout_width="match_parent"
@ -196,13 +231,13 @@
                    android:adjustViewBounds="false"
                    android:cropToPadding="false"
                    android:padding="5dp"
-                    android:scaleType="centerInside"
+                    android:scaleType="fitCenter"
                    app:srcCompat="@drawable/default_avatar" />

                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="3"
                    android:orientation="vertical">

                    <TextView
@ -210,7 +245,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,14 +257,14 @@

                </LinearLayout>

-                <Button
+                <com.google.android.material.button.MaterialButton
                    android:id="@+id/subscribeBtn"
-                    style="@style/Widget.AppCompat.Button.Colored"
+                    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>

@ -257,9 +291,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 +306,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 +319,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"
@ -308,28 +342,33 @@
                        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>

-                <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 +379,4 @@

        </LinearLayout>
    </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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"
@ -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" />

@ -55,4 +54,4 @@

        </LinearLayout>
    </FrameLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@ -1,25 +1,22 @@
 <?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:layout_height="wrap_content">

-        <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:layout_height="?attr/actionBarSize"/>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

    <include layout="@layout/content_main" />

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- 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>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/custom_player_controls.xml
+++ b/app/src/main/res/layout/custom_player_controls.xml
@ -0,0 +1,99 @@
+<?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_custom"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:src="@drawable/ic_fullscreen_24"
+                android:layout_weight="0"
+                android:layout_gravity="center"/>
+        </LinearLayout>
+    </LinearLayout>
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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>
--- 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">
@ -19,6 +19,7 @@
            android:layout_height="60dp"
            android:layout_weight="1"
            android:contentDescription="@string/app_name"
+            android:scaleType="fitCenter"
            app:srcCompat="@drawable/default_avatar" />

        <LinearLayout
@ -47,4 +48,4 @@
                android:maxLines="10" />
        </LinearLayout>
    </LinearLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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"
@ -14,27 +14,70 @@
        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="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/thumb"
+                android:layout_width="match_parent"
+                android:layout_height="205dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                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/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"
+                android:layout_height="19dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="16dp"
+                android:background="@drawable/round_text"
+                android:ems="10"
+                android:paddingHorizontal="3dp"
+                android:text="00:00"
+                android:textAlignment="center"
+                android:textColor="?attr/colorOnSecondary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>

        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="63dp"
+            android:layout_height="55dp"
            android:orientation="horizontal">

            <ImageView
                android:id="@+id/userImg"
-                android:layout_width="140dp"
+                android:layout_width="120dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:adjustViewBounds="false"
                android:clickable="false"
                android:cropToPadding="false"
                android:padding="5dp"
-                android:scaleType="centerInside"
+                android:scaleType="fitCenter"
                app:srcCompat="@drawable/default_avatar" />

            <LinearLayout
@ -50,7 +93,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"
@ -64,10 +108,10 @@

    </LinearLayout>

-    <Space
+    <androidx.legacy.widget.Space
        android:layout_width="match_parent"
-        android:layout_height="15dp"
+        android:layout_height="5dp"
        android:layout_weight="1"
        app:layout_constraintTop_toBottomOf="@+id/linearLayout" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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
--- 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 -->
@ -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>
@ -47,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 -->
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="comming">In arrivo!</string>
+    <string name="charging">Caricamento...</string>
+    <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">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>
+    <string name="okButton">Accetta</string>
+    <string name="errorMsg">Errore, prova di nuovo</string>
+    <string name="finallyMsg">Istanza salvata</string>
+    <string name="loginInfo">Accedere o registrare un nuovo account</string>
+    <string name="userTxt">Utente:</string>
+    <string name="passwordTxt">Password:</string>
+    <string name="loginBtn">Accedere ora</string>
+    <string name="registerActionBtn">Creare un account</string>
+    <string name="loginSuccess_msg">Accesso effettuato</string>
+    <string name="loginError_msg">È stato rilevato un errore</string>
+    <string name="loginFailed_msg">Credenziali invalide</string>
+    <string name="registerSuccess_msg">Registrazione effettuata</string>
+    <string name="registerError_msg">È stato rilevato un errore</string>
+    <string name="registerFailed_msg">Dati non validi</string>
+    <string name="registerBtn">Registrarsi ora</string>
+    <string name="emailTxt">Email:</string>
+    <string name="title_subscriptions">Iscrizioni</string>
+    <string name="title_recent">Recenti</string>
+    <string name="title_popular">Popolari</string>
+    <string name="title_trending">Di tendenza</string>
+    <string name="title_local">Video locali</string>
+    <string name="title_myVideos">I miei video</string>
+    <string name="view_text">visualizzazioni</string>
+    <string name="timeSec_text">secondi</string>
+    <string name="timeMin_text">minuti</string>
+    <string name="timeHrs_text">ore</string>
+    <string name="nav_header_title">Accedere</string>
+    <string name="nav_subscriptions">Iscrizioni</string>
+    <string name="logout_msg">Ti sei disconnesso</string>
+    <string name="nav_popular">Popolari</string>
+    <string name="nav_trending">Di tendenza</string>
+    <string name="nav_recent">Recenti</string>
+    <string name="nav_local">Locali</string>
+    <string name="nav_about">Informazioni</string>
+    <string name="nav_history">Cronologia</string>
+    <string name="nav_menu_myLibrary">La mia libreria</string>
+    <string name="nav_menu_videos">Video</string>
+    <string name="nav_menu_more">Di più</string>
+    <string name="nav_likes">Più piaciuti</string>
+    <string name="action_settings">Impostazioni</string>
+    <string name="action_login">Accedere</string>
+    <string name="action_logout">Uscire</string>
+    <string name="descriptionTxt">Descrizione:</string>
+    <string name="commentariesTxt">Commenti:</string>
+    <string name="commentHolder">Lascia un commento</string>
+    <string name="subscribeBtn">Iscriversi</string>
+    <string name="likeBtn">Mi piace</string>
+    <string name="dislikeBtn">Non mi piace</string>
+    <string name="shareBtn">Condividere</string>
+    <string name="reportBtn">Segnalare</string>
+    <string name="unSubscribeBtn">Annulla iscrizione</string>
+    <string name="commentaryText">Commentare</string>
+    <string name="showMore">Mostra di più</string>
+    <string name="subscribeMsg">Ti sei iscritto a questo canale</string>
+    <string name="rateMsg">Hai valutato il video</string>
+    <string name="unSubscribeMsg">Hai annullato l\'iscrizione a questo canale</string>
+    <string name="makedCommentaryMsg">Hai commentato questo video</string>
+    <string name="errorCommentaryMsg">È stato rilevato un errore, riprovare</string>
+    <string name="emptyCommentaryMsg">Per favore, lascia prima un commento</string>
+    <string name="title_activity_settings">Impostazioni</string>
+    <string name="pref_header_general">Generali</string>
+    <string name="pref_nfsw_title">Contenuti NSFW</string>
+    <string name="pref_nfsw_description">Se attivo, può mostrare contenuti sensibili o per adulti.</string>
+    <string name="pref_hostname_title">Istanza Peertube</string>
+    <string name="pref_message_exit">Riaprire l\'app per rendere effettive le modifiche</string>
+    <string name="pref_videos_count_title">Video per pagina</string>
+    <string name="followersIndicator">Seguaci:</string>
+    <string name="hostIndicator">Host:</string>
+    <string name="reportDialog">Motivo per la segnalazione di questo video:</string>
+    <string name="reportDialogMsg">Hai segnalato il video</string>
+
+</resources>
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@ -0,0 +1,23 @@
+
+<resources>
+    <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>
+        <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="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">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
--- 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>
@ -10,4 +10,69 @@
    <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>
+    <color name="md_theme_light_onPrimary">#FFFFFF</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">#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">#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">#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">#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">#9F4200</color>
+    <color name="md_theme_light_outlineVariant">#D7C2B9</color>
+    <color name="md_theme_light_scrim">#000000</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">#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">#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">#FFB692</color>
+    <color name="md_theme_dark_outlineVariant">#52443D</color>
+    <color name="md_theme_dark_scrim">#000000</color>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -9,14 +9,13 @@
    <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>
    <string name="aboutLabel">About P2Play</string>
-    <string name="aboutText">P2Play is an Android application unnoficial of PeerTube. You can watch and contribute with the code on GitLab:</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 -->
@ -25,6 +24,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>
@ -35,10 +35,10 @@
    <string name="loginBtn">Login now</string>
    <string name="registerActionBtn">Create new account</string>
    <!-- Toast msg -->
-    <string name="loginSuccess_msg">You are logged</string>
+    <string name="loginSuccess_msg">You are now logged in</string>
    <string name="loginError_msg">An error has occurred</string>
    <string name="loginFailed_msg">Invalid credentials</string>
-    <string name="registerSuccess_msg">You are registered</string>
+    <string name="registerSuccess_msg">You are now registered</string>
    <string name="registerError_msg">An error has occurred</string>
    <string name="registerFailed_msg">Invalid data</string>
    <!-- Register msg -->
@ -59,8 +59,9 @@
    <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 disconnected</string>
+    <string name="logout_msg">You are now disconnected</string>
    <!-- End Main strings -->
    <!-- Start Menu strings -->
    <string name="nav_subscriptions">Subscriptions</string>
@ -82,8 +83,8 @@
    <!-- End MiniMenu strings -->
    <!-- Start Reproductor strings -->
    <string name="descriptionTxt">Description:</string>
-    <string name="commentariesTxt">Commentaries:</string>
-    <string name="commentHolder">Make a commentary</string>
+    <string name="commentariesTxt">Comments:</string>
+    <string name="commentHolder">Make a comment</string>
    <!-- Actions -->
    <string name="subscribeBtn">Subscribe</string>
    <string name="likeBtn">Like</string>
@ -94,10 +95,10 @@
    <string name="commentaryText">Comment</string>
    <string name="showMore">Show more</string>
    <!-- Messages -->
-    <string name="subscribeMsg">You are subscribed to this channel</string>
-    <string name="rateMsg">You are rated the video</string>
-    <string name="unSubscribeMsg">You are unsubscribed to this channel</string>
-    <string name="makedCommentaryMsg">You are commented this video</string>
+    <string name="subscribeMsg">You have subscribed to this channel</string>
+    <string name="rateMsg">You have rated the video</string>
+    <string name="unSubscribeMsg">You have unsubscribed from this channel</string>
+    <string name="makedCommentaryMsg">You have commented on this video</string>
    <string name="errorCommentaryMsg">An error has occurred, try again</string>
    <string name="emptyCommentaryMsg">Please make a comment first</string>
    <!-- End Reproductor strings -->
@ -106,10 +107,10 @@
    <!-- Example General settings -->
    <string name="pref_header_general">General</string>
    <string name="pref_nfsw_title">NFSW content</string>
-    <string name="pref_nfsw_description">If is active may show the adult and sensitive content.</string>
+    <string name="pref_nfsw_description">When active, it may show adult and sensitive contents.</string>
    <string name="pref_hostname_title">Peertube instance</string>
    <string name="pref_hostname_error" translatable="false">-</string>
-    <string name="pref_message_exit">Restart app to apply changes</string>
+    <string name="pref_message_exit">Restart the app to apply changes</string>
    <string name="pref_videos_count_title">Videos per page</string>
    <!-- End Settings strings -->
    <!-- Start Channel strings -->
@ -117,7 +118,7 @@
    <string name="hostIndicator">Host:</string>
    <!-- End Channel strings -->
    <!-- Start Prompt string -->
-    <string name="reportDialog">Reason for report video:</string>
-    <string name="reportDialogMsg">You are reported the video</string>
+    <string name="reportDialog">Reason to report this video:</string>
+    <string name="reportDialogMsg">You reported the video</string>
    <!-- End Prompt strings -->
 </resources>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -0,0 +1,23 @@
+
+<resources>
+    <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>
+        <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="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">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
--- 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"
--- 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"
--- a/build.gradle
+++ b/build.gradle
@ -1,15 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.21'
    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.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
    }
@ -18,7 +17,7 @@ buildscript {
 allprojects {
    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }
 }

--- a/fastlane/metadata/en-US/images/phoneScreenshots/1.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/1.png
--- a/fastlane/metadata/en-US/images/phoneScreenshots/2.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/2.png
--- a/fastlane/metadata/en-US/images/phoneScreenshots/3.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/3.png
--- a/fastlane/metadata/en-US/images/phoneScreenshots/4.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/4.png
--- a/fastlane/metadata/en-US/images/phoneScreenshots/5.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/5.png
--- a/fastlane/metadata/en-US/images/phoneScreenshots/6.png
+++ b/fastlane/metadata/en-US/images/phoneScreenshots/6.png
--- a/fastlane/metadata/es/full_description.txt
+++ b/fastlane/metadata/es/full_description.txt
@ -1,20 +0,0 @@
-P2Play es una aplicacion android para Peertube.
-
-¿Que es Peertube? https://github.com/Chocobozzz/PeerTube/
-
-Caracteristicas
-* Show recent, popular and local list of videos.
-* Reproduce videos
-* Login and register in your instance
-* Show uploaded videos
-* Subscribe to accounts
-* Show your subscription videos
-* Show your history
-* Rate videos
-* Show and make commentaries
-* Splash screen
-* Search videos
-* Infinite scroll
-* Share videos
-* Report videos
-* Peertube profiles
--- a/gradle.properties
+++ b/gradle.properties
@ -7,6 +7,12 @@
 # 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
+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
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Thu Oct 17 20:10:56 CDT 2019
+#Mon Mar 18 13:17:32 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
--- a/286
+++ b/286
@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@ -89,84 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi

+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -45,28 +64,14 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/metadata/en-US/changelogs/8.txt
+++ b/metadata/en-US/changelogs/8.txt
@ -0,0 +1,6 @@
+* Update dependecies
+* Compile SDK updated to version 30
+* Min SDK updated to version 26
+* Target SDK updated to version 28
+* Back to road baby
+* Comming soon!
--- a/metadata/en-US/changelogs/9.txt
+++ b/metadata/en-US/changelogs/9.txt
@ -0,0 +1,5 @@
+* Updated to androidx libraries
+* Day/Night theme
+* Exoplayer added
+* Material2 implemented
+* Obviusly bug fixes
--- a/fastlane/metadata/en-US/full_description.txt
+++ b/fastlane/metadata/en-US/full_description.txt
@ -1,20 +1,16 @@
-P2Play is an Android Application for Peertube.
-
-What is Peertube? https://github.com/Chocobozzz/PeerTube/
+P2Play is an Unofficial Android client for Peertube.

 Features
 * Show recent, popular and local list of videos.
 * Reproduce videos
-* Login and register in your instance
+* Login in your instance
 * Show uploaded videos
 * Subscribe to accounts
 * Show your subscription videos
 * Show your history
 * Rate videos
 * Show and make commentaries
-* Splash screen
 * Search videos
-* Infinite scroll
 * Share videos
 * Report videos
-* Peertube profiles
+* Peertube channels
--- a/fastlane/metadata/en-US/images/icon.png
+++ b/fastlane/metadata/en-US/images/icon.png
--- a/metadata/en-US/images/phoneScreenshots/1.jpg
+++ b/metadata/en-US/images/phoneScreenshots/1.jpg
--- a/metadata/en-US/images/phoneScreenshots/2.jpg
+++ b/metadata/en-US/images/phoneScreenshots/2.jpg
--- a/metadata/en-US/images/phoneScreenshots/3.jpg
+++ b/metadata/en-US/images/phoneScreenshots/3.jpg
--- a/metadata/en-US/images/phoneScreenshots/4.jpg
+++ b/metadata/en-US/images/phoneScreenshots/4.jpg
--- a/metadata/en-US/images/phoneScreenshots/5.jpg
+++ b/metadata/en-US/images/phoneScreenshots/5.jpg
--- a/metadata/en-US/images/phoneScreenshots/6.jpg
+++ b/metadata/en-US/images/phoneScreenshots/6.jpg
--- a/metadata/en-US/images/phoneScreenshots/7.jpg
+++ b/metadata/en-US/images/phoneScreenshots/7.jpg
--- a/metadata/en-US/images/phoneScreenshots/8.jpg
+++ b/metadata/en-US/images/phoneScreenshots/8.jpg
--- a/fastlane/metadata/en-US/short_description.txt
+++ b/fastlane/metadata/en-US/short_description.txt
--- a/fastlane/metadata/en-US/title.txt
+++ b/fastlane/metadata/en-US/title.txt
--- a/metadata/es/full_description.txt
+++ b/metadata/es/full_description.txt
@ -0,0 +1,16 @@
+P2Play es una aplicacion no-oficial android para Peertube.
+
+Características
+* Mostrar la lista de vídeos recientes, populares y locales.
+* Reproducir vídeos
+* Iniciar sesión en su instancia
+* Mostrar vídeos subidos
+* Suscribirse a cuentas
+* Mostrar tus vídeos suscritos
+* Mostrar su historial
+* Valorar vídeos
+* Mostrar y hacer comentarios
+* Buscar vídeos
+* Compartir vídeos
+* Denunciar vídeos
+* Canales Peertube
--- a/fastlane/metadata/es/short_description.txt
+++ b/fastlane/metadata/es/short_description.txt
--- a/fastlane/metadata/es/title.txt
+++ b/fastlane/metadata/es/title.txt
--- a/readme.html
+++ b/readme.html
@ -0,0 +1,64 @@
+<h1>P2Play</h1>
+<p>P2Play is an unoficial Peertube android application.</p>
+<p><a href="https://github.com/Chocobozzz/PeerTube/">What is Peertube?</a></p>
+<p><a href="https://f-droid.org/packages/org.libre.agosto.p2play/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80"></a></p>
+<h2>Screenshots</h2>
+<p><img src="metadata/en-US/images/phoneScreenshots/1.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/2.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/3.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/4.jpg" alt="Screenshot" width="14%"/>
+<img src="metadata/en-US/images/phoneScreenshots/5.jpg" alt="Screenshot" width="14%">/
+<img src="metadata/en-US/images/phoneScreenshots/6.jpg" alt="Screenshot" width="14%"/></p>
+<h2>Realeases (apk's)</h2>
+<p><a href="https://gitlab.com/agosto182/p2play/tags">All realeases are here</a></p>
+<h2>Features</h2>
+<ul>
+<li>Show recent, popular and local list of videos.</li>
+<li>Reproduce videos</li>
+<li>Login and register in your instance</li>
+<li>Show uploaded videos</li>
+<li>Subscribe to accounts</li>
+<li>Show your subscripcion videos</li>
+<li>Show your history</li>
+<li>Rate videos</li>
+<li>Show and make commentaries</li>
+<li>Splash screen</li>
+<li>Search videos</li>
+<li>Infinite scroll</li>
+<li>Share videos</li>
+<li>Report videos</li>
+<li>Peertube profiles</li>
+<li>Day/Night theme</li>
+</ul>
+<h2>What to do? (on incomming updates)</h2>
+<ul>
+<li>Playlists</li>
+<li>Manage subscriptions</li>
+<li>Better commentaries</li>
+<li>Account channels view</li>
+<li>Notifications</li>
+</ul>
+<h2>Demostrations</h2>
+<p>P2play beta 0.6.0: https://fediverse.tv/w/suFPkm9zJstSrQU7WmVARv</p>
+<p><strong>Dead links</strong></p>
+<p>~~Demostration P2play Beta 0.2: https://peertube.video/videos/watch/730fa68e-32c4-4cdb-a7bb-1a819c9d3a46~~</p>
+<p>~~Demostration P2Play Beta 0.1: https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8~~</p>
+<p>~~[Spanish] Demostracion P2Play Beta 0.1: https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848~~</p>
+<h2>Contact</h2>
+<p>You can follow our accounts to get news and contact with the developer(s).</p>
+<ul>
+<li>WriteFreely (ActivityPub): https://personaljournal.ca/p2play/</li>
+</ul>
+<h2>About</h2>
+<p>P2Play is made in Android Studio with Kotlin languaje.</p>
+<p><img alt="kotlin" src="https://weblizar.com/blog/wp-content/uploads/2017/11/Kotlin-A-New-Programming-Platform-For-Android-Developers.png" /></p>
+<h3>Developers</h3>
+<ul>
+<li>Ivan Agosto: <a href="https://mast.lat/@agosto182">https://mast.lat/@agosto182</a></li>
+</ul>
+<h2>License</h2>
+<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p>
+<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.</p>
+<p>You should have received a copy of the GNU Affero General Public License along with this program. If not, see <a href="./LICENSE.md">license</a></p>
Author	SHA1	Message	Date
Ivan Agosto	ac191c04d3	Updates of descriptions and screenshots	2024-03-28 19:06:38 -06:00
Ivan Agosto	15aaae2fa1	Fix video preview sizes	2024-03-28 18:41:49 -06:00
Ivan Agosto	42be7c4f77	Merge branch 'feature/add-exo-player' into 'master' Feature/add exo player See merge request agosto182/p2play!14	2024-03-28 23:58:25 +00:00
Ivan Agosto	e022fe5e96	Add fullscreen to exoplayer	2024-03-28 17:29:32 -06:00
Ivan Agosto	1f90e21f68	Fix: Fullscreen bug	2024-03-27 21:31:41 -06:00
Ivan Agosto	c104bf32da	Merge branch 'master' into feature/add-exo-player	2024-03-27 20:57:17 -06:00
Ivan Agosto	a3cd0b92ed	Merge branch 'feature/update-video-view' into 'master' Feature/update video view See merge request agosto182/p2play!13	2024-03-28 02:54:14 +00:00
Ivan Agosto	2de1bde4cd	Feature/update video view	2024-03-28 02:54:14 +00:00
Ivan Agosto	6f0b97dbc4	Exo player first integration	2024-03-27 20:44:52 -06:00
Ivan Agosto	2fcd3b21f8	Add isLive indicator	2024-03-25 19:57:49 -06:00
Ivan Agosto	eeb20f1f9d	Update function name to the correct one	2024-03-25 19:57:22 -06:00
Ivan Agosto	0d9bd5410a	Update to sdk 32	2024-03-25 18:53:01 -06:00
Ivan Agosto	40b193a816	Update duration data to a floating text	2024-03-22 18:12:14 -06:00
Ivan Agosto	c500ba9aa4	Merge branch 'androidx' into 'master' Androidx See merge request agosto182/p2play!12	2024-03-22 23:23:16 +00:00
Ivan Agosto	35aa0fcea1	Androidx	2024-03-22 23:23:16 +00:00
Ivan Agosto	ba0a298ea9	Add new theme to Channel view	2024-03-22 17:20:42 -06:00
Ivan Agosto	815bafaee1	Update edittext to materialTextview	2024-03-22 16:55:52 -06:00
Ivan Agosto	ef5c97dce1	Finish update to androidx	2024-03-22 12:28:39 -06:00
Ivan Agosto	b6ef9b8aca	Normalize theme	2024-03-21 17:47:54 -06:00
Ivan Agosto	bf35a75877	Add material theme	2024-03-21 14:23:36 -06:00
Ivan Agosto	65e061fd25	First changes to androidx	2024-03-20 21:04:16 -06:00
Ivan Agosto	ffbc491f4c	update metadata	2024-03-19 22:04:26 -06:00
Ivan Agosto	da1d3e301e	Fix error getting local videos	2024-03-19 21:42:26 -06:00
Ivan Agosto	6784b5ebbe	Update fastlane descriptions	2024-03-18 19:24:57 -06:00
Ivan Agosto	e70108a7ae	Update README	2024-03-18 18:53:06 -06:00
Ivan Agosto	2b7d92ac37	Merge branch 'updateAndroidSDK' into 'master' Update android sdk See merge request agosto182/p2play!11	2024-03-19 00:45:04 +00:00
Ivan Agosto	4d337074fb	Update android sdk	2024-03-19 00:45:04 +00:00
Ivan Agosto	cd27342c74	Merge branch 'master' into 'master' updated strings See merge request agosto182/p2play!10	2024-03-18 17:23:49 +00:00
john j	ab1bb48dcc	updated strings	2024-03-18 17:23:49 +00:00
Ivan Agosto	0a648ef4bb	Merge branch 'master' into 'master' Add Italian translation See merge request agosto182/p2play!9	2020-06-26 21:00:36 +00:00
Igor Calì	3e41ddd367	Add Italian translation	2020-06-26 21:00:36 +00:00
Ivan Agosto	9c90983ff4	Merge branch 'patch-1' into 'master' Update README.md See merge request agosto182/p2play!8	2020-02-17 00:59:25 +00:00
Poussinou	dad366eebf	Update README.md	2020-01-11 13:42:03 +00:00