Merge branch 'development' into 'master'

P2play version 0.5 See merge request agosto182/p2play!6
2019-10-27 17:15:33 +00:00 · 2019-10-27 17:15:33 +00:00 · 7d6f364223
parent 23dfb98a67 390b1a7add
commit 7d6f364223
51 changed files with 147 additions and 246 deletions
--- a/README.md
+++ b/README.md
@ -25,10 +25,10 @@ Comming soon!
 - Show recent, popular and local list of videos.
 - Reproduce videos
 - Login and register in your instance
- Pull to refresh
 - Show uploaded videos
 - Subscribe to accounts
 - Show your subscripcion videos
+- Show your history
 - Rate videos
 - Show and make commentaries
 - Splash screen
@ -40,8 +40,8 @@ Comming soon!

 ## What to do? (in next version)

- History of videos watched
 - Notifications
+- Upload videos

 ## Demostrations

@ -54,7 +54,7 @@ Demostration P2Play Beta 0.1: https://peertube.video/videos/watch/2eb7b953-0b1b-
 ## Contact
 You can follow our accounts for get news and contact with the developers.

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

 ## About
@ -63,7 +63,7 @@ P2Play is made in Android Studio with Kotlin code.
 ![kotlin](https://weblizar.com/blog/wp-content/uploads/2017/11/Kotlin-A-New-Programming-Platform-For-Android-Developers.png)

 ### Developers
- Ivan Agosto: [https://gnusocial.ml/agosto182](https://gnusocial.ml/agosto182)
+- Ivan Agosto: [https://nerdica.net/profile/agosto182](https://gnusocial.ml/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
@ -11,8 +11,8 @@ android {
        minSdkVersion 21
        //noinspection OldTargetApi
        targetSdkVersion 27
-        versionCode 5
-        versionName "0.4"
+        versionCode 6
+        versionName "0.5"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
@ -34,7 +34,7 @@ android {

 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    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'
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -7,9 +7,9 @@

    <application
        android:allowBackup="true"
-        android:icon="@mipmap/ic_p2play"
+        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_p2play"
+        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/P2playTheme">
        <activity android:name=".ChannelActivity"
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@ -222,6 +222,19 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
        }
    }

+    // Videos history of user
+    private fun getHistory(){
+        swipeContainer.isRefreshing = true
+        section = "my_videos"
+        setTitle(R.string.nav_history)
+        AsyncTask.execute {
+            val videos = client.videoHistory(ManagerSingleton.token.token, this.pagination)
+            runOnUiThread {
+                this.addVideos(videos)
+            }
+        }
+    }
+
    override fun onBackPressed() {
        if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
            drawer_layout.closeDrawer(GravityCompat.START)
@ -309,6 +322,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                val intent = Intent(this, AboutActivity::class.java)
                startActivity(intent)
            }
+            R.id.nav_history -> getHistory()
+            R.id.nav_myVideos -> getMyVideos()
        }

        drawer_layout.closeDrawer(GravityCompat.START)
@ -322,18 +337,22 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte

    private fun setSideData(){
        if(ManagerSingleton.user.status == 1){
+            nav_view.menu.findItem(R.id.ml).isVisible = true
+
            side_usernameTxt?.text = ManagerSingleton.user.username
            side_emailTxt?.text = ManagerSingleton.user.email
-            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)
+            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)
+//            }
            if(::myMenu.isInitialized){
                myMenu.findItem(R.id.action_login).isVisible = false
                myMenu.findItem(R.id.action_logout).isVisible = true
+
            }
        }
    }
@ -343,10 +362,10 @@ 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
        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.mipmap.ic_launcher_round)
+        side_imageView?.setImageResource(R.drawable.default_avatar)
        side_imageView?.setOnClickListener {  }
        _db.logout()
        ManagerSingleton.logout()
