From 35aa0fcea1b72fddf3579e9db920516da2fed36d Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 23:23:16 +0000
Subject: [PATCH] Androidx

---
 app/build.gradle                              | 12 ++--
 .../agosto/p2play/ExampleInstrumentedTest.kt  | 24 -------
 app/src/main/AndroidManifest.xml              | 17 +++--
 .../org/libre/agosto/p2play/AboutActivity.kt  |  4 +-
 .../p2play/AppCompatPreferenceActivity.kt     |  8 +--
 .../libre/agosto/p2play/ChannelActivity.kt    |  6 +-
 .../org/libre/agosto/p2play/HostActivity.kt   |  4 +-
 .../org/libre/agosto/p2play/LoginActivity.kt  |  3 +-
 .../org/libre/agosto/p2play/MainActivity.kt   | 47 +++++++------
 .../libre/agosto/p2play/RegisterActivity.kt   |  2 +-
 .../agosto/p2play/ReproductorActivity.kt      | 13 ++--
 .../org/libre/agosto/p2play/SplashActivity.kt |  2 +-
 .../p2play/adapters/CommentariesAdapter.kt    | 11 +--
 .../agosto/p2play/adapters/VideosAdapter.kt   | 12 +---
 app/src/main/res/layout/activity_about.xml    | 28 ++++----
 app/src/main/res/layout/activity_channel.xml  |  9 ++-
 app/src/main/res/layout/activity_host.xml     | 36 ++++++----
 app/src/main/res/layout/activity_login.xml    | 62 ++++++++--------
 app/src/main/res/layout/activity_main.xml     |  6 +-
 .../main/res/layout/activity_reproductor.xml  | 70 ++++++++++---------
 app/src/main/res/layout/activity_splash.xml   | 11 ++-
 app/src/main/res/layout/app_bar_main.xml      | 17 ++---
 app/src/main/res/layout/content_main.xml      | 10 +--
 app/src/main/res/layout/report_dialog.xml     | 27 ++++---
 app/src/main/res/layout/view_commentary.xml   |  4 +-
 app/src/main/res/layout/view_video.xml        |  9 +--
 app/src/main/res/menu/main.xml                |  3 +-
 app/src/main/res/values-es/strings.xml        |  3 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-night/themes.xml      | 23 ++++++
 app/src/main/res/values/colors.xml            | 68 +++++++++++++++++-
 app/src/main/res/values/strings.xml           |  3 +-
 app/src/main/res/values/themes.xml            | 23 ++++++
 app/src/main/res/xml/pref_general.xml         |  2 +-
 app/src/main/res/xml/pref_headers.xml         |  7 +-
 gradle.properties                             |  3 +
 36 files changed, 342 insertions(+), 249 deletions(-)
 delete mode 100644 app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
 create mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/build.gradle b/app/build.gradle
index 089f7b7..cfda8bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,12 +36,12 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
diff --git a/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
deleted file mode 100644
index d86c903..0000000
--- a/app/src/androidTest/java/org/libre/agosto/p2play/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.libre.agosto.p2play
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("org.libre.agosto.p2play", appContext.packageName)
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4743f28..e83f1ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,33 +11,36 @@
         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" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity
             android:name=".SplashActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:theme="@style/Theme.P2play.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".HostActivity" />
+        <activity
+            android:name=".HostActivity"
+            android:theme="@style/Theme.P2play.NoActionBar"/>
         <activity
             android:name=".MainActivity"
-            android:theme="@style/P2playTheme.NoActionBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity
             android:name=".ReproductorActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
-            android:theme="@style/P2playTheme.noBar" />
+            android:theme="@style/Theme.P2play.NoActionBar" />
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".AboutActivity" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" />
+            android:label="@string/title_activity_settings"
+            android:theme="@style/Theme.P2play"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
index cdb81e2..5bae4df 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
@@ -1,8 +1,8 @@
 package org.libre.agosto.p2play
 
