diff --git a/app/build.gradle b/app/build.gradle index 23d4d53..cbc6d70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion 23 targetSdkVersion 30 versionCode 4200 //00.04.200 - versionName "1.0.0-alpha3" + versionName "1.0.0-alpha4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() diff --git a/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt b/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt index 3c34a49..9420d98 100644 --- a/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt +++ b/app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt @@ -106,7 +106,7 @@ data class ContinueWatchingItem( // @SerialName("completion_status") val completionStatus: Boolean, @SerialName("playhead") val playhead: Int, // not present in watchlist -> continue_watching_item -// @SerialName("fully_watched") val fullyWatched: Boolean, + @SerialName("fully_watched") val fullyWatched: Boolean = false, ) // EpisodePanel is used in ContinueWatchingItem diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt index 1f6c791..963598e 100644 --- a/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt +++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt @@ -81,7 +81,8 @@ class HomeFragment : Fragment() { // continue watching val upNextJob = lifecycleScope.launch { // TODO create EpisodeItemAdapter, which will start the playback of the selected episode immediately - adapterUpNext = MediaItemAdapter(Crunchyroll.upNextAccount().toItemMediaList()) + adapterUpNext = MediaItemAdapter(Crunchyroll.upNextAccount().items + .filter { !it.fullyWatched }.toItemMediaList()) binding.recyclerNewEpisodes.adapter = adapterUpNext } asyncJobList.add(upNextJob) diff --git a/app/src/main/java/org/mosad/teapod/util/Utils.kt b/app/src/main/java/org/mosad/teapod/util/Utils.kt index 5118a00..74a2ca3 100644 --- a/app/src/main/java/org/mosad/teapod/util/Utils.kt +++ b/app/src/main/java/org/mosad/teapod/util/Utils.kt @@ -23,7 +23,13 @@ fun Collection.toItemMediaList(): List { @JvmName("toItemMediaListContinueWatchingItem") fun Collection.toItemMediaList(): List { - return this.items.map { + return items.map { + ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source) + } +} + +fun List.toItemMediaList(): List { + return this.map { ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source) } }