Report and share videos works

2024-12-31 11:17:53 +01:00 · 2019-02-24 20:53:40 -06:00 · 2019-02-24 20:53:40 -06:00 · abcf2f0e6e
commit abcf2f0e6e
parent 398265c6ed
9 changed files with 236 additions and 40 deletions
--- 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
--- 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
+    }
 }
--- 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()
                }
--- a/app/src/main/res/drawable/ic_alert.xml
+++ 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>
--- a/app/src/main/res/drawable/ic_share.xml
+++ 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>
--- 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
--- a/app/src/main/res/layout/report_dialog.xml
+++ 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>
--- 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>
--- 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>