From a6f3a4b6b47d1a2a161d47dc9107beb0b91fce43 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sat, 16 Feb 2019 00:33:54 -0600
Subject: [PATCH 01/10] Commentaries with html parsed

---
 .../org/libre/agosto/p2play/adapters/CommentariesAdapter.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 77a93df..e02e325 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
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.os.AsyncTask
 import android.support.v7.widget.RecyclerView
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -65,7 +66,7 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
         if(myDataset[position].userImageUrl!="")
             Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg);
 
-        holder.commentary.text = myDataset[position].commentary
+        holder.commentary.text = Html.fromHtml(myDataset[position].commentary)
 
     }
 

From 2abdcb8375dba79edc2b23d97cb1cd9a2d6ac28d Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 17 Feb 2019 14:29:33 -0600
Subject: [PATCH 02/10] Full screen bugs fixed

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../agosto/p2play/ReproductorActivity.kt      | 50 +++++++++++++++----
 .../main/res/layout/activity_reproductor.xml  | 11 ++++
 app/src/main/res/values/styles.xml            |  6 +++
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dd6f1cb..461580c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
         <activity
             android:name=".ReproductorActivity"
             android:hardwareAccelerated="true"
+            android:theme="@style/P2playTheme.noBar"
             android:configChanges="orientation|screenSize"/>
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
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 365168c..ede7f5e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -1,6 +1,8 @@
 package org.libre.agosto.p2play
 
+import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.AsyncTask
@@ -12,6 +14,7 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.util.Log
 import android.view.View
+import android.view.WindowManager
 import android.webkit.WebChromeClient
 import android.widget.FrameLayout
 import com.squareup.picasso.Picasso
@@ -22,6 +25,10 @@ import org.libre.agosto.p2play.ajax.Comments
 import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 
