From cb9f8605d5cfd576fc4e00028720deaa30d7073f Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 12 Sep 2020 17:54:37 +0200
Subject: [PATCH] Improve time for videos

---
 .../fedilabtube/drawer/PeertubeAdapter.java   |  2 +-
 .../fedilab/fedilabtube/helper/Helper.java    |  4 +-
 app/src/main/res/drawable/rounded_corner.xml  | 15 +++++++
 app/src/main/res/layout/drawer_peertube.xml   | 42 +++++++++++++------
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_corner.xml

diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
index 1a7e5fc..4868c12 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
@@ -90,7 +90,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             Helper.loadGiF(context, peertube.getChannel(), holder.peertube_profile);
         }
         holder.peertube_title.setText(peertube.getName());
-        holder.peertube_duration.setText(context.getString(R.string.duration_video, Helper.secondsToString(peertube.getDuration())));
+        holder.peertube_duration.setText(Helper.secondsToString(peertube.getDuration()));
         holder.peertube_date.setText(String.format(" - %s", Helper.dateDiff(context, peertube.getCreated_at())));
         holder.peertube_views.setText(context.getString(R.string.number_view_video, Helper.withSuffix(peertube.getView())));
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
index 3160b56..1c235eb 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
@@ -361,12 +361,12 @@ public class Helper {
         long months = days / 30;
         long years = days / 365;
 
-        String format = DateFormat.getDateInstance(DateFormat.SHORT).format(dateToot);
+        String format = DateFormat.getDateInstance(DateFormat.LONG).format(dateToot);
         if (years > 0) {
             return format;
         } else if (months > 0 || days > 7) {
             //Removes the year depending of the locale from DateFormat.SHORT format
-            SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
+            SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
             df.applyPattern(df.toPattern().replaceAll("[^\\p{Alpha}]*y+[^\\p{Alpha}]*", ""));
             return df.format(dateToot);
         } else if (days > 0)
diff --git a/app/src/main/res/drawable/rounded_corner.xml b/app/src/main/res/drawable/rounded_corner.xml
new file mode 100644
index 0000000..d771c80
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_corner.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/black" />
+
+    <solid android:color="@android:color/black" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_peertube.xml b/app/src/main/res/layout/drawer_peertube.xml
index 0ef826c..812d0b8 100644
--- a/app/src/main/res/layout/drawer_peertube.xml
+++ b/app/src/main/res/layout/drawer_peertube.xml
@@ -15,6 +15,7 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -39,13 +40,34 @@
         android:textStyle="bold"
         android:visibility="gone" />
 
-    <ImageView
-        android:id="@+id/peertube_video_image"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:contentDescription="@string/image_preview"
-        android:gravity="center"
-        android:scaleType="centerCrop" />
+        android:layout_height="200dp">
+
+        <ImageView
+            android:id="@+id/peertube_video_image"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:contentDescription="@string/image_preview"
+            android:gravity="center"
+            android:scaleType="centerCrop"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/peertube_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:background="@drawable/rounded_corner"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
+            android:textColor="@android:color/white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:id="@+id/bottom_container"
@@ -93,16 +115,10 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/peertube_duration"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
                 <TextView
                     android:id="@+id/peertube_views"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp" />
+                    android:layout_height="wrap_content" />
 
                 <TextView
                     android:id="@+id/peertube_date"