-import android.support.v7.app.AppCompatActivity
+
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
+import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_about.*
 
 class AboutActivity : AppCompatActivity() {
diff --git a/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt b/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
index 39b3f04..73cb581 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AppCompatPreferenceActivity.kt
@@ -1,15 +1,15 @@
 package org.libre.agosto.p2play
 
+import androidx.appcompat.app.ActionBar
 import android.content.res.Configuration
 import android.os.Bundle
 import android.preference.PreferenceActivity
-import android.support.annotation.LayoutRes
-import android.support.v7.app.ActionBar
-import android.support.v7.app.AppCompatDelegate
-import android.support.v7.widget.Toolbar
 import android.view.MenuInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.widget.Toolbar
 
 /**
  * A [android.preference.PreferenceActivity] which implements and proxies the necessary calls
diff --git a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
index 34fb5dd..5ea9c8a 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
@@ -1,10 +1,10 @@
 package org.libre.agosto.p2play
 
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_channel.*
diff --git a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
index ea5d62a..f9f7e53 100644
--- a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
@@ -3,14 +3,12 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
-import android.util.Log
 import kotlinx.android.synthetic.main.activity_host.*
 import org.libre.agosto.p2play.ajax.Auth
-import org.libre.agosto.p2play.ajax.Client
 
 class HostActivity : AppCompatActivity() {
     lateinit var settings: SharedPreferences
diff --git a/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt b/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
index 656a7a0..68d33d1 100644
--- a/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/LoginActivity.kt
@@ -3,11 +3,10 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
-import android.util.Log
 import kotlinx.android.synthetic.main.activity_login.*
 import org.libre.agosto.p2play.ajax.Auth
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
index c350fba..5d05638 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -2,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
@@ -49,6 +50,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                     .setAction("Action", null).show()
         } */
 
+
+
         val toggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
         drawer_layout.addDrawerListener(toggle)
         toggle.syncState()
@@ -101,7 +104,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 }
             })
         }
