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

add numberStr to AoDEpisode type & show tmdb episode info in player

Browse Source 
* use numberStr instead of index to display the correct episode number, allowing for number such as "12.5"
* show tmdb episode description in player if found and aod description is missing
This commit is contained in:
Jannik
2021-09-05 00:08:03 +02:00
parent 062013489d
commit 5ea94b7ded
10 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mosad/teapod/util/DataTypes.kt
View File

@ -1,7 +1,6 @@
package org.mosad.teapod.util
import java.util.*
import kotlin.collections.ArrayList
import java.util.Locale
class DataTypes {
enum class MediaType {
@ -41,9 +40,6 @@ data class ItemMedia(
val posterUrl: String
)
/**
* TODO the episodes workflow could use a clean up/rework
*/
// TODO replace playlist: List<AoDEpisode> with a map?
data class AoDMedia(
val aodId: Int,
@ -56,7 +52,6 @@ data class AoDMedia(
val similar: List<ItemMedia>,
val playlist: List<AoDEpisode>,
) {
fun hasEpisode(mediaId: Int) = playlist.any { it.mediaId == mediaId }
fun getEpisodeById(mediaId: Int) = playlist.firstOrNull { it.mediaId == mediaId }
?: AoDEpisodeNone
}
@ -67,7 +62,8 @@ data class AoDEpisode(
val description: String,
val shortDesc: String,
val imageURL: String,
val number: Int,
val numberStr: String,
val index: Int,
var watched: Boolean,
val watchedCallback: String,
val streams: MutableList<Stream>,
@ -113,6 +109,7 @@ val AoDEpisodeNone = AoDEpisode(
"",
"",
"",
"",
-1,
false,
"",

4
app/src/main/java/org/mosad/teapod/util/adapter/EpisodeItemAdapter.kt
View File

@ -27,9 +27,9 @@ class EpisodeItemAdapter(private val episodes: List<AoDEpisode>, private val tmd
val ep = episodes[position]
val titleText = if (ep.hasDub()) {
context.getString(R.string.component_episode_title, ep.number, ep.description)
context.getString(R.string.component_episode_title, ep.numberStr, ep.description)
} else {
context.getString(R.string.component_episode_title_sub, ep.number, ep.description)
context.getString(R.string.component_episode_title_sub, ep.numberStr, ep.description)
}
holder.binding.textEpisodeTitle.text = titleText

15
app/src/main/java/org/mosad/teapod/util/adapter/PlayerEpisodeItemAdapter.kt
View File

@ -10,8 +10,9 @@ import jp.wasabeef.glide.transformations.RoundedCornersTransformation
import org.mosad.teapod.R
import org.mosad.teapod.databinding.ItemEpisodePlayerBinding
import org.mosad.teapod.util.AoDEpisode
import org.mosad.teapod.util.tmdb.TMDBTVEpisode
class PlayerEpisodeItemAdapter(private val episodes: List<AoDEpisode>) : RecyclerView.Adapter<PlayerEpisodeItemAdapter.EpisodeViewHolder>() {
class PlayerEpisodeItemAdapter(private val episodes: List<AoDEpisode>, private val tmdbEpisodes: List<TMDBTVEpisode>?) : RecyclerView.Adapter<PlayerEpisodeItemAdapter.EpisodeViewHolder>() {
var onImageClick: ((String, Int) -> Unit)? = null
var currentSelected: Int = -1 // -1, since position should never be < 0
@ -25,13 +26,19 @@ class PlayerEpisodeItemAdapter(private val episodes: List<AoDEpisode>) : Recycle
val ep = episodes[position]
val titleText = if (ep.hasDub()) {
context.getString(R.string.component_episode_title, ep.number, ep.description)
context.getString(R.string.component_episode_title, ep.numberStr, ep.description)
} else {
context.getString(R.string.component_episode_title_sub, ep.number, ep.description)
context.getString(R.string.component_episode_title_sub, ep.numberStr, ep.description)
}
holder.binding.textEpisodeTitle2.text = titleText
holder.binding.textEpisodeDesc2.text = ep.shortDesc
holder.binding.textEpisodeDesc2.text = if (ep.shortDesc.isNotEmpty()) {
ep.shortDesc
} else if (tmdbEpisodes != null && position < tmdbEpisodes.size){
tmdbEpisodes[position].overview
} else {
""
}
if (ep.imageURL.isNotEmpty()) {
Glide.with(context).load(ep.imageURL)