--- a/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt
@ -12,7 +12,6 @@ object ManagerSingleton {
    var videos_count: Int = 0

    fun Toast(text: String?, context: Context) {
-        if(context == null) { return }
        android.widget.Toast.makeText(context, text, android.widget.Toast.LENGTH_SHORT).show()
    }

--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@ -285,12 +285,12 @@ class ReproductorActivity : AppCompatActivity() {
        // Pass null as the parent view because its going in the dialog layout
        builder.setView(dialog)
            // Add action buttons
-            .setPositiveButton(R.string.reportBtn) { dialog, id ->
+            .setPositiveButton(R.string.reportBtn) { _, _ ->
                val reason = inputReason.text.toString()
                reportVideo(reason)
            }
-            .setNegativeButton("Cancel") { dialog, id ->
-                dialog.cancel()
+            .setNegativeButton("Cancel") { dialog, _ ->
+                dialog.run { cancel() }
            }
        val alertDialog = builder.create()
        alertDialog.show()
@ -318,6 +318,10 @@ class ReproductorActivity : AppCompatActivity() {
        private var mOriginalSystemUiVisibility: Int = 0

        override fun getDefaultVideoPoster(): Bitmap? {
+            AsyncTask.execute {
+                this@ReproductorActivity._actions.watchVideo(this@ReproductorActivity.video.id, ManagerSingleton.token.token)
+            }
+
            return if (mCustomView == null) {
                null
            } else BitmapFactory.decodeResource(this@ReproductorActivity.resources, 2130837573)
@ -377,6 +381,5 @@ class ReproductorActivity : AppCompatActivity() {
                err.printStackTrace()
            }
        }
-
    }
 }
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
@ -144,4 +144,22 @@ class Actions: Client() {

        return response
    }
+
+    fun watchVideo(videoId: Int, token: String): Boolean {
+        val con = this._newCon("videos/$videoId/watching", "PUT", token)
+        val params = "currentTime=1"
+        con.outputStream.write(params.toByteArray())
+
+        var response = false
+        try {
+            if(con.responseCode == 204){
+                response = true
+            }
+        } catch (err: Exception) {
+            err.printStackTrace()
+            response = false
+        }
+
+        return response
+    }
 }
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
@ -25,8 +25,8 @@ open class Client {
        }

        con.requestMethod=method
-        con.connectTimeout=10000
-        con.readTimeout=10000
+        con.connectTimeout=60000
+        con.readTimeout=60000

        if(method == "POST")
            con.doOutput=true
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@ -108,6 +108,26 @@ class Videos: Client() {
        return videos
    }

+    fun videoHistory(token: String, start: Int = 0): ArrayList<VideoModel>{
+        val count = ManagerSingleton.videos_count
+        val params = "start=$start&count=$count"
+        val con = this._newCon("users/me/history/videos?$params","GET", token)
+        var videos = arrayListOf<VideoModel>()
+        try {
+            if (con.responseCode == 200) {
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
+                videos = parseVideos(data)
+                data.close()
+            }
+        } catch(err:Exception){
+            err.printStackTrace()
+        }
+
+        con.disconnect()
+        return videos
+    }
+
    fun search(text: String, start: Int = 0): ArrayList<VideoModel>{
        val count = ManagerSingleton.videos_count
        val nsfw = ManagerSingleton.nfsw
@ -158,7 +178,7 @@ class Videos: Client() {
    fun channelVideos(account: String, start: Int): ArrayList<VideoModel> {
        val count = ManagerSingleton.videos_count
        val params = "start=$start&count=$count"
-        val con = this._newCon("video-channels/$account/videos","GET")
+        val con = this._newCon("video-channels/$account/videos?$params","GET")
        var videos = arrayListOf<VideoModel>()
        try {
            if (con.responseCode == 200) {
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
--- a/app/src/main/res/drawable/ic_history_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_history_black_24dp.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
--- a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
+</vector>
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@ -27,7 +27,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:contentDescription="Logo"
-                app:srcCompat="@drawable/icon" />
+                app:srcCompat="@mipmap/ic_launcher" />

            <Space
                android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@ -27,7 +27,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:contentDescription="@string/app_name"
-                app:srcCompat="@drawable/icon" />
+                app:srcCompat="@mipmap/ic_launcher" />

            <Space
                android:layout_width="match_parent"
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@ -4,14 +4,30 @@
    tools:showIn="navigation_view">

    <item
-        android:id="@+id/ai"
+        android:id="@+id/ml"
        android:icon="@android:color/darker_gray"
-        android:title="Videos">
+        android:title="@string/nav_menu_myLibrary"
+        android:visible="false">
        <menu>
            <item
-                android:id="@+id/nav_subscriptions"
+                android:id="@+id/nav_myVideos"
                android:icon="@drawable/ic_video_library_black_24dp"
+                android:title="@string/title_myVideos" />
+            <item
+                android:id="@+id/nav_subscriptions"
+                android:icon="@drawable/ic_live_tv_black_24dp"
                android:title="@string/nav_subscriptions" />
+            <item
+                android:id="@+id/nav_history"
+                android:icon="@drawable/ic_history_black_24dp"
+                android:title="@string/nav_history" />
+        </menu>
+    </item>
+    <item
+        android:id="@+id/ai"
+        android:icon="@android:color/darker_gray"
+        android:title="@string/nav_menu_videos">
+        <menu>
            <item
                android:id="@+id/nav_popular"
                android:icon="@android:drawable/btn_star"
@ -34,7 +50,7 @@
    <item
        android:id="@+id/aiao"
        android:icon="@android:color/white"
-        android:title="More">
+        android:title="@string/nav_menu_more">
        <menu>
            <item
                android:id="@+id/nav_about"
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/.DS_Store
+++ b/app/src/main/res/mipmap-hdpi/.DS_Store
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-hdpi/ic_p2play.png
+++ b/app/src/main/res/mipmap-hdpi/ic_p2play.png
--- a/app/src/main/res/mipmap-mdpi/.DS_Store
+++ b/app/src/main/res/mipmap-mdpi/.DS_Store
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_p2play.png
+++ b/app/src/main/res/mipmap-mdpi/ic_p2play.png
--- a/app/src/main/res/mipmap-xhdpi/.DS_Store
+++ b/app/src/main/res/mipmap-xhdpi/.DS_Store
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_p2play.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_p2play.png
--- a/app/src/main/res/mipmap-xxhdpi/.DS_Store
+++ b/app/src/main/res/mipmap-xxhdpi/.DS_Store
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_p2play.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_p2play.png
--- a/app/src/main/res/mipmap-xxxhdpi/.DS_Store
+++ b/app/src/main/res/mipmap-xxxhdpi/.DS_Store
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_p2play.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_p2play.png
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -8,7 +8,7 @@
    <!-- Start About strings -->
    <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 subscribirte a nuestro perfil en GNU Social:</string>
+    <string name="aboutStatus">Puedes seguir nuestro blog:</string>
    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
    <string name="aboutInstance">Sobre la instancia</string>
    <string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
@ -56,6 +56,10 @@
    <string name="nav_local">Local</string>
    <string name="nav_about">Sobre</string>
    <string name="nav_subscriptions">Suscripciones</string>
+    <string name="nav_history">Historial</string>
+    <string name="nav_menu_myLibrary">Mi libreria</string>
+    <string name="nav_menu_videos">Videos</string>
+    <string name="nav_menu_more">Mas</string>
    <!-- End Menu strings -->
    <!-- Start MiniMenu strings -->
    <string name="action_settings">Configuracion</string>
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#E95921</color>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -12,10 +12,10 @@

    <!-- Start About strings -->
    <string name="aboutGitUrl" translatable="false">https://gitlab.com/agosto182/p2play/</string>
-    <string name="aboutGnuUrl" translatable="false">https://gnusocial.ml/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="aboutStatus">You can subscribe to our profile on GNU Social:</string>
+    <string name="aboutStatus">You can follow our blog:</string>
    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
    <string name="aboutInstance">About instance</string>
    <string name="aboutInWeb">You can see terms and more on the web:</string>
@ -69,6 +69,10 @@
    <string name="nav_recent">Recent</string>
    <string name="nav_local">Local</string>
    <string name="nav_about">About</string>
+    <string name="nav_history">History</string>
+    <string name="nav_menu_myLibrary">My Library</string>
+    <string name="nav_menu_videos">Videos</string>
+    <string name="nav_menu_more">More</string>
    <!-- End Menu strings -->
    <!-- Start MiniMenu strings -->
    <string name="action_settings">Settings</string>
--- a/build.gradle
+++ b/build.gradle
@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.50'
    repositories {
        google()
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
--- a/docs/p2playv2.png
+++ b/docs/p2playv2.png
--- a/docs/p2playv2.xcf
+++ b/docs/p2playv2.xcf
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Wed Jan 23 14:44:01 CST 2019
+#Thu Oct 17 20:10:56 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip