From 40b193a81620799c726a19e1580a507539246be6 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <ivagosto@protonmail.com>
Date: Fri, 22 Mar 2024 18:12:14 -0600
Subject: [PATCH] Update duration data to a floating text

---
 .../agosto/p2play/adapters/VideosAdapter.kt   | 19 +++++-------
 .../libre/agosto/p2play/helpers/mapSeconds.kt | 20 ++++++++++++
 app/src/main/res/drawable/round_text.xml      | 14 +++++++++
 app/src/main/res/layout/view_video.xml        | 31 ++++++++++++++++---
 app/src/main/res/values/colors.xml            |  3 ++
 5 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
 create mode 100644 app/src/main/res/drawable/round_text.xml

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 169fa9f..6e75709 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
@@ -9,7 +9,9 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.view_video.view.duration
 import org.libre.agosto.p2play.*
+import org.libre.agosto.p2play.helpers.mapSeconds
 import org.libre.agosto.p2play.models.VideoModel
 import java.io.Serializable
 
@@ -27,6 +29,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
         val tittle: TextView
         val description: TextView
         val context: Context
+        val duration: TextView
 
         init {
             // Define click listener for the ViewHolder's View
@@ -35,6 +38,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             thumb = view.findViewById(R.id.thumb)
             userImg = view.findViewById(R.id.userImg)
             context = view.context
+            duration = view.duration
         }
     }
 
@@ -71,19 +75,12 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
             Picasso.get().load(R.drawable.default_avatar).into(holder.userImg)
 
         val viewsText = holder.context.getString(R.string.view_text)
-        var timeText = holder.context.getString(R.string.timeSec_text)
-        var timeString = myDataset[position].duration.toString()
         val seconds = myDataset[position].duration.toInt();
-        if(seconds > 60 && seconds < (60 * 60)){
-            timeText = holder.context.getString(R.string.timeMin_text)
-            timeString = (seconds / 60).toString() + ":" + (seconds % 60).toString()
-        }
-        else if(seconds > (60 * 60)){
-            timeText = holder.context.getString(R.string.timeHrs_text)
-            timeString = (seconds / 60 / 60).toString() + ":" + (seconds / 60 % 60).toString()
-        }
+        val timeString = mapSeconds(seconds)
 
-        holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText+" - "+timeString+" "+timeText
+        holder.duration.text = timeString
+
+        holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText
 
     }
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
new file mode 100644
index 0000000..fd99d08
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/helpers/mapSeconds.kt
@@ -0,0 +1,20 @@
+package org.libre.agosto.p2play.helpers
+
+fun mapSeconds (inputSeconds: Int): String {
+    val seconds = (inputSeconds % 60)
+    var minutes = inputSeconds / 60
+    var hours = 0
+
+    if (minutes > 60) {
+        hours = minutes / 60
+        minutes = minutes % 60
+    }
+
+    var result = minutes.toString().padStart(2, '0') + ":" + seconds.toString().padStart(2, '0')
+
+    if (hours > 0) {
+        result = hours.toString().padStart(2, '0') + ":" + result
+    }
+
+    return result
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_text.xml b/app/src/main/res/drawable/round_text.xml
new file mode 100644
index 0000000..be16090
--- /dev/null
+++ b/app/src/main/res/drawable/round_text.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="5dp" />
+
+    <!-- This is the border color -->
+
+    <!--- This is the background color -->
+    <solid android:color="?attr/colorSecondary" />
+
+</shape>
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index da37fc6..2a69422 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -14,11 +14,34 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/thumb"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="230dp"
-            app:srcCompat="@android:drawable/ic_menu_gallery" />
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/thumb"
+                android:layout_width="match_parent"
+                android:layout_height="230dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@android:drawable/ic_menu_gallery" />
+
+            <TextView
+                android:id="@+id/duration"
+                android:layout_width="65dp"
+                android:layout_height="19dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="16dp"
+                android:textColor="?attr/colorOnSecondary"
+                android:background="@drawable/round_text"
+                android:ems="10"
+                android:text="00:00"
+                android:paddingHorizontal="3dp"
+                android:textAlignment="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5d7a871..9d801f7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,9 @@
     <color name="colorLike">#FF3C9100</color>
     <color name="colorDislike">#ec020e</color>
     <color name="colorProfile">#262626</color>
+
+    <color name="durationBackground">#88000000</color>
+    <color name="durationColor">#ffffff</color>
  
     <color name="seed">#f16805</color>
     <color name="md_theme_light_primary">#9F4200</color>