From 76e11e5a3e58a2743f20683972c07e7fe54f6eec Mon Sep 17 00:00:00 2001 From: aayush262 Date: Sun, 31 Mar 2024 16:43:55 +0530 Subject: [PATCH] fix: removed unused banners --- .../connections/anilist/AnilistQueries.kt | 5 --- .../connections/anilist/AnilistViewModel.kt | 35 +------------------ .../dantotsu/connections/anilist/api/Data.kt | 5 +-- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt index 510e5cd9..8e83a9e5 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt @@ -1429,15 +1429,10 @@ Page(page:$page,perPage:50) { """{ favoriteAnime:${userFavMediaQuery(true, 1, id)} favoriteManga:${userFavMediaQuery(false, 1, id)} - animeMediaList:${bannerImageQuery("ANIME", id)} - mangaMediaList:${bannerImageQuery("MANGA", id)} }""".trimIndent(), force = true ) } - private fun bannerImageQuery(type: String, id: Int?): String { - return """MediaListCollection(userId: ${id}, type: $type, chunk:1,perChunk:25, sort: [SCORE_DESC,UPDATED_TIME_DESC]) { lists { entries{ media { id bannerImage } } } }""" - } suspend fun getNotifications(id: Int, page: Int = 1, resetNotification: Boolean = true): NotificationResponse? { val reset = if (resetNotification) "true" else "false" diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt index fd892c5f..243e2792 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt @@ -60,45 +60,36 @@ class AnilistHomeViewModel : ViewModel() { MutableLiveData>(null) fun getAnimeContinue(): LiveData> = animeContinue - suspend fun setAnimeContinue() = animeContinue.postValue(Anilist.query.continueMedia("ANIME")) private val animeFav: MutableLiveData> = MutableLiveData>(null) fun getAnimeFav(): LiveData> = animeFav - suspend fun setAnimeFav() = animeFav.postValue(Anilist.query.favMedia(true)) private val animePlanned: MutableLiveData> = MutableLiveData>(null) fun getAnimePlanned(): LiveData> = animePlanned - suspend fun setAnimePlanned() = - animePlanned.postValue(Anilist.query.continueMedia("ANIME", true)) private val mangaContinue: MutableLiveData> = MutableLiveData>(null) fun getMangaContinue(): LiveData> = mangaContinue - suspend fun setMangaContinue() = mangaContinue.postValue(Anilist.query.continueMedia("MANGA")) private val mangaFav: MutableLiveData> = MutableLiveData>(null) fun getMangaFav(): LiveData> = mangaFav - suspend fun setMangaFav() = mangaFav.postValue(Anilist.query.favMedia(false)) private val mangaPlanned: MutableLiveData> = MutableLiveData>(null) fun getMangaPlanned(): LiveData> = mangaPlanned - suspend fun setMangaPlanned() = - mangaPlanned.postValue(Anilist.query.continueMedia("MANGA", true)) private val recommendation: MutableLiveData> = MutableLiveData>(null) fun getRecommendation(): LiveData> = recommendation - suspend fun setRecommendation() = recommendation.postValue(Anilist.query.recommendations()) suspend fun initHomePage() { val res = Anilist.query.initHomePage() @@ -406,11 +397,6 @@ class ProfileViewModel : ViewModel() { fun getAnimeFav(): LiveData> = animeFav - private val listImages: MutableLiveData> = - MutableLiveData>(arrayListOf()) - - fun getListImages(): LiveData> = listImages - suspend fun setData(id: Int) { val res = Anilist.query.initProfilePage(id) val mangaList = res?.data?.favoriteManga?.favourites?.manga?.edges?.mapNotNull { @@ -426,30 +412,11 @@ class ProfileViewModel : ViewModel() { } animeFav.postValue(ArrayList(animeList ?: arrayListOf())) - val bannerImages = arrayListOf(null, null) - val animeRandom = res?.data?.animeMediaList?.lists?.mapNotNull { - it.entries?.mapNotNull { entry -> - val imageUrl = entry.media?.bannerImage - if (imageUrl != null && imageUrl != "null") imageUrl - else null - } - }?.flatten()?.randomOrNull() - bannerImages[0] = animeRandom - val mangaRandom = res?.data?.mangaMediaList?.lists?.mapNotNull { - it.entries?.mapNotNull { entry -> - val imageUrl = entry.media?.bannerImage - if (imageUrl != null && imageUrl != "null") imageUrl - else null - } - }?.flatten()?.randomOrNull() - bannerImages[1] = mangaRandom - listImages.postValue(bannerImages) - } fun refresh() { mangaFav.postValue(mangaFav.value) animeFav.postValue(animeFav.value) - listImages.postValue(listImages.value) + } } \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt index 7d71af32..20f35035 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt @@ -147,10 +147,7 @@ class Query { @Serializable data class Data( @SerialName("favoriteAnime") val favoriteAnime: ani.dantotsu.connections.anilist.api.User?, - @SerialName("favoriteManga") val favoriteManga: ani.dantotsu.connections.anilist.api.User?, - @SerialName("animeMediaList") val animeMediaList: ani.dantotsu.connections.anilist.api.MediaListCollection?, - @SerialName("mangaMediaList") val mangaMediaList: ani.dantotsu.connections.anilist.api.MediaListCollection? - ) + @SerialName("favoriteManga") val favoriteManga: ani.dantotsu.connections.anilist.api.User?) } @Serializable data class AnimeList(