Add an option to mark a show as watched #509

Author: cemrich

app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/helper/ShowMenuHelper.kt

@@ -103,6 +103,13 @@ class ShowMenuHelper(
 				return true
 			}
 
+			R.id.menu_mark_watched -> {
+				fragment.lifecycle.coroutineScope.launch {
+					viewModel.markWatched(show)
+				}
+				return true
+			}
+
 			else -> false
 		}
 	}

app/src/main/java/de/christinecoenen/code/zapp/app/mediathek/ui/helper/ShowMenuHelperViewModel.kt

@@ -27,6 +27,7 @@ class ShowMenuHelperViewModel(
 		R.id.menu_remove_download to false,
 		R.id.menu_cancel_download to false,
 		R.id.menu_mark_unwatched to false,
+		R.id.menu_mark_watched to true,
 		R.id.menu_add_bookmark to true,
 		R.id.menu_remove_bookmark to false
 	)
@@ -40,7 +41,7 @@ class ShowMenuHelperViewModel(
 
 	fun getMenuItemsVisibility(show: MediathekShow): Flow<Map<Int, Boolean>> {
 		return mediathekRepository
-			.getPersistedShowByApiId(show.apiId)
+			.persistOrUpdateShow(show)
 			.mapLatest {
 				lastMapping = mapOf(
 					R.id.menu_share to true,
@@ -63,17 +64,12 @@ class ShowMenuHelperViewModel(
 							DownloadStatus.PAUSED,
 						)),
 					R.id.menu_mark_unwatched to (it.playbackPosition > 0),
+					R.id.menu_mark_watched to (it.playbackPosition < it.videoDuration),
 					R.id.menu_add_bookmark to !it.isBookmarked,
 					R.id.menu_remove_bookmark to it.isBookmarked
 				)
 				lastMapping
 			}
-			.onStart {
-				// for when the show has not yet been persisted
-				emit(defaultMapping.toMutableMap().apply {
-					this[R.id.menu_start_download] = show.hasAnyDownloadQuality()
-				})
-			}
 			.distinctUntilChanged()
 	}
 
@@ -99,9 +95,11 @@ class ShowMenuHelperViewModel(
 		mediathekRepository.resetPlaybackPosition(show.apiId)
 	}
 
+	suspend fun markWatched(show: MediathekShow) {
+		mediathekRepository.markAsPlayed(show.apiId)
+	}
+
 	suspend fun bookmark(show: MediathekShow) {
-		// we need to persist this first, because it might not yet be persisted!
-		mediathekRepository.persistOrUpdateShow(show)
 		mediathekRepository.setBookmarked(show.apiId, true)
 	}
 
@@ -110,8 +108,7 @@ class ShowMenuHelperViewModel(
 	}
 
 	suspend fun startDownload(show: MediathekShow, quality: Quality) {
-		// we need to persist this first, because it might not yet be persisted!
-		val persistedShow = mediathekRepository.persistOrUpdateShow(show).first()
+		val persistedShow = mediathekRepository.getPersistedShowByApiId(show.apiId).first()
 		downloadController.startDownload(persistedShow.id, quality)
 	}
 }

app/src/main/java/de/christinecoenen/code/zapp/models/shows/PersistedMediathekShow.kt

@@ -48,8 +48,21 @@ data class PersistedMediathekShow(
 	var mediathekShow: MediathekShow
 
 ) {
+	companion object {
+		fun newFromMediathekShow(show: MediathekShow): PersistedMediathekShow {
+			return PersistedMediathekShow(mediathekShow = show).apply {
+				updateMediathekShow(show)
+			}
+		}
+	}
+
 	fun updateMediathekShow(show: MediathekShow) {
 		this.mediathekShow = show
+
+		if (this.videoDuration == 0L) {
+			this.videoDuration = show.duration?.toLong()?.let { it * 1000 } ?: 0
+		}
+
 		this.showUpdatedAt = DateTime.now()
 	}
 }

app/src/main/java/de/christinecoenen/code/zapp/persistence/MediathekShowDao.kt

