Merge pull request #40 from sheikh-20/develop

Develop
sheikh-20 · Apr 21, 2024 · 52e23bb · 52e23bb
2 parents 9556372 + faa1332
commit 52e23bb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -53,8 +53,8 @@ android {
         applicationId = "com.application.moviesapp"
         minSdk = 24
         targetSdk = 33
-        versionCode = 2
-        versionName = "1.0.1"
+        versionCode = 3
+        versionName = "1.0.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/application/moviesapp/ui/detail/DetailScreen.kt b/app/src/main/java/com/application/moviesapp/ui/detail/DetailScreen.kt
@@ -2,6 +2,7 @@ package com.application.moviesapp.ui.detail
 
 import android.app.Activity
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
@@ -392,7 +393,11 @@ fun DetailScreen(modifier: Modifier = Modifier,
                             TabRow(selectedTabIndex = pager.currentPage) {
                                 items.forEachIndexed { index, horizontalPagerContent ->
                                     Tab(selected = pager.currentPage == index,
-                                        onClick = { /*TODO*/ },
+                                        onClick = {
+                                            coroutineScope.launch {
+                                                pager.animateScrollToPage(page = index)
+                                            }
+                                        },
                                         text = {
                                             Text(text = items[index].title)
                                         })
@@ -769,7 +774,11 @@ fun DetailScreen(modifier: Modifier = Modifier,
                             TabRow(selectedTabIndex = pager.currentPage) {
                                 items.forEachIndexed { index, horizontalPagerContent ->
                                     Tab(selected = pager.currentPage == index,
-                                        onClick = { /*TODO*/ },
+                                        onClick = {
+                                            coroutineScope.launch {
+                                                pager.animateScrollToPage(page = index)
+                                            }
+                                        },
                                         text = {
                                             Text(text = items[index].title)
                                         })

diff --git a/app/src/main/java/com/application/moviesapp/ui/home/download/DownloadScreen.kt b/app/src/main/java/com/application/moviesapp/ui/home/download/DownloadScreen.kt
@@ -62,6 +62,7 @@ import com.application.moviesapp.ui.play.PlayActivity
 import com.application.moviesapp.ui.play.Screen
 import com.application.moviesapp.ui.theme.MoviesAppTheme
 import com.application.moviesapp.ui.utility.getFileSize
+import com.application.moviesapp.ui.utility.getVideoDuration
 import com.application.moviesapp.ui.utility.toImageUrl
 import com.application.moviesapp.ui.utility.toYoutubeDuration
 import com.application.moviesapp.ui.viewmodel.DownloadUiState
@@ -171,7 +172,7 @@ private fun DownloadCard(modifier: Modifier = Modifier,
                 )
 
                 Text(
-                    text = movie?.runtime.toString() ?: "",
+                    text = movie?.runtime ?: movie?.filePath?.getVideoDuration(context as Activity) ?: "",
                     style = MaterialTheme.typography.bodyMedium
                 )
 
@@ -192,9 +193,7 @@ private fun DownloadCard(modifier: Modifier = Modifier,
                 }
             }
         }
-
     }
-
 }
 
 @Preview(showBackground = true, showSystemUi = true)

diff --git a/app/src/main/java/com/application/moviesapp/ui/play/PlayScreen.kt b/app/src/main/java/com/application/moviesapp/ui/play/PlayScreen.kt
@@ -331,11 +331,7 @@ private fun CustomPlayerUI(modifier: Modifier = Modifier,
                     Row(verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.spacedBy(8.dp)) {
 
-                        IconButton(onClick = onDownloadClick) {
-                            Icon(imageVector = Icons.Outlined.FileDownload,
-                                contentDescription = null,
-                                modifier = modifier.size(24.dp), tint = MaterialTheme.colorScheme.onPrimary)
-                        }
+
                         IconButton(onClick = { onFullScreenModeClicked(isFullScreen.not()) }) {
                             Icon(imageVector = if (isFullScreen) Icons.Rounded.FullscreenExit else Icons.Rounded.Fullscreen,
                                 contentDescription = null,

diff --git a/app/src/main/java/com/application/moviesapp/ui/utility/Utitlity.kt b/app/src/main/java/com/application/moviesapp/ui/utility/Utitlity.kt
@@ -3,6 +3,7 @@ package com.application.moviesapp.ui.utility
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.media.MediaMetadataRetriever
 import android.os.Build
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
@@ -13,6 +14,7 @@ import androidx.core.app.NotificationManagerCompat
 import com.application.moviesapp.BuildConfig
 import com.application.moviesapp.R
 import com.application.moviesapp.domain.model.Stream
+import timber.log.Timber
 import java.io.File
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -143,4 +145,22 @@ fun SetLanguage(language: String = "English (US)") {
     val resources = LocalContext.current.resources
     resources.updateConfiguration(configuration, resources.displayMetrics)
 
+}
+
+fun String.getVideoDuration(context: Context): String {
+
+    Timber.tag("MoviesApp").d(this)
+
+    val retriever = MediaMetadataRetriever()
+    retriever.setDataSource(File(context.filesDir, "output/$this").path)
+    val durationString = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+    retriever.release()
+
+    return if (durationString?.toLong() != null) {
+        val seconds = durationString.toLong().div(1000)
+        val minutes = seconds / 60
+        val remainingSeconds = seconds % 60
+        println("Video duration: $minutes minutes and $remainingSeconds seconds")
+        "${minutes}m ${remainingSeconds}s"
+    } else ""
 }