+
+
+
+
 class ReproductorActivity : AppCompatActivity() {
     lateinit var video:VideoModel
     private val _actions: Actions = Actions()
@@ -32,6 +39,7 @@ class ReproductorActivity : AppCompatActivity() {
     private lateinit var viewAdapter: RecyclerView.Adapter<*>
     private lateinit var viewManager: RecyclerView.LayoutManager
 
+    @SuppressLint("SetJavaScriptEnabled", "SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reproductor)
@@ -48,10 +56,10 @@ class ReproductorActivity : AppCompatActivity() {
         try {
             this.video =  this.intent.extras.getSerializable("video") as VideoModel
             tittleVideoTxt.text = this.video.name
-            viewsTxt.text = this.video.views.toString() + ' ' + getString(R.string.view_text)
+            viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
             userTxt.text = this.video.username
-            descriptionVideoTxt.text = this.video.description.toString()
-            hostTxt.text = this.video.userHost.toString()
+            descriptionVideoTxt.text = this.video.description
+            hostTxt.text = this.video.userHost
 
             // Check if user had profile image
             if(this.video.userImageUrl!="")
@@ -63,7 +71,6 @@ class ReproductorActivity : AppCompatActivity() {
         }
         catch (err:Exception){
             err.printStackTrace()
-            Log.d("Error", err?.message)
         }
 
         viewManager = LinearLayoutManager(this)
@@ -250,12 +257,22 @@ class ReproductorActivity : AppCompatActivity() {
 
         override fun onHideCustomView() {
             try {
-                (this@ReproductorActivity.window.decorView as FrameLayout).removeView(this.mCustomView)
+                this@ReproductorActivity.nonFullScreen.visibility = View.VISIBLE
+                this@ReproductorActivity.fullScreen.visibility = View.GONE
+                this@ReproductorActivity.fullScreen.removeView(this.mCustomView)
                 this.mCustomView = null
-                this@ReproductorActivity.window.decorView.systemUiVisibility = this.mOriginalSystemUiVisibility
-                this@ReproductorActivity.requestedOrientation = this.mOriginalOrientation
-                this.mCustomViewCallback?.onCustomViewHidden()
+
+                this.mCustomViewCallback!!.onCustomViewHidden()
                 this.mCustomViewCallback = null
+
+                this@ReproductorActivity.requestedOrientation = this.mOriginalOrientation
+                // this@ReproductorActivity.window.decorView.systemUiVisibility = this.mOriginalSystemUiVisibility
+
+                val attrs = this@ReproductorActivity.window.attributes
+                attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
+                attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON.inv()
+                window.attributes = attrs
+                this@ReproductorActivity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
             }
             catch (err: Exception){
                 err.printStackTrace()
@@ -272,8 +289,21 @@ class ReproductorActivity : AppCompatActivity() {
                 this.mOriginalSystemUiVisibility = this@ReproductorActivity.window.decorView.systemUiVisibility
                 this.mOriginalOrientation = this@ReproductorActivity.requestedOrientation
                 this.mCustomViewCallback = paramCustomViewCallback
-                (this@ReproductorActivity.window.decorView as FrameLayout).addView(this.mCustomView, FrameLayout.LayoutParams(-1, -1))
-                this@ReproductorActivity.window.decorView.systemUiVisibility = 3846
+                val match_parent = WindowManager.LayoutParams.MATCH_PARENT
+
+                this@ReproductorActivity.nonFullScreen.visibility = View.GONE
+                this@ReproductorActivity.fullScreen.visibility = View.VISIBLE
+
+                this@ReproductorActivity.fullScreen.addView(paramView, FrameLayout.LayoutParams(match_parent, match_parent))
+
+
+                val attrs = this@ReproductorActivity.window.attributes
+                attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
+                attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                window.attributes = attrs
+                this@ReproductorActivity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE
+
+                this@ReproductorActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
             }
             catch (err: Exception){
                 err.printStackTrace()
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index bed671b..9c9f7e9 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -6,7 +6,18 @@
     android:layout_height="match_parent"
     tools:context=".ReproductorActivity">
 
+    <RelativeLayout
+        android:id="@+id/fullScreen"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:visibility="gone" />
+
     <ScrollView
+        android:id="@+id/nonFullScreen"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2531a0a..37c3eb6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,12 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="P2playTheme.noBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorHeader</item>
+        <item name="colorPrimaryDark">@android:color/darker_gray</item>
+        <item name="colorAccent">@android:color/holo_orange_dark</item>
+    </style>
+
     <style name="P2playTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" />
 
     <style name="P2playTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

From 90aac608be24531ed6f661e60a65a50717021dde Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 17 Feb 2019 17:13:12 -0600
Subject: [PATCH 03/10] Option for show full description

---
 .../agosto/p2play/ReproductorActivity.kt      | 19 ++++++++++++-
 .../org/libre/agosto/p2play/ajax/Videos.kt    | 27 +++++++++++++++++++
 .../main/res/layout/activity_reproductor.xml  | 23 ++++++++++++----
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index ede7f5e..8e3e149 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -22,6 +22,7 @@ import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
 import org.libre.agosto.p2play.ajax.Comments
+import org.libre.agosto.p2play.ajax.Videos
 import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 
@@ -30,9 +31,10 @@ import org.libre.agosto.p2play.models.VideoModel
 
 
 class ReproductorActivity : AppCompatActivity() {
-    lateinit var video:VideoModel
+    lateinit var video: VideoModel
     private val _actions: Actions = Actions()
     private val client: Comments = Comments()
+    private val videos: Videos = Videos()
 
     // Commentaries adapter values
     private lateinit var recyclerView: RecyclerView
@@ -59,6 +61,10 @@ class ReproductorActivity : AppCompatActivity() {
             viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
             userTxt.text = this.video.username
             descriptionVideoTxt.text = this.video.description
+            val haveDescription = this.video.description.contains("...", ignoreCase = false)
+            if (haveDescription) {
+                showMoreBtn.visibility = View.VISIBLE
+            }
             hostTxt.text = this.video.userHost
 
             // Check if user had profile image
@@ -82,6 +88,7 @@ class ReproductorActivity : AppCompatActivity() {
         likeLayout.setOnClickListener { rate("like") }
         dislikeLayout.setOnClickListener { rate("dislike") }
         commentaryBtn.setOnClickListener { makeComment() }
+        showMoreBtn.setOnClickListener { getDescription() }
     }
 
     private fun subscribe(){
@@ -243,6 +250,16 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
+    fun getDescription(){
+        AsyncTask.execute {
+            val fullDescription = this.videos.fullDescription(this.video.id)
+            runOnUiThread {
+                descriptionVideoTxt.text = fullDescription
+                showMoreBtn.visibility = View.GONE
+            }
+        }
+    }
+
     internal inner class WebClient: WebChromeClient() {
         private var mCustomView: View? = null
         private var mCustomViewCallback: WebChromeClient.CustomViewCallback? = null
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 795b8f6..7723eb1 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -175,4 +175,31 @@ class Videos: Client() {
         }
         return videos
     }
+
+    fun fullDescription(videoId: Int): String{
+        var con=this._newCon("videos/$videoId/description","GET")
+        var description = ""
+        try {
+            if (con.responseCode == 200) {
+                var response = InputStreamReader(con.inputStream)
+                var data = JsonReader(response)
+
+                data.beginObject()
+                while (data.hasNext()){
+                    val name = data.nextName()
+                    when(name){
+                        "description" -> description = data.nextString()
+                        else -> data.skipValue()
+                    }
+                }
+                data.endObject()
+                data.close()
+
+            }
+        } catch(err:Exception){
+            err.printStackTrace()
+            description = "Error!"
+        }
+        return description
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 9c9f7e9..b35d434 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -191,7 +191,7 @@
                     android:layout_weight="1"
                     android:text="@string/subscribeBtn"
                     android:textSize="10sp"
-                    android:visibility="visible" />
+                    android:visibility="invisible" />
             </LinearLayout>
 
             <TextView
@@ -201,12 +201,15 @@
                 android:maxLength="1000"
                 android:maxLines="100"
                 android:paddingLeft="5dp"
-                android:text="@string/descriptionTxt" />
+                android:text="@string/descriptionTxt"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/descriptionVideoTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_marginBottom="2dp"
                 android:autoLink="web"
                 android:linksClickable="true"
                 android:maxLength="10000"
@@ -214,6 +217,15 @@
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp" />
 
+            <Button
+                android:id="@+id/showMoreBtn"
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/showMore"
+                android:visibility="visible" />
+
             <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
@@ -222,14 +234,16 @@
 
             <Space
                 android:layout_width="match_parent"
-                android:layout_height="30dp" />
+                android:layout_height="10dp"
+                android:layout_weight="1" />
 
             <TextView
                 android:id="@+id/commentariesTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5dp"
-                android:text="@string/commentariesTxt" />
+                android:text="@string/commentariesTxt"
+                android:textStyle="bold" />
 
             <Space
                 android:layout_width="match_parent"
@@ -279,7 +293,6 @@
                 android:id="@+id/listCommentaries"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:scrollbars="none"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e21b5ae..dfcf631 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -91,6 +91,7 @@
     <string name="pref_hostname_title">Instancia Peertube</string>
     <string name="pref_message_exit">Reinicia para aplicar los cambios</string>
     <string name="pref_videos_count_title">Videos por pagina</string>
+    <string name="showMore">Mostrar mas</string>
     <!-- End Settings strings -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 718ff12..85d03ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
     <string name="reportBtn">Report</string>
     <string name="unSubscribeBtn">Unsubscribe</string>
     <string name="commentaryText">Comment</string>
+    <string name="showMore">Show more</string>
     <!-- Messages -->
     <string name="subscribeMsg">You are subscribed to this channel</string>
     <string name="rateMsg">You are rated the video</string>

From d680eb77b86f0ac5036e649cd9b1af765608942f Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 17 Feb 2019 17:29:52 -0600
Subject: [PATCH 04/10] Linting ajax files

---
 .../org/libre/agosto/p2play/ajax/Actions.kt   | 20 ++++-----
 .../java/org/libre/agosto/p2play/ajax/Auth.kt | 35 ++++++++--------
 .../org/libre/agosto/p2play/ajax/Client.kt    | 23 +++++------
 .../org/libre/agosto/p2play/ajax/Comments.kt  | 12 +++---
 .../org/libre/agosto/p2play/ajax/Videos.kt    | 41 +++++++++----------
 5 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
index 93b81da..77b313a 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
@@ -6,7 +6,7 @@ import java.io.InputStreamReader
 class Actions: Client() {
 
     fun subscribe(token: String, account: String):Int{
-        var con=this._newCon("users/me/subscriptions","POST", token)
+        val con = this._newCon("users/me/subscriptions","POST", token)
         val params:String= "uri=$account"
         con.outputStream.write(params.toByteArray())
         var response = 0
@@ -25,7 +25,7 @@ class Actions: Client() {
     }
 
     fun unSubscribe(token: String, account: String):Int{
-        var con=this._newCon("users/me/subscriptions/$account","DELETE", token)
+        val con = this._newCon("users/me/subscriptions/$account","DELETE", token)
         var response = 0
 
         try {
@@ -42,13 +42,13 @@ class Actions: Client() {
     }
 
     fun getSubscription(token: String, account: String): Boolean{
-        var con=this._newCon("users/me/subscriptions/exist?uris=$account","GET", token)
+        val con = this._newCon("users/me/subscriptions/exist?uris=$account","GET", token)
         var isSubscribed = false
 
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
                 while (data.hasNext()){
                     val key = data.nextName()
@@ -72,8 +72,8 @@ class Actions: Client() {
     }
 
     fun rate(token: String, id_video: Int, rate: String):Int{
-        var con=this._newCon("videos/$id_video/rate","PUT", token)
-        val params:String= "rating=$rate"
+        val con = this._newCon("videos/$id_video/rate","PUT", token)
+        val params = "rating=$rate"
         con.outputStream.write(params.toByteArray())
         var response = 0
 
@@ -91,13 +91,13 @@ class Actions: Client() {
     }
 
     fun getRate(token: String, id_video: Int):String{
-        var con=this._newCon("users/me/videos/$id_video/rating","GET", token)
+        val con = this._newCon("users/me/videos/$id_video/rating","GET", token)
         var rating = "none"
 
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
                 while (data.hasNext()){
                     val key = data.nextName()
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
index bba67ec..d281371 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
@@ -10,19 +10,19 @@ import org.libre.agosto.p2play.models.UserModel
 import java.io.InputStreamReader
 
 class Auth: Client() {
-    val stockParams = "grant_type=password"
+    private val stockParams = "grant_type=password"
 
     fun login(username: String, password: String, client_id: String, client_secret: String): TokenModel{
-        var con = this._newCon("users/token","POST")
-        val params:String= "$stockParams&username=$username&password=$password&client_id=$client_id&client_secret=$client_secret"
+        val con = this._newCon("users/token","POST")
+        val params = "$stockParams&username=$username&password=$password&client_id=$client_id&client_secret=$client_secret"
         con.outputStream.write(params.toByteArray())
-        var token = TokenModel()
+        val token = TokenModel()
 
         try {
 
             if(con.responseCode==200){
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
 
                 while(data.hasNext()){
@@ -51,8 +51,8 @@ class Auth: Client() {
     }
 
     fun register(username: String, password: String, email: String): Int{
-        var con = this._newCon("users/register","POST")
-        val params:String= "username=$username&password=$password&email=$email"
+        val con = this._newCon("users/register","POST")
+        val params = "username=$username&password=$password&email=$email"
         con.outputStream.write(params.toByteArray())
 
         var response = 0
@@ -72,15 +72,15 @@ class Auth: Client() {
     }
 
     fun refreshToken(token: TokenModel, client_id: String, client_secret: String): TokenModel{
-        var con = this._newCon("users/token", "POST", token.token)
-        val params:String = "refresh_token=${token.refresh_token}&response_type=code&grant_type=refresh_token&client_id=$client_id&client_secret=$client_secret"
+        val con = this._newCon("users/token", "POST", token.token)
+        val params = "refresh_token=${token.refresh_token}&response_type=code&grant_type=refresh_token&client_id=$client_id&client_secret=$client_secret"
         con.outputStream.write(params.toByteArray())
-        var token = TokenModel()
+        // val token = TokenModel()
 
         try {
             if(con.responseCode==200){
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
 
                 while(data.hasNext()){
@@ -109,15 +109,14 @@ class Auth: Client() {
     }
 
     fun me(token: String): UserModel{
-        var con = this._newCon("users/me","GET", token)
-
-        var user = UserModel()
+        val con = this._newCon("users/me","GET", token)
+        val user = UserModel()
 
         try {
 
             if(con.responseCode==200){
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
 
                 while(data.hasNext()){
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
index 475cd00..1d4aeaf 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
@@ -1,6 +1,5 @@
 package org.libre.agosto.p2play.ajax
 
-import android.content.SharedPreferences
 import android.util.JsonReader
 import android.util.Log
 import org.libre.agosto.p2play.ManagerSingleton
@@ -13,22 +12,22 @@ open class Client {
 
 
     protected fun _newCon(uri: String, method: String, token: String = ""): HttpURLConnection {
-        var url = URL("https://"+ManagerSingleton.url+"/api/v1/"+uri)
-        var con = url.openConnection() as HttpURLConnection
+        val url = URL("https://${ManagerSingleton.url}/api/v1/$uri")
+        val con = url.openConnection() as HttpURLConnection
 
         con.setRequestProperty("User-Agent", "P2play/0.1")
         con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
         con.setRequestProperty("Accept", "*/*")
 
         if(token != ""){
-            con.setRequestProperty("Authorization", "Bearer ${token}")
+            con.setRequestProperty("Authorization", "Bearer $token")
         }
 
         con.requestMethod=method
         con.connectTimeout=10000
         con.readTimeout=10000
 
-        if(method.equals("POST"))
+        if(method == "POST")
             con.doOutput=true
 
         Log.d("Petition", url.toString())
@@ -36,12 +35,12 @@ open class Client {
     }
 
     fun getKeys():HostModel{
-        var con=this._newCon("oauth-clients/local","GET")
-        var keys = HostModel("","")
+        val con = this._newCon("oauth-clients/local","GET")
+        val keys = HostModel("","")
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 data.beginObject()
                 while (data.hasNext()) {
                     val key = data.nextName()
@@ -58,12 +57,10 @@ open class Client {
                     }
                 }
             }
-            Log.d("Key",keys.client_id)
-            return keys
         } catch(err:Exception){
-            Log.d("Error",err.message)
-            return keys
+            err.printStackTrace()
         }
+        return keys
     }
 
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
index a909a60..7fd8c97 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
@@ -9,7 +9,7 @@ import java.io.InputStreamReader
 class Comments: Client() {
 
     fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
-        var commentaries = arrayListOf<CommentaryModel>()
+        val commentaries = arrayListOf<CommentaryModel>()
         data.beginObject()
         while (data.hasNext()){
             when(data.nextName()) {
@@ -76,14 +76,12 @@ class Comments: Client() {
 
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 commentaries = parseCommentaries(data)
             }
         } catch(err:Exception){
-            err?.printStackTrace()
-            Log.d("TypeErr",err?.message ,err.cause)
-            Log.d("Error","fallo la coneccion")
+            err.printStackTrace()
         }
 
         return commentaries
@@ -91,7 +89,7 @@ class Comments: Client() {
 
     fun makeCommentary(token: String, videoId: Int, text: String): Boolean {
         val con = this._newCon("videos/$videoId/comment-threads", "POST", token)
-        val params:String= "text=$text"
+        val params = "text=$text"
         con.outputStream.write(params.toByteArray())
 
         try {
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 7723eb1..f2d7682 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -2,7 +2,6 @@ package org.libre.agosto.p2play.ajax
 
 import android.util.JsonReader
 import android.util.JsonToken
-import android.util.Log
 import org.libre.agosto.p2play.ManagerSingleton
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.InputStreamReader
@@ -10,7 +9,7 @@ import java.io.InputStreamReader
 class Videos: Client() {
 
     private fun parseVideos(data: JsonReader): ArrayList<VideoModel>{
-        var videos = arrayListOf<VideoModel>()
+        val videos = arrayListOf<VideoModel>()
         data.beginObject()
         while (data.hasNext()){
             when(data.nextName()){
@@ -98,16 +97,16 @@ class Videos: Client() {
         var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw"
         if(filter != "")
             params+="&filter=$filter"
-        var con=this._newCon("videos?$params","GET")
+        val con = this._newCon("videos?$params","GET")
         var videos = arrayListOf<VideoModel>()
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 videos = parseVideos(data)
             }
         } catch(err:Exception){
-            err?.printStackTrace()
+            err.printStackTrace()
         }
         return videos
     }
@@ -127,16 +126,16 @@ class Videos: Client() {
     fun myVideos(token: String, start: Int = 0): ArrayList<VideoModel>{
         val count = ManagerSingleton.videos_count
         val params = "start=$start&count=$count"
-        var con=this._newCon("users/me/videos?$params","GET", token)
+        val con = this._newCon("users/me/videos?$params","GET", token)
         var videos = arrayListOf<VideoModel>()
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 videos = parseVideos(data)
             }
         } catch(err:Exception){
-            err?.printStackTrace()
+            err.printStackTrace()
         }
         return videos
     }
@@ -144,16 +143,16 @@ class Videos: Client() {
     fun videoSubscriptions(token: String, start: Int = 0): ArrayList<VideoModel>{
         val count = ManagerSingleton.videos_count
         val params = "start=$start&count=$count"
-        var con=this._newCon("users/me/subscriptions/videos?$params","GET", token)
+        val con = this._newCon("users/me/subscriptions/videos?$params","GET", token)
         var videos = arrayListOf<VideoModel>()
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 videos = parseVideos(data)
             }
         } catch(err:Exception){
-            err?.printStackTrace()
+            err.printStackTrace()
         }
         return videos
     }
@@ -162,27 +161,27 @@ class Videos: Client() {
         val count = ManagerSingleton.videos_count
         val nsfw = ManagerSingleton.nfsw
         val params = "search=$text&start=$start&count=$count&nsfw=$nsfw"
-        var con=this._newCon("search/videos?$params","GET")
+        val con = this._newCon("search/videos?$params","GET")
         var videos = arrayListOf<VideoModel>()
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
                 videos = parseVideos(data)
             }
         } catch(err:Exception){
-            err?.printStackTrace()
+            err.printStackTrace()
         }
         return videos
     }
 
     fun fullDescription(videoId: Int): String{
-        var con=this._newCon("videos/$videoId/description","GET")
+        val con = this._newCon("videos/$videoId/description","GET")
         var description = ""
         try {
             if (con.responseCode == 200) {
-                var response = InputStreamReader(con.inputStream)
-                var data = JsonReader(response)
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
 
                 data.beginObject()
                 while (data.hasNext()){

From 90f2ab6e7d04d41e8a95004d48e1c097921e765c Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 17 Feb 2019 18:34:38 -0600
Subject: [PATCH 05/10] Trending videos added

---
 .../org/libre/agosto/p2play/MainActivity.kt   | 37 ++++++++++++-------
 .../org/libre/agosto/p2play/ajax/Videos.kt    |  4 ++
 .../drawable/ic_trending_up_black_24dp.xml    |  9 +++++
 .../main/res/menu/activity_main_drawer.xml    |  4 ++
 app/src/main/res/values-es/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  6 ++-
 6 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_trending_up_black_24dp.xml

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 97a823f..1ef6fa8 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -60,7 +60,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         // Init RecyclerView
         this.initRecycler()
 
-        this.getLastVideos()
+        this.getTrengindVideos()
 
         swipeContainer.setOnRefreshListener {
             this.refresh()
@@ -127,6 +127,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         when(section){
             "local" -> this.getLocalVideos()
             "popular" -> this.getPopularVideos()
+            "trending" -> this.getTrengindVideos()
             "last" -> this.getLastVideos()
             "sub" -> this.getSubscriptionVideos()
             "search" -> this.searchVideos()
@@ -182,6 +183,19 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
+    // Trending videos
+    private fun getTrengindVideos(){
+        swipeContainer.isRefreshing = true
+        section = "trending"
+        setTitle(R.string.title_trending)
+        AsyncTask.execute {
+            val videos = client.getTrendingVideos(this.pagination)
+            runOnUiThread {
+                this.addVideos(videos)
+            }
+        }
+    }
+
     // Local videos
     private fun getLocalVideos(){
         swipeContainer.isRefreshing = true
@@ -286,19 +300,12 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
         // item.isChecked = true
         when (item.itemId) {
-            R.id.nav_subscriptions->{
-                getSubscriptionVideos()
-            }
-            R.id.nav_popular-> {
-                getPopularVideos()
-            }
-            R.id.nav_recent-> {
-                getLastVideos()
-            }
-            R.id.nav_local-> {
-                getLocalVideos()
-            }
-            R.id.nav_about-> {
+            R.id.nav_subscriptions -> getSubscriptionVideos()
+            R.id.nav_popular -> getPopularVideos()
+            R.id.nav_trending -> getTrengindVideos()
+            R.id.nav_recent -> getLastVideos()
+            R.id.nav_local -> getLocalVideos()
+            R.id.nav_about -> {
                 val intent = Intent(this, AboutActivity::class.java)
                 startActivity(intent)
             }
@@ -320,6 +327,7 @@ 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)
             }
@@ -355,6 +363,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         when(section){
             "local" -> this.getLocalVideos()
             "popular" -> this.getPopularVideos()
+            "trending" -> this.getTrengindVideos()
             "last" -> this.getLastVideos()
             "sub" -> this.getSubscriptionVideos()
             "search" -> this.searchVideos()
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index f2d7682..46d2040 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -119,6 +119,10 @@ class Videos: Client() {
         return this.getVideos(start,"-views")
     }
 
+    fun getTrendingVideos(start:Int = 0): ArrayList<VideoModel>{
+        return this.getVideos(start,"-trending")
+    }
+
     fun getLocalVideos(start:Int = 0): ArrayList<VideoModel>{
         return this.getVideos(start,"-publishedAt", "local")
     }
diff --git a/app/src/main/res/drawable/ic_trending_up_black_24dp.xml b/app/src/main/res/drawable/ic_trending_up_black_24dp.xml
new file mode 100644
index 0000000..4c9da94
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trending_up_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="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z"/>
+</vector>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 9f0a1dc..da35853 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -16,6 +16,10 @@
                 android:id="@+id/nav_popular"
                 android:icon="@android:drawable/btn_star"
                 android:title="@string/nav_popular" />
+            <item
+                android:id="@+id/nav_trending"
+                android:icon="@drawable/ic_trending_up_black_24dp"
+                android:title="@string/nav_trending" />
             <item
                 android:id="@+id/nav_recent"
                 android:icon="@drawable/ic_add_circle_black_24dp"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index dfcf631..07fbd46 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -92,6 +92,8 @@
     <string name="pref_message_exit">Reinicia para aplicar los cambios</string>
     <string name="pref_videos_count_title">Videos por pagina</string>
     <string name="showMore">Mostrar mas</string>
+    <string name="nav_trending">Tendencias</string>
+    <string name="title_trending">Tendencias</string>
     <!-- End Settings strings -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85d03ca..fa61479 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,8 +48,9 @@
     <!-- End Login strings -->
     <!-- Start Main strings -->
     <string name="title_subscriptions">Subscriptions</string>
-    <string name="title_recent">Recent videos</string>
-    <string name="title_popular">Popular videos</string>
+    <string name="title_recent">Recent</string>
+    <string name="title_popular">Popular</string>
+    <string name="title_trending">Trending</string>
     <string name="title_local">Local videos</string>
     <string name="title_myVideos">My videos</string>
     <string name="view_text">views</string>
@@ -64,6 +65,7 @@
     <!-- Start Menu strings -->
     <string name="nav_subscriptions">Subscriptions</string>
     <string name="nav_popular">Popular</string>
+    <string name="nav_trending">Trending</string>
     <string name="nav_recent">Recent</string>
     <string name="nav_local">Local</string>
     <string name="nav_about">About</string>

From d360a1849ec7ec7c02ff6256d5b6f1e6b87383f6 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 17 Feb 2019 18:42:08 -0600
Subject: [PATCH 06/10] Show more fixed

---
 .../main/java/org/libre/agosto/p2play/ReproductorActivity.kt    | 2 +-
 app/src/main/res/layout/activity_reproductor.xml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 8e3e149..981946f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -61,7 +61,7 @@ class ReproductorActivity : AppCompatActivity() {
             viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
             userTxt.text = this.video.username
             descriptionVideoTxt.text = this.video.description
-            val haveDescription = this.video.description.contains("...", ignoreCase = false)
+            val haveDescription = this.video.description.endsWith("...")
             if (haveDescription) {
                 showMoreBtn.visibility = View.VISIBLE
             }
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index b35d434..b1195f6 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -224,7 +224,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/showMore"
-                android:visibility="visible" />
+                android:visibility="gone" />
 
             <View
                 android:id="@+id/divider"

From 743c3147c1ce56c539feb92dded9de71e41da2d1 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sat, 23 Feb 2019 15:14:56 -0600
Subject: [PATCH 07/10] Models parse funcion added and channel model added

---
 app/build.gradle                              |  2 +-
 .../org/libre/agosto/p2play/ajax/Actions.kt   |  7 ++
 .../java/org/libre/agosto/p2play/ajax/Auth.kt |  7 ++
 .../org/libre/agosto/p2play/ajax/Channels.kt  | 35 +++++++++
 .../org/libre/agosto/p2play/ajax/Client.kt    |  3 +
 .../org/libre/agosto/p2play/ajax/Comments.kt  | 57 +++-----------
 .../org/libre/agosto/p2play/ajax/Videos.kt    | 75 +++----------------
 .../agosto/p2play/models/ChannelModel.kt      | 64 ++++++++++++++++
 .../agosto/p2play/models/CommentaryModel.kt   | 49 +++++++++++-
 .../libre/agosto/p2play/models/VideoModel.kt  | 73 +++++++++++++++++-
 10 files changed, 261 insertions(+), 111 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/models/ChannelModel.kt

diff --git a/app/build.gradle b/app/build.gradle
index 7cd9331..38bd24a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "mx.agosto182.p2play"
+        applicationId "org.libre.agosto.p2play"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode 4
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
index 77b313a..7fb0929 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
@@ -21,6 +21,7 @@ class Actions: Client() {
             response = -1
         }
 
+        con.disconnect()
         return response
     }
 
@@ -38,6 +39,7 @@ class Actions: Client() {
             response = -1
         }
 
+        con.disconnect()
         return response
     }
 
@@ -61,6 +63,7 @@ class Actions: Client() {
                         }
                     }
                 }
+                data.close()
             }
         }
         catch (err: Exception){
@@ -68,6 +71,7 @@ class Actions: Client() {
             isSubscribed = false
         }
 
+        con.disconnect()
         return isSubscribed
     }
 
@@ -87,6 +91,7 @@ class Actions: Client() {
             response = -1
         }
 
+        con.disconnect()
         return response
     }
 
@@ -110,6 +115,7 @@ class Actions: Client() {
                         }
                     }
                 }
+                con.disconnect()
             }
         }
         catch (err: Exception){
@@ -117,6 +123,7 @@ class Actions: Client() {
             rating = "none"
         }
 
+        con.disconnect()
         return rating
     }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
index d281371..fc88bdb 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Auth.kt
@@ -35,6 +35,7 @@ class Auth: Client() {
                 }
 
                 data.endObject()
+                data.close()
                 token.status = 1
 
             }
@@ -47,6 +48,7 @@ class Auth: Client() {
             token.status = 0
         }
 
+        con.disconnect()
         return token
     }
 
@@ -67,6 +69,7 @@ class Auth: Client() {
             response = -1
         }
 
+        con.disconnect()
         return response
 
     }
@@ -93,6 +96,7 @@ class Auth: Client() {
                 }
 
                 data.endObject()
+                data.close()
                 token.status = 1
 
             }
@@ -105,6 +109,7 @@ class Auth: Client() {
             token.status = 0
         }
 
+        con.disconnect()
         return token
     }
 
@@ -158,6 +163,7 @@ class Auth: Client() {
                 }
 
                 data.endObject()
+                data.close()
                 user.status = 1
 
             }
@@ -170,6 +176,7 @@ class Auth: Client() {
             user.status = 0
         }
 
+        con.disconnect()
         return user
     }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
new file mode 100644
index 0000000..798fed1
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
@@ -0,0 +1,35 @@
+package org.libre.agosto.p2play.ajax
+
+import android.util.JsonReader
+import android.util.JsonToken
+import org.libre.agosto.p2play.models.ChannelModel
+import org.libre.agosto.p2play.models.CommentaryModel
+import java.io.InputStreamReader
+
+class Channels: Client() {
+
+    private fun parseChannel(data: JsonReader): ChannelModel{
+        val channel = ChannelModel()
+
+        data.close()
+
+        return channel
+    }
+
+    fun getChannelInfo(channelId: String): ChannelModel {
+        val con = this._newCon("video-channels/$channelId", "GET")
+        var channel = ChannelModel()
+        try {
+            if(con.responseCode == 200){
+                val response = InputStreamReader(con.inputStream)
+                val data = JsonReader(response)
+                channel.parseChannel(data)
+                data.close()
+            }
+        }catch (err: Exception) {
+            err.printStackTrace()
+        }
+
+        return channel
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
index 1d4aeaf..815779f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
@@ -56,10 +56,13 @@ open class Client {
                         }
                     }
                 }
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
+
+        con.disconnect()
         return keys
     }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
index 7fd8c97..9cf1190 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
@@ -8,7 +8,7 @@ import java.io.InputStreamReader
 
 class Comments: Client() {
 
-    fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
+    private fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
         val commentaries = arrayListOf<CommentaryModel>()
         data.beginObject()
         while (data.hasNext()){
@@ -17,47 +17,7 @@ class Comments: Client() {
                     data.beginArray()
                     while (data.hasNext()) {
                         val comment = CommentaryModel()
-                        data.beginObject()
-                        while (data.hasNext()) {
-                            val key = data.nextName()
-                            when (key.toString()) {
-                                "id" -> comment.id = data.nextInt()
-                                "threadId" -> comment.threadId = data.nextInt()
-                                "text" -> comment.commentary = data.nextString()
-                                "totalReplies" -> comment.replies = data.nextInt()
-                                "account" -> {
-                                    data.beginObject()
-                                    while (data.hasNext()){
-                                        val acKey = data.nextName()
-                                        when(acKey.toString()){
-                                            "displayName"-> comment.username=data.nextString()
-                                            "avatar"-> {
-                                                if(data.peek() == JsonToken.BEGIN_OBJECT){
-                                                    data.beginObject()
-                                                    while (data.hasNext()){
-                                                        val avKey = data.nextName()
-                                                        when(avKey){
-                                                            "path"-> comment.userImageUrl = data.nextString()
-                                                            else-> data.skipValue()
-                                                        }
-                                                    }
-                                                    data.endObject()
-                                                }
-                                                else
-                                                    data.skipValue()
-
-                                            }
-                                            "uuid" -> comment.userUuid = data.nextString()
-                                            "host" -> comment.userHost = data.nextString()
-                                            else -> data.skipValue()
-                                        }
-                                    }
-                                    data.endObject()
-                                }
-                                else -> data.skipValue()
-                            }
-                        }
-                        data.endObject()
+                        comment.parseCommentary(data)
                         commentaries.add(comment)
                     }
                     data.endArray()
@@ -79,11 +39,12 @@ class Comments: Client() {
                 val response = InputStreamReader(con.inputStream)
                 val data = JsonReader(response)
                 commentaries = parseCommentaries(data)
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
-
+        con.disconnect()
         return commentaries
     }
 
@@ -92,19 +53,25 @@ class Comments: Client() {
         val params = "text=$text"
         con.outputStream.write(params.toByteArray())
 
+        var response: Boolean
+
         try {
             if (con.responseCode == 200) {
-                return true
+                con.disconnect()
+                response = true
             }
             else{
                 Log.d("Status", con.responseMessage)
+                response = false
             }
         }
         catch (err: Exception){
             err.printStackTrace()
+            response = false
         }
 
-        return false
+        con.disconnect()
+        return response
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 46d2040..341b786 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -17,68 +17,7 @@ class Videos: Client() {
                     data.beginArray()
                     while (data.hasNext()) {
                         val video = VideoModel()
-                        data.beginObject()
-                        while (data.hasNext()){
-                            val key = data.nextName()
-                            when (key.toString()) {
-                                "id"-> video.id = data.nextInt()
-                                "name"->{
-                                    video.name= data.nextString()
-                                }
-                                "description"->{
-                                    if(data.peek() == JsonToken.STRING)
-                                        video.description = data.nextString()
-                                    else
-                                        data.skipValue()
-                                }
-                                "duration"->{
-                                    video.duration = data.nextInt()
-                                }
-                                "thumbnailPath"->{
-                                    video.thumbUrl = data.nextString()
-                                }
-                                "embedPath"->{
-                                    video.embedUrl = data.nextString()
-                                }
-                                "views"->{
-                                    video.views = data.nextInt()
-                                }
-                                "channel"->{
-                                    data.beginObject()
-                                    while (data.hasNext()){
-                                        val acKey = data.nextName()
-                                        when(acKey.toString()){
-                                            "displayName"-> video.username=data.nextString()
-                                            "avatar"-> {
-                                                if(data.peek() == JsonToken.BEGIN_OBJECT){
-                                                    data.beginObject()
-                                                    while (data.hasNext()){
-                                                        val avKey = data.nextName()
-                                                        when(avKey){
-                                                            "path"-> video.userImageUrl = data.nextString()
-                                                            else-> data.skipValue()
-                                                        }
-                                                    }
-                                                    data.endObject()
-                                                }
-                                                else
-                                                    data.skipValue()
-
-                                            }
-                                            "uuid" -> video.userUuid = data.nextString()
-                                            "host" -> video.userHost = data.nextString()
-                                            "name" -> video.nameChannel = data.nextString()
-                                            else-> data.skipValue()
-                                        }
-                                    }
-                                    data.endObject()
-                                }
-                                else->{
-                                    data.skipValue()
-                                }
-                            }
-                        }
-                        data.endObject()
+                        video.parseVideo(data)
                         videos.add(video)
                     }
                     data.endArray()
@@ -104,10 +43,12 @@ class Videos: Client() {
                 val response = InputStreamReader(con.inputStream)
                 val data = JsonReader(response)
                 videos = parseVideos(data)
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
+        con.disconnect()
         return videos
     }
 
@@ -137,10 +78,13 @@ class Videos: Client() {
                 val response = InputStreamReader(con.inputStream)
                 val data = JsonReader(response)
                 videos = parseVideos(data)
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
+
+        con.disconnect()
         return videos
     }
 
@@ -154,10 +98,13 @@ class Videos: Client() {
                 val response = InputStreamReader(con.inputStream)
                 val data = JsonReader(response)
                 videos = parseVideos(data)
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
+
+        con.disconnect()
         return videos
     }
 
@@ -172,10 +119,12 @@ class Videos: Client() {
                 val response = InputStreamReader(con.inputStream)
                 val data = JsonReader(response)
                 videos = parseVideos(data)
+                data.close()
             }
         } catch(err:Exception){
             err.printStackTrace()
         }
+        con.disconnect()
         return videos
     }
 
@@ -197,12 +146,12 @@ class Videos: Client() {
                 }
                 data.endObject()
                 data.close()
-
             }
         } catch(err:Exception){
             err.printStackTrace()
             description = "Error!"
         }
+        con.disconnect()
         return description
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/ChannelModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/ChannelModel.kt
new file mode 100644
index 0000000..1966c70
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/models/ChannelModel.kt
@@ -0,0 +1,64 @@
+package org.libre.agosto.p2play.models
+
+import android.util.JsonReader
+import android.util.JsonToken
+
+class ChannelModel (
+        var id: Int = 0,
+        var url: String = "",
+        var nameChannel: String = "",
+        var followers: Int = 0,
+        var host: String = "",
+        var name: String = "",
+        var description: String = "",
+        var support: String = "",
+        var channelImg: String = ""
+) {
+    fun getAccount(): String {
+        return "$nameChannel@$host"
+    }
+
+    fun parseChannel(data: JsonReader) {
+        data.beginObject()
+
+        while (data.hasNext()) {
+
+            when(data.nextName()){
+                "id" -> this.id = data.nextInt()
+                "url" -> this.url = data.nextString()
+                "name" -> this.nameChannel = data.nextString()
+                "host" -> this.host = data.nextString()
+                "followersCount" -> this.followers = data.nextInt()
+                "displayName" -> this.name = data.nextString()
+                "description" -> {
+                    if(data.peek() == JsonToken.STRING)
+                        this.description = data.nextString()
+                    else
+                        data.skipValue()
+                }
+                "support" -> {
+                    if(data.peek() == JsonToken.STRING)
+                        this.support = data.nextString()
+                    else
+                        data.skipValue()
+                }
+                "avatar" -> {
+                    if(data.peek() == JsonToken.BEGIN_OBJECT){
+                        data.beginObject()
+                        while (data.hasNext()){
+                            when(data.nextName()){
+                                "path" -> this.channelImg = data.nextString()
+                                else -> data.skipValue()
+                            }
+                        }
+                        data.endObject()
+                    }
+                    else
+                        data.skipValue()
+                }
+                else -> data.skipValue()
+            }
+        }
+        data.endObject()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
index f1b5b47..55543c2 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
@@ -1,5 +1,8 @@
 package org.libre.agosto.p2play.models
 
+import android.util.JsonReader
+import android.util.JsonToken
+
 class CommentaryModel (
         var id: Int = 0,
         var threadId: Int = 0,
@@ -9,4 +12,48 @@ class CommentaryModel (
         var commentary: String = "",
         var userHost: String = "",
         var replies: Int = 0
-)
\ No newline at end of file
+) {
+    fun parseCommentary(data: JsonReader) {
+        data.beginObject()
+        while (data.hasNext()) {
+            val key = data.nextName()
+            when (key.toString()) {
+                "id" -> this.id = data.nextInt()
+                "threadId" -> this.threadId = data.nextInt()
+                "text" -> this.commentary = data.nextString()
+                "totalReplies" -> this.replies = data.nextInt()
+                "account" -> {
+                    data.beginObject()
+                    while (data.hasNext()){
+                        val acKey = data.nextName()
+                        when(acKey.toString()){
+                            "displayName"-> this.username=data.nextString()
+                            "avatar"-> {
+                                if(data.peek() == JsonToken.BEGIN_OBJECT){
+                                    data.beginObject()
+                                    while (data.hasNext()){
+                                        val avKey = data.nextName()
+                                        when(avKey){
+                                            "path"-> this.userImageUrl = data.nextString()
+                                            else-> data.skipValue()
+                                        }
+                                    }
+                                    data.endObject()
+                                }
+                                else
+                                    data.skipValue()
+
+                            }
+                            "uuid" -> this.userUuid = data.nextString()
+                            "host" -> this.userHost = data.nextString()
+                            else -> data.skipValue()
+                        }
+                    }
+                    data.endObject()
+                }
+                else -> data.skipValue()
+            }
+        }
+        data.endObject()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index e7bfa95..963d2f2 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -1,5 +1,7 @@
 package org.libre.agosto.p2play.models
 
+import android.util.JsonReader
+import android.util.JsonToken
 import java.io.Serializable
 
 class VideoModel(
@@ -15,4 +17,73 @@ class VideoModel(
         var userUuid: String = "",
         var userHost: String = "",
         var nameChannel: String = ""
-        ):Serializable
\ No newline at end of file
+):Serializable {
+    fun getAccount(): String {
+        return "$nameChannel@$userHost"
+    }
+
+    fun parseVideo(data: JsonReader){
+        data.beginObject()
+        while (data.hasNext()){
+            val key = data.nextName()
+            when (key.toString()) {
+                "id"-> this.id = data.nextInt()
+                "name"->{
+                    this.name= data.nextString()
+                }
+                "description"->{
+                    if(data.peek() == JsonToken.STRING)
+                        this.description = data.nextString()
+                    else
+                        data.skipValue()
+                }
+                "duration"->{
+                    this.duration = data.nextInt()
+                }
+                "thumbnailPath"->{
+                    this.thumbUrl = data.nextString()
+                }
+                "embedPath"->{
+                    this.embedUrl = data.nextString()
+                }
+                "views"->{
+                    this.views = data.nextInt()
+                }
+                "channel"->{
+                    data.beginObject()
+                    while (data.hasNext()){
+                        val acKey = data.nextName()
+                        when(acKey.toString()){
+                            "displayName"-> this.username=data.nextString()
+                            "avatar"-> {
+                                if(data.peek() == JsonToken.BEGIN_OBJECT){
+                                    data.beginObject()
+                                    while (data.hasNext()){
+                                        val avKey = data.nextName()
+                                        when(avKey){
+                                            "path"-> this.userImageUrl = data.nextString()
+                                            else-> data.skipValue()
+                                        }
+                                    }
+                                    data.endObject()
+                                }
+                                else
+                                    data.skipValue()
+
+                            }
+                            "uuid" -> this.userUuid = data.nextString()
+                            "host" -> this.userHost = data.nextString()
+                            "name" -> this.nameChannel = data.nextString()
+                            else-> data.skipValue()
+                        }
+                    }
+                    data.endObject()
+                }
+                else->{
+                    data.skipValue()
+                }
+            }
+        }
+        data.endObject()
+    }
+}
\ No newline at end of file

From 398265c6ed7411d23b5e9c26b28b76e9180539a6 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 24 Feb 2019 10:34:12 -0600
Subject: [PATCH 08/10] Channel view maked and working

---
 app/src/main/AndroidManifest.xml              |   6 +-
 .../libre/agosto/p2play/ChannelActivity.kt    | 149 +++++++++++++++++
 .../agosto/p2play/ReproductorActivity.kt      |  14 +-
 .../p2play/adapters/CommentariesAdapter.kt    |  11 +-
 .../agosto/p2play/adapters/VideosAdapter.kt   |  12 +-
 .../org/libre/agosto/p2play/ajax/Channels.kt  |   4 +-
 .../org/libre/agosto/p2play/ajax/Client.kt    |   1 +
 .../org/libre/agosto/p2play/ajax/Videos.kt    |  20 +++
 app/src/main/res/layout/activity_channel.xml  | 154 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   5 +
 10 files changed, 359 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
 create mode 100644 app/src/main/res/layout/activity_channel.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 461580c..e03938d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,8 @@
         android:roundIcon="@mipmap/ic_p2play"
         android:supportsRtl="true"
         android:theme="@style/P2playTheme">
+        <activity android:name=".ChannelActivity"
+            android:theme="@style/P2playTheme.noBar"></activity>
         <activity
             android:name=".SplashActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar">
@@ -27,9 +29,9 @@
             android:theme="@style/P2playTheme.NoActionBar" />
         <activity
             android:name=".ReproductorActivity"
+            android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
-            android:theme="@style/P2playTheme.noBar"
-            android:configChanges="orientation|screenSize"/>
+            android:theme="@style/P2playTheme.noBar" />
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".AboutActivity" />
diff --git a/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
new file mode 100644
index 0000000..dc58c7b
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
@@ -0,0 +1,149 @@
+package org.libre.agosto.p2play
+
+import android.os.AsyncTask
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.View
+import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.activity_channel.*
+import org.libre.agosto.p2play.adapters.VideosAdapter
+import org.libre.agosto.p2play.ajax.Actions
+import org.libre.agosto.p2play.ajax.Channels
+import org.libre.agosto.p2play.ajax.Videos
+import org.libre.agosto.p2play.models.ChannelModel
+import org.libre.agosto.p2play.models.VideoModel
+
+class ChannelActivity : AppCompatActivity() {
+    private lateinit var channelId: String
+    private lateinit var channel: ChannelModel
+    private var isSubcribed: Boolean = false
+    private val _channel = Channels()
+    private val _videos = Videos()
+    private val _actions = Actions()
+
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var viewAdapter: RecyclerView.Adapter<VideosAdapter.ViewHolder>
+    private lateinit var viewManager: RecyclerView.LayoutManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_channel)
+
+        channelId = this.intent.extras.getString("channel")
+
+        viewManager = LinearLayoutManager(this)
+
+        subcriptionBtn.setOnClickListener {
+            subscribeAction()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        getChannel()
+        getSubscription()
+        getVideos()
+
+        if(ManagerSingleton.user.status == 1) {
+            subcriptionBtn.visibility = View.VISIBLE
+            getSubscription()
+        }
+    }
+
+    private fun getChannel() {
+        AsyncTask.execute {
+            channel = _channel.getChannelInfo(channelId)
+            runOnUiThread {
+                usernameProfile.text = channel.name
+                hostTxt.text = channel.host
+                subcriptionsTxt.text = channel.followers.toString()
+                if(channel.channelImg != "")
+                    Picasso.get().load("https://${ManagerSingleton.url}${channel.channelImg}").into(channelImg)
+            }
+        }
+    }
+
+    private fun subscribe() {
+        AsyncTask.execute {
+            val res = _actions.subscribe(ManagerSingleton.token.token, channel.getAccount())
+            runOnUiThread {
+                if(res == 1){
+                    subcriptionBtn.text = getString(R.string.unSubscribeBtn)
+                    ManagerSingleton.Toast(getString(R.string.subscribeMsg), this)
+                    getSubscription()
+                }
+                else {
+                    ManagerSingleton.Toast(getString(R.string.errorMsg), this)
+                }
+            }
+        }
+    }
+
+    private fun unSubscribe() {
+        AsyncTask.execute {
+            val res = _actions.unSubscribe(ManagerSingleton.token.token, channel.getAccount())
+            runOnUiThread {
+                if(res == 1){
+                    subcriptionBtn.text = getString(R.string.subscribeBtn)
+                    ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this)
+                    getSubscription()
+                }
+                else {
+                    ManagerSingleton.Toast(getString(R.string.errorMsg), this)
+                }
+            }
+        }
+    }
+
+    private fun subscribeAction() {
+        if(isSubcribed)
+            unSubscribe()
+        else
+            subscribe()
+    }
+
+    private fun getSubscription() {
+        AsyncTask.execute {
+            isSubcribed = _actions.getSubscription(ManagerSingleton.token.token, channel.getAccount())
+            runOnUiThread {
+                if(isSubcribed){
+                    subcriptionBtn.text = getText(R.string.unSubscribeBtn)
+                }
+                else {
+                    subcriptionBtn.text = getText(R.string.subscribeBtn)
+                }
+            }
+        }
+    }
+
+    private fun getVideos() {
+        AsyncTask.execute {
+            val videos = _videos.channelVideos(channel.getAccount(), 0)
+            runOnUiThread {
+                initRecycler(videos)
+            }
+        }
+    }
+
+    // Generic function for set data to RecyclerView
+    private fun initRecycler(data: ArrayList<VideoModel>){
+        // val data = arrayListOf<VideoModel>()
+        viewAdapter = VideosAdapter(data)
+
+        recyclerView = findViewById<RecyclerView>(R.id.listVideosChannel).apply {
+            // use this setting to improve performance if you know that changes
+            // in content do not change the layout size of the RecyclerView
+            setHasFixedSize(true)
+
+            // use a linear layout manager
+            layoutManager = viewManager
+
+            // specify an viewAdapter (see also next example)
+            adapter = viewAdapter
+        }
+        // swipeContainer.isRefreshing = false
+    }
+}
\ No newline at end of file
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 981946f..4370d7f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -2,6 +2,7 @@ package org.libre.agosto.p2play
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -73,7 +74,6 @@ class ReproductorActivity : AppCompatActivity() {
             // Load the video
             videoView.loadUrl("https://"+ManagerSingleton.url+this.video.embedUrl)
 
-
         }
         catch (err:Exception){
             err.printStackTrace()
@@ -89,14 +89,19 @@ class ReproductorActivity : AppCompatActivity() {
         dislikeLayout.setOnClickListener { rate("dislike") }
         commentaryBtn.setOnClickListener { makeComment() }
         showMoreBtn.setOnClickListener { getDescription() }
+
+        userImg.setOnClickListener {
+            val intent = Intent(this, ChannelActivity::class.java)
+            intent.putExtra("channel", video.getAccount())
+            startActivity(intent)
+        }
     }
 
     private fun subscribe(){
-        val account = this.video.nameChannel+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
-            val res = this._actions.subscribe(ManagerSingleton.token.token, account)
+            val res = this._actions.subscribe(ManagerSingleton.token.token, video.getAccount())
             if (res == 1) {
                 runOnUiThread {
                     ManagerSingleton.Toast(getString(R.string.subscribeMsg), this)
@@ -107,11 +112,10 @@ class ReproductorActivity : AppCompatActivity() {
     }
 
     private fun unSubscribe(){
-        val account = this.video.nameChannel+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
-            val res = this._actions.unSubscribe(ManagerSingleton.token.token, account)
+            val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getAccount())
             if (res == 1) {
                 runOnUiThread {
                     ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this)
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 e02e325..96165ec 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
@@ -14,10 +14,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
-import org.libre.agosto.p2play.MainActivity
-import org.libre.agosto.p2play.ManagerSingleton
-import org.libre.agosto.p2play.R
-import org.libre.agosto.p2play.ReproductorActivity
+import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.InputStream
@@ -63,6 +60,12 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
         // - replace the contents of the view with that element
         holder.username.text = myDataset[position].username
 
+        // holder.userImg.setOnClickListener {
+            // val intent = Intent(holder.context, ChannelActivity::class.java)
+            // intent.putExtra("channel", myDataset[position])
+            // holder.context.startActivity(intent)
+        // }
+
         if(myDataset[position].userImageUrl!="")
             Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg);
 
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 4a5624c..8281661 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
@@ -13,10 +13,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.squareup.picasso.Picasso
-import org.libre.agosto.p2play.MainActivity
-import org.libre.agosto.p2play.ManagerSingleton
-import org.libre.agosto.p2play.R
-import org.libre.agosto.p2play.ReproductorActivity
+import org.libre.agosto.p2play.*
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.InputStream
 import java.io.Serializable
@@ -69,6 +66,13 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             intent.putExtra("video", myDataset[position] as Serializable)
             holder.context.startActivity(intent)
         }
+
+        holder.userImg.setOnClickListener {
+            val intent = Intent(holder.context, ChannelActivity::class.java)
+            intent.putExtra("channel", myDataset[position].getAccount())
+            holder.context.startActivity(intent)
+        }
+
         if(myDataset[position].userImageUrl!="")
             Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg)
         else
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
index 798fed1..906b907 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
@@ -16,8 +16,8 @@ class Channels: Client() {
         return channel
     }
 
-    fun getChannelInfo(channelId: String): ChannelModel {
-        val con = this._newCon("video-channels/$channelId", "GET")
+    fun getChannelInfo(account: String): ChannelModel {
+        val con = this._newCon("video-channels/$account", "GET")
         var channel = ChannelModel()
         try {
             if(con.responseCode == 200){
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
index 815779f..b4d627c 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import org.libre.agosto.p2play.ManagerSingleton
 import org.libre.agosto.p2play.models.HostModel
 import java.io.InputStreamReader
+import java.io.Reader
 import java.net.HttpURLConnection
 import java.net.URL
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 341b786..fb47ff2 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -154,4 +154,24 @@ class Videos: Client() {
         con.disconnect()
         return description
     }
+
+    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")
+        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
+    }
 }
\ 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
new file mode 100644
index 0000000..c78b087
--- /dev/null
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.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"
+    android:layout_height="wrap_content"
+    tools:context=".ChannelActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/linearLayout2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/colorProfile"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:paddingTop="20dp"
+                android:paddingBottom="10dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageButton
+                    android:id="@+id/channelImg"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:adjustViewBounds="false"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/app_name"
+                    android:cropToPadding="false"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/default_avatar" />
+
+                <TextView
+                    android:id="@+id/usernameProfile"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="@android:color/white" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:baselineAligned="false">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/textView2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/followersIndicator"
+                            android:textAlignment="center"
+                            android:textColor="@android:color/white"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/subcriptionsTxt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:textAlignment="textStart"
+                            android:textColor="@android:color/white" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/textView3"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/hostIndicator"
+                            android:textAlignment="center"
+                            android:textColor="@android:color/white"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/hostTxt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:textAlignment="textStart"
+                            android:textColor="@android:color/white" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/subcriptionBtn"
+                    style="@style/Widget.AppCompat.Button.Colored"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/subscribeBtn"
+                    android:textAlignment="center"
+                    android:visibility="invisible" />
+            </LinearLayout>
+
+            <FrameLayout
+                android:id="@+id/frameLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+                tools:layout_editor_absoluteX="0dp">
+
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Videos:"
+                    android:textStyle="bold"
+                    tools:layout_editor_absoluteX="176dp"
+                    tools:layout_editor_absoluteY="214dp" />
+            </FrameLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/listVideosChannel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none" />
+
+        </LinearLayout>
+    </ScrollView>
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa61479..c07a46d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,5 +107,10 @@
     <string name="pref_message_exit">Restart app to apply changes</string>
     <string name="pref_videos_count_title">Videos per page</string>
     <!-- End Settings strings -->
+    <!-- Start Channel strings -->
+    <string name="followersIndicator">Followers:</string>
+    <string name="hostIndicator">Host:</string>
+    <!-- End Channel strings -->
+
 
 </resources>

From abcf2f0e6ef4c105f2597aeaf79ab993606cecb1 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Sun, 24 Feb 2019 20:53:40 -0600
Subject: [PATCH 09/10] Report and share videos works

---
 .../agosto/p2play/ReproductorActivity.kt      | 101 +++++++++++++-----
 .../org/libre/agosto/p2play/ajax/Actions.kt   |  17 +++
 .../libre/agosto/p2play/models/VideoModel.kt  |   6 ++
 app/src/main/res/drawable/ic_alert.xml        |  25 +++++
 app/src/main/res/drawable/ic_share.xml        |  29 +++++
 .../main/res/layout/activity_reproductor.xml  |  60 +++++++++--
 app/src/main/res/layout/report_dialog.xml     |  26 +++++
 app/src/main/res/values-es/strings.xml        |   4 +
 app/src/main/res/values/strings.xml           |   8 +-
 9 files changed, 236 insertions(+), 40 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_alert.xml
 create mode 100644 app/src/main/res/drawable/ic_share.xml
 create mode 100644 app/src/main/res/layout/report_dialog.xml

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 4370d7f..575ea1d 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -2,6 +2,7 @@ package org.libre.agosto.p2play
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
@@ -11,12 +12,14 @@ 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 android.view.View
 import android.view.WindowManager
 import android.webkit.WebChromeClient
+import android.widget.EditText
 import android.widget.FrameLayout
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_reproductor.*
@@ -57,7 +60,7 @@ class ReproductorActivity : AppCompatActivity() {
         videoView.settings.domStorageEnabled = true
 
         try {
-            this.video =  this.intent.extras.getSerializable("video") as VideoModel
+            this.video = this.intent.extras.getSerializable("video") as VideoModel
             tittleVideoTxt.text = this.video.name
             viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
             userTxt.text = this.video.username
@@ -69,13 +72,12 @@ class ReproductorActivity : AppCompatActivity() {
             hostTxt.text = this.video.userHost
 
             // Check if user had profile image
-            if(this.video.userImageUrl!="")
-                Picasso.get().load("https://"+ManagerSingleton.url+this.video.userImageUrl).into(userImg)
+            if (this.video.userImageUrl != "")
+                Picasso.get().load("https://" + ManagerSingleton.url + this.video.userImageUrl).into(userImg)
             // Load the video
-            videoView.loadUrl("https://"+ManagerSingleton.url+this.video.embedUrl)
+            videoView.loadUrl("https://" + ManagerSingleton.url + this.video.embedUrl)
 
-        }
-        catch (err:Exception){
+        } catch (err: Exception) {
             err.printStackTrace()
         }
 
@@ -89,6 +91,8 @@ class ReproductorActivity : AppCompatActivity() {
         dislikeLayout.setOnClickListener { rate("dislike") }
         commentaryBtn.setOnClickListener { makeComment() }
         showMoreBtn.setOnClickListener { getDescription() }
+        shareLayout.setOnClickListener { shareIntent() }
+        reportLayout.setOnClickListener { reportIntent() }
 
         userImg.setOnClickListener {
             val intent = Intent(this, ChannelActivity::class.java)
@@ -97,7 +101,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun subscribe(){
+    private fun subscribe() {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -111,7 +115,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun unSubscribe(){
+    private fun unSubscribe() {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -125,7 +129,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun rate(rate: String){
+    private fun rate(rate: String) {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -133,11 +137,10 @@ class ReproductorActivity : AppCompatActivity() {
             if (res == 1) {
                 runOnUiThread {
                     ManagerSingleton.Toast(getString(R.string.rateMsg), this)
-                    if(rate=="like"){
+                    if (rate == "like") {
                         textViewLike.setTextColor(ContextCompat.getColor(this, R.color.colorLike))
                         textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
-                    }
-                    else if(rate=="dislike"){
+                    } else if (rate == "dislike") {
                         textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.colorDislike))
                         textViewLike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
                     }
@@ -146,13 +149,13 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun getRate(){
+    private fun getRate() {
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
             val rate = this._actions.getRate(ManagerSingleton.token.token, this.video.id)
             runOnUiThread {
-                when (rate){
+                when (rate) {
                     "like" -> {
                         textViewLike.setTextColor(ContextCompat.getColor(this, R.color.colorLike))
                         textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
@@ -170,8 +173,8 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun getSubscription(){
-        val account = this.video.nameChannel+"@"+this.video.userHost
+    private fun getSubscription() {
+        val account = this.video.nameChannel + "@" + this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -182,12 +185,11 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    private fun changeSubscribeBtn(subscribed: Boolean){
-        if(subscribed){
+    private fun changeSubscribeBtn(subscribed: Boolean) {
+        if (subscribed) {
             subscribeBtn.text = getText(R.string.unSubscribeBtn)
             subscribeBtn.setOnClickListener { this.unSubscribe() }
-        }
-        else{
+        } else {
             subscribeBtn.text = getText(R.string.subscribeBtn)
             subscribeBtn.setOnClickListener { this.subscribe() }
         }
@@ -220,7 +222,7 @@ class ReproductorActivity : AppCompatActivity() {
     }
 
     private fun makeComment() {
-        if(commentaryText.text.toString() == ""){
+        if (commentaryText.text.toString() == "") {
             ManagerSingleton.Toast(getString(R.string.emptyCommentaryMsg), this)
             return
         }
@@ -232,8 +234,7 @@ class ReproductorActivity : AppCompatActivity() {
                     ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg), this)
                     commentaryText.text.clear()
                     this.getComments()
-                }
-                else {
+                } else {
                     ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg), this)
                 }
             }
@@ -242,19 +243,19 @@ class ReproductorActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        if(ManagerSingleton.user.status == 1) {
+        if (ManagerSingleton.user.status == 1) {
             this.getRate()
             this.getSubscription()
             actionsLayout.visibility = View.VISIBLE
             subscribeBtn.visibility = View.VISIBLE
             commentaryLayout.visibility = View.VISIBLE
-            if(ManagerSingleton.user.avatar != ""){
-                Picasso.get().load("https://"+ManagerSingleton.url+ManagerSingleton.user.avatar).into(userImgCom)
+            if (ManagerSingleton.user.avatar != "") {
+                Picasso.get().load("https://" + ManagerSingleton.url + ManagerSingleton.user.avatar).into(userImgCom)
             }
         }
     }
 
-    fun getDescription(){
+    fun getDescription() {
         AsyncTask.execute {
             val fullDescription = this.videos.fullDescription(this.video.id)
             runOnUiThread {
@@ -264,6 +265,52 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
+    private fun shareIntent() {
+        val sendIntent: Intent = Intent().apply {
+            action = Intent.ACTION_SEND
+            putExtra(Intent.EXTRA_TEXT, "${video.name} ${video.getVideoUrl()}")
+            type = "text/plain"
+        }
+        startActivity(Intent.createChooser(sendIntent, resources.getText(R.string.shareBtn)))
+    }
+
+    private fun reportIntent() {
+        val builder = AlertDialog.Builder(this)
+        // Get the layout inflater
+        val dialog = layoutInflater.inflate(R.layout.report_dialog, null)
+
+        val inputReason = dialog.findViewById<EditText>(R.id.reportText)
+
+        // Inflate and set the layout for the dialog
+        // 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 ->
+                val reason = inputReason.text.toString()
+                reportVideo(reason)
+            }
+            .setNegativeButton("Cancel") { dialog, id ->
+                dialog.cancel()
+            }
+        val alertDialog = builder.create()
+        alertDialog.show()
+    }
+
+    private fun reportVideo(reason: String){
+        AsyncTask.execute {
+            val res = _actions.reportVideo(video.id, reason, ManagerSingleton.token.token)
+
+            runOnUiThread {
+                if(res) {
+                    ManagerSingleton.Toast(getText(R.string.reportDialogMsg).toString(), this)
+                }
+                else {
+                    ManagerSingleton.Toast(getText(R.string.errorMsg).toString(), this)
+                }
+            }
+        }
+    }
+
     internal inner class WebClient: WebChromeClient() {
         private var mCustomView: View? = null
         private var mCustomViewCallback: WebChromeClient.CustomViewCallback? = null
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
index 7fb0929..47a0b47 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Actions.kt
@@ -127,4 +127,21 @@ class Actions: Client() {
         return rating
     }
 
+    fun reportVideo(videoId: Int, reason: String, token: String): Boolean {
+        val con = this._newCon("videos/$videoId/abuse", "POST", token)
+        val params = "reason=$reason"
+        con.outputStream.write(params.toByteArray())
+
+        var response = false
+        try {
+            if(con.responseCode == 200){
+                response = true
+            }
+        } catch (err: Exception) {
+            err.printStackTrace()
+            response = false
+        }
+
+        return response
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index 963d2f2..6059a94 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -6,6 +6,7 @@ import java.io.Serializable
 
 class VideoModel(
         var id: Int = 0,
+        var uuid: String = "",
         var name: String = "",
         var description: String = "",
         var thumbUrl: String = "",
@@ -22,12 +23,17 @@ class VideoModel(
         return "$nameChannel@$userHost"
     }
 
+    fun getVideoUrl(): String {
+        return "https://$userHost/videos/watch/$uuid"
+    }
+
     fun parseVideo(data: JsonReader){
         data.beginObject()
         while (data.hasNext()){
             val key = data.nextName()
             when (key.toString()) {
                 "id"-> this.id = data.nextInt()
+                "uuid" -> this.uuid = data.nextString()
                 "name"->{
                     this.name= data.nextString()
                 }
diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml
new file mode 100644
index 0000000..8ef6143
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alert.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.8716,3.5097L12,1.9603L11.1284,3.5097L2.1284,19.5097L1.2902,21L3,21L21,21L22.7098,21L21.8716,19.5097L12.8716,3.5097Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,17.75C12.6904,17.75 13.25,17.1904 13.25,16.5C13.25,15.8096 12.6904,15.25 12,15.25C11.3096,15.25 10.75,15.8096 10.75,16.5C10.75,17.1904 11.3096,17.75 12,17.75Z"
+      android:strokeWidth="1"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M12,9L12,9A1,1 0,0 1,13 10L13,13A1,1 0,0 1,12 14L12,14A1,1 0,0 1,11 13L11,10A1,1 0,0 1,12 9z"
+      android:strokeWidth="1"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000..e8ba475
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,29 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,15L20,18.0026C20,19.1057 19.1074,20 18.0049,20L5.9951,20C4.8932,20 4,19.1074 4,18.0049L4,5.9951C4,4.8932 4.8959,4 5.9974,4L9,4"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13,4l7.0208,0l0,7.0191"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19,5L12,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index b1195f6..55a9d13 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -124,21 +124,61 @@
                         android:textAlignment="center" />
                 </LinearLayout>
 
-                <Button
-                    android:id="@+id/button4"
+                <LinearLayout
+                    android:id="@+id/reportLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/shareBtn"
-                    android:visibility="gone" />
+                    android:orientation="vertical"
+                    android:visibility="visible">
 
-                <Button
-                    android:id="@+id/button3"
+                    <ImageView
+                        android:id="@+id/imageViewAlert"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="false"
+                        android:contentDescription="@string/dislikeBtn"
+                        android:cropToPadding="false"
+                        android:visibility="visible"
+                        app:srcCompat="@drawable/ic_alert" />
+
+                    <TextView
+                        android:id="@+id/textViewAlert"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:text="@string/reportBtn"
+                        android:textAlignment="center" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/shareLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/reportBtn"
-                    android:visibility="gone" />
+                    android:orientation="vertical"
+                    android:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/imageViewShare"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:adjustViewBounds="false"
+                        android:contentDescription="@string/dislikeBtn"
+                        android:cropToPadding="false"
+                        android:visibility="visible"
+                        app:srcCompat="@drawable/ic_share" />
+
+                    <TextView
+                        android:id="@+id/textViewShare"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:text="@string/shareBtn"
+                        android:textAlignment="center" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/report_dialog.xml b/app/src/main/res/layout/report_dialog.xml
new file mode 100644
index 0000000..8c8b872
--- /dev/null
+++ b/app/src/main/res/layout/report_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_root"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    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"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textMultiLine">
+
+        <requestFocus />
+
+    </EditText>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 07fbd46..d5f57b9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -94,6 +94,10 @@
     <string name="showMore">Mostrar mas</string>
     <string name="nav_trending">Tendencias</string>
     <string name="title_trending">Tendencias</string>
+    <string name="followersIndicator">Seguidores:</string>
+    <string name="hostIndicator">Host:</string>
+    <string name="reportDialog">Razon para reportar:</string>
+    <string name="reportDialogMsg">Has reportado el video</string>
     <!-- End Settings strings -->
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c07a46d..395025a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
     <string name="nav_header_desc" translatable="false">Navigation header</string>
     <string name="comming">Coming soon!</string>
-    <string name="charging">Loading...</string>
+    <string name="charging">Loading…</string>
     <!-- End Global string -->
 
 
@@ -111,6 +111,8 @@
     <string name="followersIndicator">Followers:</string>
     <string name="hostIndicator">Host:</string>
     <!-- End Channel strings -->
-
-
+    <!-- Start Prompt string -->
+    <string name="reportDialog">Reason for report video:</string>
+    <string name="reportDialogMsg">You are reported the video</string>
+    <!-- End Prompt strings -->
 </resources>

From 22a2772a3c5063e1c107d3e1827d13274d923612 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Wed, 27 Feb 2019 09:21:11 -0600
Subject: [PATCH 10/10] Prerelease 0.4

---
 README.md        | 8 ++++----
 app/build.gradle | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8d8c699..7ebdab1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Comming soon!
 ## Features
 
 - Show recent, popular and local list of videos.
-- Reproduce videos (very simple)
+- Reproduce videos
 - Login and register in your instance
 - Pull to refresh
 - Show uploaded videos
@@ -34,12 +34,12 @@ Comming soon!
 - Splash screen
 - Search videos
 - Infinite scroll
-
-## What to do? (in next version)
-
 - Share videos
 - Report videos
 - Peertube profiles
+
+## What to do? (in next version)
+
 - History of videos watched
 - Notifications
 
diff --git a/app/build.gradle b/app/build.gradle
index 38bd24a..8c8b1b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,9 +9,10 @@ android {
     defaultConfig {
         applicationId "org.libre.agosto.p2play"
         minSdkVersion 21
+        //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 4
-        versionName "0.3"
+        versionCode 5
+        versionName "0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {