owen/TVTime
1
0
Fork 0
mirror of https://github.com/owenlejeune/TVTime.git synced 2025-11-19 10:11:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix title not being set properly when returning from tv detail view and fix tv details not returning from server

Browse Source
This commit is contained in:
Owen LeJeune
2022-02-14 12:02:19 -05:00
parent b69cfff94b
commit 0f3fe7ea7c
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/model/DetailedMovie.kt
View File

@@ -4,6 +4,6 @@ import com.google.gson.annotations.SerializedName
class DetailedMovie( class DetailedMovie(
@SerializedName("id") override val id: Int, @SerializedName("id") override val id: Int,
@SerializedName("origina_title") override val title: String, @SerializedName("original_title") override val title: String,
@SerializedName("poster_path") override val posterPath: String? @SerializedName("poster_path") override val posterPath: String?
): DetailedItem(id, title, posterPath) ): DetailedItem(id, title, posterPath)

8
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/model/DetailedTv.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.tvtime.api.tmdb.model package com.owenlejeune.tvtime.api.tmdb.model
import com.owenlejeune.tvtime.api.tmdb.model.DetailedItem import com.google.gson.annotations.SerializedName
class DetailedTv( class DetailedTv(
id: Int, @SerializedName("id") override val id: Int,
title: String, @SerializedName("name") override val title: String,
posterPath: String? @SerializedName("poster_path") override val posterPath: String?
): DetailedItem(id, title, posterPath) ): DetailedItem(id, title, posterPath)

10
app/src/main/java/com/owenlejeune/tvtime/ui/navigation/BottomNavItem.kt
View File

@@ -6,6 +6,16 @@ sealed class BottomNavItem(val name: String, val icon: Int, val route: String) {
companion object { companion object {
val Items = listOf(Movies, TV, Favourites, Settings) val Items = listOf(Movies, TV, Favourites, Settings)
fun getByRoute(route: String?): BottomNavItem? {
return when (route) {
Movies.route -> Movies
TV.route -> TV
Favourites.route -> Favourites
Settings.route -> Settings
else -> null
}
}
} }
object Movies: BottomNavItem("Movies", R.drawable.ic_movie, "movies_route") object Movies: BottomNavItem("Movies", R.drawable.ic_movie, "movies_route")

2
app/src/main/java/com/owenlejeune/tvtime/ui/screens/MainView.kt
View File

@@ -85,6 +85,8 @@ private fun BottomNavBar(navController: NavController, appBarTitle: MutableState
) )
} }
} }
appBarTitle.value = BottomNavItem.getByRoute(currentRoute)?.name ?: ""
} }
private fun onBottomAppBarItemClicked( private fun onBottomAppBarItemClicked(