Seil0/teapod
Seil0
/
teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

don't show fully watched episodes in "Up next"

This commit is contained in:
Jannik 2022-03-04 20:42:21 +01:00
parent e8bf63a666
commit 4505f95309
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -14,7 +14,7 @@ android {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 4200 //00.04.200 versionCode 4200 //00.04.200
versionName "1.0.0-alpha3" versionName "1.0.0-alpha4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resValue "string", "build_time", buildTime() resValue "string", "build_time", buildTime()

2
app/src/main/java/org/mosad/teapod/parser/crunchyroll/DataTypes.kt
View File

@ -106,7 +106,7 @@ data class ContinueWatchingItem(
// @SerialName("completion_status") val completionStatus: Boolean, // @SerialName("completion_status") val completionStatus: Boolean,
@SerialName("playhead") val playhead: Int, @SerialName("playhead") val playhead: Int,
// not present in watchlist -> continue_watching_item // 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 // EpisodePanel is used in ContinueWatchingItem

3
app/src/main/java/org/mosad/teapod/ui/activity/main/fragments/HomeFragment.kt
View File

@ -81,7 +81,8 @@ class HomeFragment : Fragment() {
// continue watching // continue watching
val upNextJob = lifecycleScope.launch { val upNextJob = lifecycleScope.launch {
// TODO create EpisodeItemAdapter, which will start the playback of the selected episode immediately // 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 binding.recyclerNewEpisodes.adapter = adapterUpNext
} }
asyncJobList.add(upNextJob) asyncJobList.add(upNextJob)

8
app/src/main/java/org/mosad/teapod/util/Utils.kt
View File

@ -23,7 +23,13 @@ fun Collection<Item>.toItemMediaList(): List<ItemMedia> {
@JvmName("toItemMediaListContinueWatchingItem") @JvmName("toItemMediaListContinueWatchingItem")
fun Collection<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> { fun Collection<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
return this.items.map { return items.map {
ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source)
}
}
fun List<ContinueWatchingItem>.toItemMediaList(): List<ItemMedia> {
return this.map {
ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source) ItemMedia(it.panel.episodeMetadata.seriesId, it.panel.title, it.panel.images.thumbnail[0][0].source)
} }
} }