Add delete button for history items

Isira-Seneviratne · Isira-Seneviratne · commit aeb4548a5ab4 · 2025-01-21T05:59:01.000+05:30
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryViewModel.kt b/app/src/main/java/org/schabi/newpipe/local/history/HistoryViewModel.kt
@@ -45,7 +45,7 @@ class HistoryViewModel(
                     dateTimeFormatter.format(it.latestAccessDate),
                     ServiceHelper.getNameOfServiceById(it.streamEntity.serviceId),
                 )
-                Stream(it.streamEntity, detail)
+                Stream(it.streamEntity, detail, it.streamId)
             }
         }
         .flowOn(Dispatchers.IO)
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/Info.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/Info.kt
@@ -24,17 +24,18 @@ class Stream(
     val uploaderUrl: String? = null,
     val duration: Long = TimeUnit.HOURS.toSeconds(1),
     val detailText: String = "",
+    val streamId: Long = -1,
 ) : Info(), Parcelable {
 
     constructor(item: StreamInfoItem, detailText: String) : this(
         item.serviceId, item.url, item.name, item.thumbnails, item.uploaderName.orEmpty(),
         item.streamType, item.uploaderUrl, item.duration, detailText
     )
 
-    constructor(entry: StreamEntity, detailText: String) : this(
-        entry.serviceId, entry.url, entry.title,
-        ImageStrategy.dbUrlToImageList(entry.thumbnailUrl), entry.uploader,
-        entry.streamType, entry.uploaderUrl, entry.duration, detailText
+    constructor(entity: StreamEntity, detailText: String, streamId: Long) : this(
+        entity.serviceId, entity.url, entity.title,
+        ImageStrategy.dbUrlToImageList(entity.thumbnailUrl), entity.uploader,
+        entity.streamType, entity.uploaderUrl, entity.duration, detailText, streamId
     )
 
     fun toStreamInfoItem(): StreamInfoItem {
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamCardItem.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamCardItem.kt
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.ui.components.items.stream
 
+import android.content.res.Configuration
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
@@ -9,13 +10,17 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import org.schabi.newpipe.ui.components.items.Stream
+import org.schabi.newpipe.ui.theme.AppTheme
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -71,3 +76,16 @@ fun StreamCardItem(
         StreamMenu(stream, isSelected, onDismissPopup)
     }
 }
+
+@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun StreamCardItemPreview(
+    @PreviewParameter(StreamItemPreviewProvider::class) stream: Stream
+) {
+    AppTheme {
+        Surface(color = MaterialTheme.colorScheme.background) {
+            StreamCardItem(stream, showProgress = false, isSelected = false)
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamGridItem.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamGridItem.kt
@@ -1,19 +1,24 @@
 package org.schabi.newpipe.ui.components.items.stream
 
+import android.content.res.Configuration
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.schabi.newpipe.ui.components.items.Stream
+import org.schabi.newpipe.ui.theme.AppTheme
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -61,3 +66,16 @@ fun StreamGridItem(
         StreamMenu(stream, isSelected, onDismissPopup)
     }
 }
+
+@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun StreamGridItemPreview(
+    @PreviewParameter(StreamItemPreviewProvider::class) stream: Stream
+) {
+    AppTheme {
+        Surface(color = MaterialTheme.colorScheme.background) {
+            StreamGridItem(stream, showProgress = false, isSelected = false)
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamMenu.kt b/app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamMenu.kt
@@ -76,6 +76,17 @@ fun StreamMenu(
                 }
             }
         )
+
+        if (stream.streamId != -1L) {
+            StreamMenuItem(
+                text = R.string.delete,
+                onClick = {
+                    onDismissRequest()
+                    streamViewModel.deleteStreamHistory(stream.streamId)
+                }
+            )
+        }
+
         StreamMenuItem(
             text = R.string.download,
             onClick = {
diff --git a/app/src/main/java/org/schabi/newpipe/ui/screens/HistoryScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/HistoryScreen.kt
@@ -3,6 +3,8 @@ package org.schabi.newpipe.ui.screens
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -82,7 +84,7 @@ fun HistoryScreen(viewModel: HistoryViewModel = viewModel()) {
     })
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
 private fun HistoryHeader(
     sortKey: SortKey,
@@ -170,7 +172,7 @@ private fun HistoryHeader(
 
         Spacer(Modifier.height(12.dp))
 
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+        FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
             IconButtonWithLabel(
                 icon = Icons.Default.Headphones,
                 label = R.string.controls_background_title,
diff --git a/app/src/main/java/org/schabi/newpipe/viewmodels/StreamViewModel.kt b/app/src/main/java/org/schabi/newpipe/viewmodels/StreamViewModel.kt
@@ -23,4 +23,10 @@ class StreamViewModel(application: Application) : AndroidViewModel(application)
             historyRecordManager.markAsWatched(stream).await()
         }
     }
+
+    fun deleteStreamHistory(streamId: Long) {
+        viewModelScope.launch {
+            historyRecordManager.deleteStreamHistoryAndState(streamId).await()
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class HistoryViewModel(`
`45`	`45`	`dateTimeFormatter.format(it.latestAccessDate),`
`46`	`46`	`ServiceHelper.getNameOfServiceById(it.streamEntity.serviceId),`
`47`	`47`	`)`
`48`		`- Stream(it.streamEntity, detail)`
	`48`	`+ Stream(it.streamEntity, detail, it.streamId)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`.flowOn(Dispatchers.IO)`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,17 @@ fun StreamMenu(`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`)`
	`79`	`+`
	`80`	`+ if (stream.streamId != -1L) {`
	`81`	`+ StreamMenuItem(`
	`82`	`+ text = R.string.delete,`
	`83`	`+ onClick = {`
	`84`	`+ onDismissRequest()`
	`85`	`+ streamViewModel.deleteStreamHistory(stream.streamId)`
	`86`	`+ }`
	`87`	`+ )`
	`88`	`+ }`
	`89`	`+`
`79`	`90`	`StreamMenuItem(`
`80`	`91`	`text = R.string.download,`
`81`	`92`	`onClick = {`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,10 @@ class StreamViewModel(application: Application) : AndroidViewModel(application)`
`23`	`23`	`historyRecordManager.markAsWatched(stream).await()`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ fun deleteStreamHistory(streamId: Long) {`
	`28`	`+ viewModelScope.launch {`
	`29`	`+ historyRecordManager.deleteStreamHistoryAndState(streamId).await()`
	`30`	`+ }`
	`31`	`+ }`
`26`	`32`	`}`