-        // swipeContainer.isRefreshing = false
+        swipeContainer.isRefreshing = false
     }
 
     private fun addVideos(videos: ArrayList<VideoModel>){
@@ -251,10 +254,10 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
     override fun onBackPressed() {
         if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
-            drawer_layout.closeDrawer(GravityCompat.START)
+          drawer_layout.closeDrawer(GravityCompat.START)
         }
         else if(!section.equals("trending")) {
-            this.getTrengindVideos()
+           this.getTrengindVideos()
         }
         else {
             super.onBackPressed()
@@ -363,11 +366,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             if(ManagerSingleton.user.avatar!="" && side_imageView != null) {
                 Picasso.get().load("https://" + ManagerSingleton.url + ManagerSingleton.user.avatar).into(side_imageView)
             }
-//            side_imageView?.setOnClickListener {
-//                pagination = 0
-//                getMyVideos()
-//                drawer_layout.closeDrawer(GravityCompat.START)
-//            }
+           side_imageView?.setOnClickListener {
+               pagination = 0
+                getMyVideos()
+            drawer_layout.closeDrawer(GravityCompat.START)
+           }
             if(::myMenu.isInitialized){
                 myMenu.findItem(R.id.action_login).isVisible = false
                 myMenu.findItem(R.id.action_logout).isVisible = true
@@ -381,7 +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)
diff --git a/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt b/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
index 544b50c..a6609ff 100644
--- a/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/RegisterActivity.kt
@@ -2,7 +2,7 @@ package org.libre.agosto.p2play
 
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.preference.PreferenceManager
diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 1f685a9..dae39e9 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -8,19 +8,18 @@ import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.util.Log
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.view.WindowManager
 import android.webkit.WebChromeClient
 import android.widget.EditText
 import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
@@ -233,7 +232,7 @@ class ReproductorActivity : AppCompatActivity() {
             runOnUiThread {
                 if (res) {
                     ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg), this)
-                    commentaryText.text.clear()
+                    commentaryText.text?.clear()
                     this.getComments()
                 } else {
                     ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg), this)
diff --git a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
index 64bbe31..4a2150e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
@@ -3,7 +3,7 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.AsyncTask
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
index d7545e5..be36410 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
@@ -1,25 +1,16 @@
 package org.libre.agosto.p2play.adapters
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.AsyncTask
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.CommentaryModel
-import org.libre.agosto.p2play.models.VideoModel
-import java.io.InputStream
-import java.io.Serializable
-import java.net.URL
 
 @Suppress("DEPRECATION")
 class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
index 8281661..169fa9f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt
@@ -1,24 +1,17 @@
 package org.libre.agosto.p2play.adapters
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.AsyncTask
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
 import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.VideoModel
-import java.io.InputStream
 import java.io.Serializable
-import java.net.URL
-import java.util.concurrent.TimeUnit
 
 class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         RecyclerView.Adapter<VideosAdapter.ViewHolder>() {
@@ -46,8 +39,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
     }
 
     // Create new views (invoked by the layout manager)
-    override fun onCreateViewHolder(parent: ViewGroup,
-                                    viewType: Int): VideosAdapter.ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         // create a new view
         val view = LayoutInflater.from(parent.context)
                 .inflate(R.layout.view_video, parent, false) as View
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 6c7ed94..a00b1d5 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index c78b087..e838d16 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_host.xml b/app/src/main/res/layout/activity_host.xml
index 25f7f13..3d3cbaf 100644
--- a/app/src/main/res/layout/activity_host.xml
+++ b/app/src/main/res/layout/activity_host.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -29,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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8ce0137..a99fd12 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c21e1aa..2ef19d2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -26,4 +26,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 4583b06..7ca7ae6 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,8 +12,8 @@
         android:layout_height="fill_parent"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:visibility="gone" />
 
     <ScrollView
@@ -37,17 +37,15 @@
             <WebView
                 android:id="@+id/videoView"
                 android:layout_width="match_parent"
-                android:layout_height="270dp"
-                android:layout_weight="1">
-
-            </WebView>
+                android:layout_height="222dp"
+                android:layout_weight="1" />
 
             <TextView
                 android:id="@+id/tittleVideoTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingStart="5dp"
-                android:textAppearance="@android:style/TextAppearance.Material.Large"
+                android:textAppearance="@android:style/TextAppearance.Material.Display1"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -59,7 +57,7 @@
                 android:paddingRight="5dp"
                 android:textSize="12sp" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/actionsLayout"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
@@ -67,7 +65,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/likeLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -94,7 +92,7 @@
                         android:layout_weight="1"
                         android:text="@string/likeBtn"
                         android:textAlignment="center" />
-                </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <LinearLayout
                     android:id="@+id/dislikeLayout"
@@ -166,7 +164,7 @@
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:adjustViewBounds="false"
-                        android:contentDescription="@string/dislikeBtn"
+                        android:contentDescription="@string/shareBtn"
                         android:cropToPadding="false"
                         android:visibility="visible"
                         app:srcCompat="@drawable/ic_share" />
@@ -179,7 +177,7 @@
                         android:text="@string/shareBtn"
                         android:textAlignment="center" />
                 </LinearLayout>
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -202,7 +200,7 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
+                    android:layout_weight="3"
                     android:orientation="vertical">
 
                     <TextView
@@ -210,7 +208,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textAppearance="@android:style/TextAppearance.Material.Large"
-                        android:textColor="@android:color/black"
                         android:textSize="18sp"
                         android:textStyle="bold" />
 
@@ -223,14 +220,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 +254,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 +269,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 +282,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 +305,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 +342,4 @@
 
         </LinearLayout>
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 890a265..b9336d1 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 8b0cb7d..a260ff5 100644
--- 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>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 249eb35..4577734 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,7 +8,7 @@
     tools:context=".MainActivity"
     tools:showIn="@layout/app_bar_main">
 
-    <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.v7.widget.RecyclerView
+        <view class="androidx.recyclerview.widget.RecyclerView"
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,5 +24,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </android.support.v4.widget.SwipeRefreshLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/report_dialog.xml b/app/src/main/res/layout/report_dialog.xml
index 8c8b872..92e76f7 100644
--- a/app/src/main/res/layout/report_dialog.xml
+++ b/app/src/main/res/layout/report_dialog.xml
@@ -6,21 +6,26 @@
     android:orientation="vertical"
     android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/reportTxt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/reportDialog"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <EditText
-        android:id="@+id/reportText"
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textMultiLine">
+        android:layout_margin="4dp"
+        android:layout_weight="3"
+        android:hint="@string/reportDialog">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/reportText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textMultiLine" >
+
+            <requestFocus />
+
+        </com.google.android.material.textfield.TextInputEditText>
+
+    </com.google.android.material.textfield.TextInputLayout>
 
-        <requestFocus />
 
-    </EditText>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_commentary.xml b/app/src/main/res/layout/view_commentary.xml
index 5d0687f..c15dc9f 100644
--- a/app/src/main/res/layout/view_commentary.xml
+++ b/app/src/main/res/layout/view_commentary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -48,4 +48,4 @@
                 android:maxLines="10" />
         </LinearLayout>
     </LinearLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index 0658aae..da37fc6 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -50,7 +50,8 @@
                     android:layout_height="wrap_content"
                     android:maxLength="70"
                     android:textSize="14sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:theme="@style/MaterialAlertDialog.MaterialComponents.Title.Text"/>
 
                 <TextView
                     android:id="@+id/descriptionTxt"
@@ -64,10 +65,10 @@
 
     </LinearLayout>
 
-    <Space
+    <androidx.legacy.widget.Space
         android:layout_width="match_parent"
         android:layout_height="15dp"
         android:layout_weight="1"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 42a89ae..6a3e597 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,7 +5,8 @@
     <item
         android:id="@+id/app_bar_search"
         android:icon="@drawable/ic_search_black_24dp"
-        app:actionViewClass="android.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        android:title="@string/action_login"
         app:showAsAction="always"/>
 
     <item
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1dc32f3..27e8262 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,7 +9,7 @@
     <string name="aboutLabel">Sobre P2Play</string>
     <string name="aboutText">P2Play es una aplicacion no-oficial de PeerTube. Tu puedes ver y cntribuir con el codigo en GitLab:</string>
     <string name="aboutStatus">Puedes seguir nuestro blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">GNU GPLv3 License</string>
     <string name="aboutInstance">Sobre la instancia</string>
     <string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
     <!-- End About strings -->
@@ -25,6 +25,7 @@
     <string name="passwordTxt">Contraseña:</string>
     <string name="loginBtn">Ingresar</string>
     <string name="registerActionBtn">Crear una cuenta</string>
+    <string name="instance">Instancia</string>
     <!-- Toast msg -->
     <string name="loginSuccess_msg">Te has identificado</string>
     <string name="loginError_msg">Ha ocurrido un error</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index dfd0cc4..877e37a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -5,7 +5,7 @@
     <string name="aboutLabel">Informazioni su P2Play</string>
     <string name="aboutText">P2Play è un\'applicazione Android non ufficiale per PeerTube. Puoi visualizzare e contribuire al codice su GitLab:</string>
     <string name="aboutStatus">Puoi seguire il nostro blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">GNU GPLv3 License</string>
     <string name="aboutInstance">Informazioni sull\'istanza</string>
     <string name="aboutInWeb">Puoi vedere in termini ed altro sul web:</string>
     <string name="hostInfoText">Scegliere l\'istanza</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..5246f13
--- /dev/null
+++ 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>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6cd591b..5d7a871 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#9F4200</color>
+    <color name="colorPrimaryDark">#F4DED5</color>
+    <color name="colorAccent">#0f3239</color>
     <color name="colorHeader">#ffffff</color>
     <color name="colorBody">#fff</color>
     <color name="colorMenu">#000</color>
@@ -10,4 +10,66 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ded5376..af45e67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="aboutLabel">About P2Play</string>
     <string name="aboutText">P2Play is an unofficial Android application for PeerTube. You can watch and contribute with the code on GitLab:</string>
     <string name="aboutStatus">You can follow our blog:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutLicense">Licence GNU GPLv3 License</string>
     <string name="aboutInstance">About instance</string>
     <string name="aboutInWeb">You can see terms and more on the web:</string>
     <!-- End About strings -->
@@ -25,6 +25,7 @@
     <string name="okButton">Accept</string>
     <string name="errorMsg">Error, try again</string>
     <string name="finallyMsg">Host saved</string>
+    <string name="instance">Instance</string>
     <!-- End Host strings -->
     <!-- Start Login strings -->
     <string name="loginInfo">Login or register new account</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..b71a40d
--- /dev/null
+++ 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>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index b0e6117..dcad1d7 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -5,7 +5,7 @@
     <EditTextPreference
         android:capitalize="words"
         android:defaultValue="@string/pref_hostname_error"
-        android:inputType="textCapWords"
+        android:inputType="text"
         android:key="hostP2play"
         android:maxLines="1"
         android:selectAllOnFocus="true"
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index e5fd625..12803d9 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -1,11 +1,14 @@
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- These settings headers are only used on tablets. -->
 
     <header
         android:fragment="org.libre.agosto.p2play.SettingsActivity$GeneralPreferenceFragment"
         android:icon="@drawable/ic_info_black_24dp"
-        android:title="@string/pref_header_general" />
+        android:title="@string/pref_header_general"
+        android:textColor="@color/md_theme_light_secondary"/>
 
     <!-- <header
         android:fragment="org.libre.agosto.p2play.SettingsActivity$NotificationPreferenceFragment"
diff --git a/gradle.properties b/gradle.properties
index 743d692..ded9a9d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,9 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.enableJetifier=true
+android.useAndroidX=true
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects