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

clean up some v3 code

Browse Source
This commit is contained in:
Owen LeJeune
2023-06-09 21:20:56 -04:00
parent a473171559
commit f90a2a91bd
11 changed files with 37 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v3/AccountApi.kt
View File

@@ -9,12 +9,6 @@ interface AccountApi {
@GET("account") @GET("account")
suspend fun getAccountDetails(): Response<AccountDetails> suspend fun getAccountDetails(): Response<AccountDetails>
@GET("account/{id}/lists")
suspend fun getLists(
@Path("id") id: Int,
@Query("page") page: Int
): Response<AccountListResponse>
@GET("account/{id}/favorite/movies") @GET("account/{id}/favorite/movies")
suspend fun getFavoriteMovies( suspend fun getFavoriteMovies(
@Path("id") id: Int, @Path("id") id: Int,
@@ -27,7 +21,6 @@ interface AccountApi {
@Query("page") page: Int @Query("page") page: Int
): Response<FavoriteMediaResponse<FavoriteTvSeries>> ): Response<FavoriteMediaResponse<FavoriteTvSeries>>
// @Headers("Content-Type: application/json;charset=utf-8")
@POST("account/{id}/favorite") @POST("account/{id}/favorite")
suspend fun markAsFavorite( suspend fun markAsFavorite(
@Path("id") id: Int, @Path("id") id: Int,
@@ -64,7 +57,6 @@ interface AccountApi {
@Query("page") page: Int @Query("page") page: Int
): Response<WatchlistResponse<WatchlistTvSeries>> ): Response<WatchlistResponse<WatchlistTvSeries>>
// @Headers("Content-Type: application/json;charset=utf-8")
@POST("account/{id}/watchlist") @POST("account/{id}/watchlist")
suspend fun addToWatchlist( suspend fun addToWatchlist(
@Path("id") id: Int, @Path("id") id: Int,

4
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v3/AccountService.kt
View File

@@ -12,10 +12,6 @@ class AccountService {
return accountService.getAccountDetails() return accountService.getAccountDetails()
} }
suspend fun getLists(accountId: Int, page: Int = 1): Response<AccountListResponse> {
return accountService.getLists(accountId, page)
}
suspend fun getFavoriteMovies(accountId: Int, page: Int = 1): Response<FavoriteMediaResponse<FavoriteMovie>> { suspend fun getFavoriteMovies(accountId: Int, page: Int = 1): Response<FavoriteMediaResponse<FavoriteMovie>> {
return accountService.getFavoriteMovies(accountId, page) return accountService.getFavoriteMovies(accountId, page)
} }

13
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v3/model/AccountList.kt
View File

@@ -1,13 +0,0 @@
package com.owenlejeune.tvtime.api.tmdb.api.v3.model
import com.google.gson.annotations.SerializedName
class AccountList(
@SerializedName("description") val description: String,
@SerializedName("favorite_count") val favoriteCount: Int,
@SerializedName("id") val id: Int,
@SerializedName("item_count") val itemCount: Int,
@SerializedName("iso_639_1") val languageCode: String,
@SerializedName("list_type") val listType: String, // media type
@SerializedName("name") val name: String
)

10
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v3/model/AccountListResponse.kt
View File

@@ -1,10 +0,0 @@
package com.owenlejeune.tvtime.api.tmdb.api.v3.model
import com.google.gson.annotations.SerializedName
class AccountListResponse(
@SerializedName("page") val page: Int,
@SerializedName("total_pages") val totalPages: Int,
@SerializedName("total_results") val totalResults: Int,
@SerializedName("results") val results: List<AccountList>
)

26
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/AccountV4Api.kt
View File

@@ -4,8 +4,8 @@ import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteMovie
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteTvSeries import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteTvSeries
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedMovie import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedMovie
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedTv import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedTv
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountList import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountList
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountResponse import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountResponse
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedMovie import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedMovie
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedTv import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedTv
import retrofit2.Response import retrofit2.Response
@@ -16,35 +16,35 @@ import retrofit2.http.Query
interface AccountV4Api { interface AccountV4Api {
@GET("account/{account_id}/lists") @GET("account/{account_id}/lists")
suspend fun getLists(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<V4AccountList>> suspend fun getLists(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<AccountList>>
@GET("account/{account_id}/movie/favorites") @GET("account/{account_id}/movie/favorites")
suspend fun getFavoriteMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> suspend fun getFavoriteMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteMovie>>
@GET("account/{account_id}/tv/favorites") @GET("account/{account_id}/tv/favorites")
suspend fun getFavoriteTvShows(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> suspend fun getFavoriteTvShows(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteTvSeries>>
@GET("account/{account_id}/movie/recommendations") @GET("account/{account_id}/movie/recommendations")
suspend fun getMovieRecommendations(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> suspend fun getMovieRecommendations(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteMovie>>
@GET("account/{account_id}/tv/recommendations") @GET("account/{account_id}/tv/recommendations")
suspend fun getTvShowRecommendations(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> suspend fun getTvShowRecommendations(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteTvSeries>>
@GET("account/{account_id}/movie/watchlist") @GET("account/{account_id}/movie/watchlist")
suspend fun getMovieWatchlist(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> suspend fun getMovieWatchlist(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteMovie>>
@GET("account/{account_id}/tv/watchlist") @GET("account/{account_id}/tv/watchlist")
suspend fun getTvShowWatchlist(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> suspend fun getTvShowWatchlist(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<FavoriteTvSeries>>
@GET("account/{account_id}/movie/rated") @GET("account/{account_id}/movie/rated")
suspend fun getRatedMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<V4RatedMovie>> suspend fun getRatedMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<V4RatedMovie>>
@GET("account/{account_id}/tv/rated") @GET("account/{account_id}/tv/rated")
suspend fun getRatedTvShows(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<V4RatedTv>> suspend fun getRatedTvShows(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<V4RatedTv>>
@GET("account/{account_id}/movie/recommendations") @GET("account/{account_id}/movie/recommendations")
suspend fun getRecommendedMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<RecommendedMovie>> suspend fun getRecommendedMovies(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<RecommendedMovie>>
@GET("account/{account_id}/tv/recommendations") @GET("account/{account_id}/tv/recommendations")
suspend fun getRecommendedTvSeries(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<V4AccountResponse<RecommendedTv>> suspend fun getRecommendedTvSeries(@Path("account_id") accountId: String, @Query("page") page: Int = 1): Response<AccountResponse<RecommendedTv>>
} }

26
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/AccountV4Service.kt
View File

@@ -5,8 +5,8 @@ import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteMovie
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteTvSeries import com.owenlejeune.tvtime.api.tmdb.api.v3.model.FavoriteTvSeries
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedMovie import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedMovie
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedTv import com.owenlejeune.tvtime.api.tmdb.api.v4.model.RecommendedTv
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountList import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountList
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountResponse import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountResponse
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedMovie import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedMovie
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedTv import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4RatedTv
import retrofit2.Response import retrofit2.Response
@@ -15,47 +15,47 @@ class AccountV4Service {
private val service by lazy { TmdbClient().createV4AccountService() } private val service by lazy { TmdbClient().createV4AccountService() }
suspend fun getLists(accountId: String, page: Int = 1): Response<V4AccountResponse<V4AccountList>> { suspend fun getLists(accountId: String, page: Int = 1): Response<AccountResponse<AccountList>> {
return service.getLists(accountId, page) return service.getLists(accountId, page)
} }
suspend fun getFavoriteMovies(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> { suspend fun getFavoriteMovies(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteMovie>> {
return service.getFavoriteMovies(accountId, page) return service.getFavoriteMovies(accountId, page)
} }
suspend fun getFavoriteTvShows(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> { suspend fun getFavoriteTvShows(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteTvSeries>> {
return service.getFavoriteTvShows(accountId, page) return service.getFavoriteTvShows(accountId, page)
} }
suspend fun getMovieRecommendations(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> { suspend fun getMovieRecommendations(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteMovie>> {
return service.getMovieRecommendations(accountId, page) return service.getMovieRecommendations(accountId, page)
} }
suspend fun getTvShowRecommendations(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> { suspend fun getTvShowRecommendations(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteTvSeries>> {
return service.getTvShowRecommendations(accountId, page) return service.getTvShowRecommendations(accountId, page)
} }
suspend fun getMovieWatchlist(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteMovie>> { suspend fun getMovieWatchlist(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteMovie>> {
return service.getMovieWatchlist(accountId, page) return service.getMovieWatchlist(accountId, page)
} }
suspend fun getTvShowWatchlist(accountId: String, page: Int = 1): Response<V4AccountResponse<FavoriteTvSeries>> { suspend fun getTvShowWatchlist(accountId: String, page: Int = 1): Response<AccountResponse<FavoriteTvSeries>> {
return service.getTvShowWatchlist(accountId, page) return service.getTvShowWatchlist(accountId, page)
} }
suspend fun getRatedMovies(accountId: String, page: Int = 1): Response<V4AccountResponse<V4RatedMovie>> { suspend fun getRatedMovies(accountId: String, page: Int = 1): Response<AccountResponse<V4RatedMovie>> {
return service.getRatedMovies(accountId, page) return service.getRatedMovies(accountId, page)
} }
suspend fun getRatedTvShows(accountId: String, page: Int = 1): Response<V4AccountResponse<V4RatedTv>> { suspend fun getRatedTvShows(accountId: String, page: Int = 1): Response<AccountResponse<V4RatedTv>> {
return service.getRatedTvShows(accountId, page) return service.getRatedTvShows(accountId, page)
} }
suspend fun getRecommendedMovies(accountId: String, page: Int = 1): Response<V4AccountResponse<RecommendedMovie>> { suspend fun getRecommendedMovies(accountId: String, page: Int = 1): Response<AccountResponse<RecommendedMovie>> {
return service.getRecommendedMovies(accountId, page) return service.getRecommendedMovies(accountId, page)
} }
suspend fun getRecommendedTvSeries(accountId: String, page: Int): Response<V4AccountResponse<RecommendedTv>> { suspend fun getRecommendedTvSeries(accountId: String, page: Int): Response<AccountResponse<RecommendedTv>> {
return service.getRecommendedTvSeries(accountId, page) return service.getRecommendedTvSeries(accountId, page)
} }

2
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/model/V4AccountList.kt → app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/model/AccountList.kt
View File

@@ -2,7 +2,7 @@ package com.owenlejeune.tvtime.api.tmdb.api.v4.model
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
class V4AccountList( class AccountList(
@SerializedName("iso_639_1") val languageCode: String, @SerializedName("iso_639_1") val languageCode: String,
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,
@SerializedName("featured") val featured: Int, @SerializedName("featured") val featured: Int,

2
app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/model/V4AccountResponse.kt → app/src/main/java/com/owenlejeune/tvtime/api/tmdb/api/v4/model/AccountResponse.kt
View File

@@ -2,7 +2,7 @@ package com.owenlejeune.tvtime.api.tmdb.api.v4.model
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
class V4AccountResponse<T>( class AccountResponse<T>(
@SerializedName("page") val page: Int, @SerializedName("page") val page: Int,
@SerializedName("total_results") val totalResults: Int, @SerializedName("total_results") val totalResults: Int,
@SerializedName("total_pages") val totalPages: Int, @SerializedName("total_pages") val totalPages: Int,

8
app/src/main/java/com/owenlejeune/tvtime/ui/navigation/AccountTabNavItem.kt
View File

@@ -10,7 +10,7 @@ import com.owenlejeune.tvtime.api.tmdb.api.v3.model.RatedMovie
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.RatedTv import com.owenlejeune.tvtime.api.tmdb.api.v3.model.RatedTv
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.WatchlistMovie import com.owenlejeune.tvtime.api.tmdb.api.v3.model.WatchlistMovie
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.WatchlistTvSeries import com.owenlejeune.tvtime.api.tmdb.api.v3.model.WatchlistTvSeries
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountList import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountList
import com.owenlejeune.tvtime.ui.screens.main.AccountTabContent import com.owenlejeune.tvtime.ui.screens.main.AccountTabContent
import com.owenlejeune.tvtime.ui.screens.main.MediaViewType import com.owenlejeune.tvtime.ui.screens.main.MediaViewType
import com.owenlejeune.tvtime.ui.screens.main.RecommendedAccountTabContent import com.owenlejeune.tvtime.ui.screens.main.RecommendedAccountTabContent
@@ -123,7 +123,7 @@ sealed class AccountTabNavItem(
MediaViewType.LIST, MediaViewType.LIST,
screenContent, screenContent,
{ SessionManager.currentSession.value?.accountLists ?: emptyList() }, { SessionManager.currentSession.value?.accountLists ?: emptyList() },
V4AccountList::class, AccountList::class,
7 7
) )
@@ -134,7 +134,7 @@ sealed class AccountTabNavItem(
MediaViewType.MOVIE, MediaViewType.MOVIE,
recommendedScreenContent, recommendedScreenContent,
{ emptyList() }, { emptyList() },
V4AccountList::class, AccountList::class,
8 8
) )
@@ -145,7 +145,7 @@ sealed class AccountTabNavItem(
MediaViewType.TV, MediaViewType.TV,
recommendedScreenContent, recommendedScreenContent,
{ emptyList() }, { emptyList() },
V4AccountList::class, AccountList::class,
9 9
) )
} }

8
app/src/main/java/com/owenlejeune/tvtime/ui/screens/main/AccountView.kt
View File

@@ -29,13 +29,11 @@ import com.google.accompanist.pager.rememberPagerState
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.owenlejeune.tvtime.R import com.owenlejeune.tvtime.R
import com.owenlejeune.tvtime.api.tmdb.api.v3.model.* import com.owenlejeune.tvtime.api.tmdb.api.v3.model.*
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountList import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountList
import com.owenlejeune.tvtime.api.tmdb.viewmodel.RecommendedMediaViewModel import com.owenlejeune.tvtime.api.tmdb.viewmodel.RecommendedMediaViewModel
import com.owenlejeune.tvtime.extensions.unlessEmpty import com.owenlejeune.tvtime.extensions.unlessEmpty
import com.owenlejeune.tvtime.ui.components.AccountIcon import com.owenlejeune.tvtime.ui.components.AccountIcon
import com.owenlejeune.tvtime.ui.components.PagingPosterGrid import com.owenlejeune.tvtime.ui.components.PagingPosterGrid
import com.owenlejeune.tvtime.ui.components.ProfileMenuContainer
import com.owenlejeune.tvtime.ui.components.ProfileMenuOverlay
import com.owenlejeune.tvtime.ui.navigation.AccountTabNavItem import com.owenlejeune.tvtime.ui.navigation.AccountTabNavItem
import com.owenlejeune.tvtime.ui.navigation.ListFetchFun import com.owenlejeune.tvtime.ui.navigation.ListFetchFun
import com.owenlejeune.tvtime.ui.navigation.MainNavItem import com.owenlejeune.tvtime.ui.navigation.MainNavItem
@@ -256,8 +254,8 @@ fun <T: Any> AccountTabContent(
description = item.overview description = item.overview
) )
} }
V4AccountList::class -> { AccountList::class -> {
val item = contentItems[i] as V4AccountList val item = contentItems[i] as AccountList
MediaItemRow( MediaItemRow(
appNavController = appNavController, appNavController = appNavController,
mediaViewType = mediaViewType, mediaViewType = mediaViewType,

4
app/src/main/java/com/owenlejeune/tvtime/utils/SessionManager.kt
View File

@@ -14,7 +14,7 @@ import com.owenlejeune.tvtime.api.tmdb.api.v4.AuthenticationV4Service
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthAccessBody import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthAccessBody
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthDeleteBody import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthDeleteBody
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthRequestBody import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AuthRequestBody
import com.owenlejeune.tvtime.api.tmdb.api.v4.model.V4AccountList import com.owenlejeune.tvtime.api.tmdb.api.v4.model.AccountList
import com.owenlejeune.tvtime.preferences.AppPreferences import com.owenlejeune.tvtime.preferences.AppPreferences
import com.owenlejeune.tvtime.ui.screens.main.MediaViewType import com.owenlejeune.tvtime.ui.screens.main.MediaViewType
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@@ -156,7 +156,7 @@ object SessionManager: KoinComponent {
// protected open var _accountLists: List<V4AccountList> = emptyList() // protected open var _accountLists: List<V4AccountList> = emptyList()
// val accountLists: List<V4AccountList> // val accountLists: List<V4AccountList>
// get() = _accountLists // get() = _accountLists
val accountLists = mutableStateListOf<V4AccountList>() val accountLists = mutableStateListOf<AccountList>()
// protected open var _favoriteMovies: List<FavoriteMovie> = emptyList() // protected open var _favoriteMovies: List<FavoriteMovie> = emptyList()
// val favoriteMovies: List<FavoriteMovie> // val favoriteMovies: List<FavoriteMovie>