@@ -132,9 +132,7 @@ interface MediathekShowDao {
 
 		if (existingPersistedShow == null) {
 			// insert new show
-			val newPersistedShow = PersistedMediathekShow(
-				mediathekShow = show
-			)
+			val newPersistedShow = PersistedMediathekShow.newFromMediathekShow(show)
 			insert(newPersistedShow)
 		} else {
 			// update existing show
@@ -166,6 +164,9 @@ interface MediathekShowDao {
 	@Query("UPDATE PersistedMediathekShow SET playbackPosition=0 WHERE apiId=:apiId")
 	suspend fun resetPlaybackPosition(apiId: String)
 
+	@Query("UPDATE PersistedMediathekShow SET playbackPosition=(SELECT videoDuration WHERE apiId=:apiId), lastPlayedBackAt=:playedAt WHERE apiId=:apiId")
+	suspend fun markAsPlayed(apiId: String, playedAt: DateTime)
+
 	@Query("UPDATE PersistedMediathekShow SET playbackPosition=0")
 	suspend fun resetAllPlaybackPositions()
 

app/src/main/java/de/christinecoenen/code/zapp/repositories/MediathekRepository.kt

@@ -32,7 +32,13 @@ class MediathekRepository(private val database: Database) {
 
 		return database
 			.mediathekShowDao()
-			.getPersonalShows("%$searchQuery%", channelIds, minDurationSeconds, maxDurationSeconds, limit)
+			.getPersonalShows(
+				"%$searchQuery%",
+				channelIds,
+				minDurationSeconds,
+				maxDurationSeconds,
+				limit
+			)
 	}
 
 	fun getPersonalShowsCount(
@@ -47,7 +53,12 @@ class MediathekRepository(private val database: Database) {
 
 		return database
 			.mediathekShowDao()
-			.getPersonalShowsCount("%$searchQuery%", channelIds, minDurationSeconds, maxDurationSeconds)
+			.getPersonalShowsCount(
+				"%$searchQuery%",
+				channelIds,
+				minDurationSeconds,
+				maxDurationSeconds
+			)
 			.distinctUntilChanged()
 			.flowOn(Dispatchers.IO)
 	}
@@ -94,19 +105,17 @@ class MediathekRepository(private val database: Database) {
 			.getAllBookarked("%$searchQuery%")
 	}
 
-	suspend fun persistOrUpdateShow(show: MediathekShow): Flow<PersistedMediathekShow> =
-		withContext(Dispatchers.IO) {
-			database
-				.mediathekShowDao()
-				.insertOrUpdate(show)
-
-			database
-				.mediathekShowDao()
-				.getFromApiId(show.apiId)
-				.distinctUntilChanged()
-				.filterNotNull()
-				.flowOn(Dispatchers.IO)
-		}
+	fun persistOrUpdateShow(show: MediathekShow): Flow<PersistedMediathekShow> {
+		return database
+			.mediathekShowDao()
+			.getFromApiId(show.apiId)
+			.onStart {
+				database.mediathekShowDao().insertOrUpdate(show)
+			}
+			.distinctUntilChanged()
+			.filterNotNull()
+			.flowOn(Dispatchers.IO)
+	}
 
 	suspend fun updateShow(show: PersistedMediathekShow?) = withContext(Dispatchers.IO) {
 		database
@@ -238,6 +247,12 @@ class MediathekRepository(private val database: Database) {
 				.setPlaybackPosition(showId, positionMillis, durationMillis, DateTime.now())
 		}
 
+	suspend fun markAsPlayed(apiId: String) = withContext(Dispatchers.IO) {
+		database
+			.mediathekShowDao()
+			.markAsPlayed(apiId, DateTime.now())
+	}
+
 	suspend fun resetPlaybackPosition(apiId: String) = withContext(Dispatchers.IO) {
 		database
 			.mediathekShowDao()

app/src/main/res/menu/mediathek_show.xml

@@ -29,6 +29,13 @@
 		android:visible="false"
 		app:showAsAction="never" />
 
+	<item
+		android:id="@+id/menu_mark_watched"
+		android:icon="@drawable/ic_outline_play_circle_24"
+		android:title="@string/action_mark_watched"
+		android:visible="false"
+		app:showAsAction="never" />
+
 	<item
 		android:id="@+id/menu_start_download"
 		android:icon="@drawable/ic_baseline_save_alt_24"

app/src/main/res/raw-en/changelog.md

@@ -1,4 +1,5 @@
 # v-next
+* Added an option to mark a show as watched ([#509](https://github.com/mediathekview/zapp/issues/509))
 * Added an option to reset the progress of all started shows ([#507](https://github.com/mediathekview/zapp/issues/507))
 * Fixed channel order list being covered by the navigation bar ([#496](https://github.com/mediathekview/zapp/issues/496))
 * Restricted local result list for the mediathek search ([#486](https://github.com/mediathekview/zapp/issues/486))

app/src/main/res/raw/changelog.md

@@ -1,4 +1,5 @@
 # v-next
+* Option hinzugefügt, um Videos als gesehen zu markieren ([#509](https://github.com/mediathekview/zapp/issues/509))
 * Option hinzugefügt, um den Fortschritt aller angefangenen Videos zurückzusetzen ([#507](https://github.com/mediathekview/zapp/issues/507))
 * Behoben, dass die Sender-Anordnen-Liste von der Navigation überdeckt wird ([#496](https://github.com/mediathekview/zapp/issues/496))
 * Lokale Ergebnisliste in der Mediathek-Suche begrenzt ([#486](https://github.com/mediathekview/zapp/issues/486))

app/src/main/res/values-en/strings.xml

@@ -88,6 +88,7 @@
 	<string name="action_delete_download">Delete download</string>
 	<string name="action_cancel_download">Cancel download</string>
 	<string name="action_mark_unwatched">Mark as unwatched</string>
+	<string name="action_mark_watched">Mark as watched</string>
 	<string name="action_view_all">View all</string>
 
 	<string name="search_query_hint_zapp">Search in Zapp…</string>

app/src/main/res/values/strings.xml

@@ -88,6 +88,7 @@
 	<string name="action_delete_download">Download löschen</string>
 	<string name="action_cancel_download">Download abbrechen</string>
 	<string name="action_mark_unwatched">Als ungesehen markieren</string>
+	<string name="action_mark_watched">Als gesehen markieren</string>
 	<string name="action_view_all">Alle ansehen</string>
 
 	<string name="search_query_hint_zapp">Zapp durchsuchen…</string>