From 6a50094fdaf5530f387f447cbb0e371cde1e6d11 Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Sat, 15 Dec 2018 14:24:11 +0100
Subject: [PATCH] - Share ability

---
 app/build.gradle                              |  4 +-
 .../peertube/adapter/VideoAdapter.java        | 22 ++++++++
 .../peertube/helper/APIUrlHelper.java         |  4 ++
 .../schueller/peertube/intents/Intents.java   | 29 ++++++++++
 app/src/main/res/layout/row_video.xml         | 56 ++++++++++++++-----
 app/src/main/res/menu/menu_video_row_mode.xml |  7 +++
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 107 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/net/schueller/peertube/intents/Intents.java
 create mode 100644 app/src/main/res/menu/menu_video_row_mode.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8b4c10d..7fa855a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 105
-        versionName "1.0.5"
+        versionCode 106
+        versionName "1.0.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         dependencies {
             implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
index c9fb785..52091c6 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
@@ -3,10 +3,12 @@ package net.schueller.peertube.adapter;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -16,6 +18,7 @@ import net.schueller.peertube.R;
 import net.schueller.peertube.activity.VideoPlayActivity;
 import net.schueller.peertube.helper.APIUrlHelper;
 import net.schueller.peertube.helper.MetaDataHelper;
+import net.schueller.peertube.intents.Intents;
 import net.schueller.peertube.model.Avatar;
 import net.schueller.peertube.model.Video;
 
@@ -91,6 +94,23 @@ public class VideoAdapter extends RecyclerView.Adapter<VideoAdapter.VideoViewHol
 
         });
 
+        holder.moreButton.setOnClickListener(v -> {
+
+            PopupMenu popup = new PopupMenu(context, v);
+            popup.setOnMenuItemClickListener(menuItem -> {
+                switch (menuItem.getItemId()) {
+                    case R.id.menu_share:
+                        Intents.Share(context, videoList.get(position));
+                        return true;
+                    default:
+                        return false;
+                }
+            });
+            popup.inflate(R.menu.menu_video_row_mode);
+            popup.show();
+
+        });
+
     }
 
     public void setData(ArrayList<Video> data) {
@@ -112,6 +132,7 @@ public class VideoAdapter extends RecyclerView.Adapter<VideoAdapter.VideoViewHol
 
         TextView name, videoMeta, videoOwner;
         ImageView thumb, avatar;
+        ImageButton moreButton;
         View mView;
 
         VideoViewHolder(View itemView) {
@@ -121,6 +142,7 @@ public class VideoAdapter extends RecyclerView.Adapter<VideoAdapter.VideoViewHol
             avatar = itemView.findViewById(R.id.avatar);
             videoMeta = itemView.findViewById(R.id.videoMeta);
             videoOwner = itemView.findViewById(R.id.videoOwner);
+            moreButton = itemView.findViewById(R.id.moreButton);
             mView = itemView;
         }
     }
diff --git a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java b/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
index cfed405..c1ed8d2 100644
--- a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
+++ b/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
@@ -23,4 +23,8 @@ public class APIUrlHelper{
     public static String getUrlWithVersion(Context context) {
         return APIUrlHelper.getUrl(context) + "/api/v1/";
     }
+
+    public static String getShareUrl(Context context, String videoUuid) {
+        return APIUrlHelper.getUrl(context) + "/videos/watch/" + videoUuid;
+    }
 }
diff --git a/app/src/main/java/net/schueller/peertube/intents/Intents.java b/app/src/main/java/net/schueller/peertube/intents/Intents.java
new file mode 100644
index 0000000..a31edfb
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/intents/Intents.java
@@ -0,0 +1,29 @@
+package net.schueller.peertube.intents;
+
+import android.content.Context;
+import android.content.Intent;
+import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.model.Video;
+
+
+public class Intents {
+
+
+    /**
+     * https://troll.tv/videos/watch/6edbd9d1-e3c5-4a6c-8491-646e2020469c
+     *
+     * @param context context
+     * @param video video
+     */
+    public static void Share(Context context, Video video) {
+
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_SEND);
+        intent.putExtra(Intent.EXTRA_SUBJECT, video.getName());
+        intent.putExtra(Intent.EXTRA_TEXT, APIUrlHelper.getShareUrl(context, video.getUuid()) );
+        intent.setType("text/plain");
+
+        context.startActivity(intent);
+
+    }
+}
diff --git a/app/src/main/res/layout/row_video.xml b/app/src/main/res/layout/row_video.xml
index 19df68e..3624d98 100644
--- a/app/src/main/res/layout/row_video.xml
+++ b/app/src/main/res/layout/row_video.xml
@@ -19,38 +19,45 @@
             android:id="@+id/thumb"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:maxHeight="300dp"
-            android:contentDescription="@string/video_row_video_thumbnail"
-            android:scaleType="fitXY"
             android:adjustViewBounds="true"
-            />
+            android:contentDescription="@string/video_row_video_thumbnail"
+            android:maxHeight="300dp"
+            android:scaleType="fitXY" />
 
-        <de.hdodenhof.circleimageview.CircleImageView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
+        <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="12dp"
+            android:layout_below="@+id/thumb"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="0dp"
             android:contentDescription="@string/video_row_account_avatar"
-            android:layout_below="@id/thumb"
-            android:layout_alignParentStart="true"/>
+            android:paddingStart="12dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="12dp" />
 
         <TextView
             android:id="@+id/name"
-            android:paddingTop="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/thumb"
-            android:layout_toEndOf="@id/avatar"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_toEndOf="@+id/avatar"
+            android:layout_marginEnd="12dp"
+
+            android:paddingTop="0dp"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
 
         <TextView
             android:id="@+id/videoMeta"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/name"
-            android:layout_toEndOf="@id/avatar"
+            android:layout_below="@+id/name"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="0dp"
+            android:layout_toEndOf="@+id/avatar"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
 
         <TextView
@@ -58,8 +65,27 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/videoMeta"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="0dp"
             android:layout_toEndOf="@id/avatar"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
+            />
+
+        <ImageButton
+            android:id="@+id/moreButton"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_below="@+id/thumb"
+
+            android:layout_marginStart="-16dp"
+            android:layout_marginEnd="0dp"
+
+            android:layout_toEndOf="@+id/name"
+
+            android:background="@null"
+            android:contentDescription="@string/descr_overflow_button"
+            android:src="@drawable/ic_action_more_vert" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/menu/menu_video_row_mode.xml b/app/src/main/res/menu/menu_video_row_mode.xml
new file mode 100644
index 0000000..cac5ba5
--- /dev/null
+++ b/app/src/main/res/menu/menu_video_row_mode.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_share"
+        android:icon="@drawable/ic_action_share"
+        android:title="@string/menu_share" />
+</menu>
\ 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 b00501f..2fe4339 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,5 +56,7 @@
     <string name="search_hint">Search PeerTube</string>
     <string name="title_activity_search">Search</string>
     <string name="no_data_available">No Results</string>
+    <string name="descr_overflow_button">More</string>
+    <string name="menu_share">Share</string>
 
 </resources>