From d8ac767327957978cb90724cd1231e5b6d71bcab Mon Sep 17 00:00:00 2001 From: sneazy-ibo <41344259+sneazy-ibo@users.noreply.github.com> Date: Sun, 7 Jul 2024 23:40:42 +0200 Subject: [PATCH] chore: unused variables and inbuilt toast --- .../dantotsu/connections/anilist/Anilist.kt | 2 -- .../connections/anilist/AnilistQueries.kt | 34 ++----------------- .../dantotsu/connections/anilist/api/User.kt | 4 +-- .../settings/SettingsAnilistActivity.kt | 15 ++++---- 4 files changed, 12 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt b/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt index 3e24492c..6b0d288c 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt @@ -49,8 +49,6 @@ object Anilist { var timezone: String? = null var animeCustomLists: List? = null var mangaCustomLists: List? = null - var animeSplitCompletedSectionByFormat: Boolean = false - var mangaSplitCompletedSectionByFormat: Boolean = false val sortBy = listOf( "SCORE_DESC", 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 f044349d..dc77be30 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt @@ -43,36 +43,8 @@ class AnilistQueries { suspend fun getUserData(): Boolean { val response: Query.Viewer? measureTimeMillis { - response = executeQuery(""" - { - Viewer { - name - options { - timezone - titleLanguage - staffNameLanguage - activityMergeTime - airingNotifications - displayAdultContent - restrictMessagesToFollowing - } - avatar { medium } - bannerImage - id - mediaListOptions { - scoreFormat - rowOrder - animeList { sectionOrder customLists splitCompletedSectionByFormat } - mangaList { sectionOrder customLists splitCompletedSectionByFormat } - } - statistics { - anime { episodesWatched } - manga { chaptersRead } - } - unreadNotificationCount - } - } - """) + response = executeQuery( + """{Viewer{name options{timezone titleLanguage staffNameLanguage activityMergeTime airingNotifications displayAdultContent restrictMessagesToFollowing} avatar{medium} bannerImage id mediaListOptions{scoreFormat rowOrder animeList{customLists} mangaList{customLists}} statistics{anime{episodesWatched} manga{chaptersRead}} unreadNotificationCount}}""") }.also { println("time : $it") } val user = response?.data?.user ?: return false @@ -104,12 +76,10 @@ class AnilistQueries { it.animeList?.let { animeList -> Anilist.animeCustomLists = animeList.customLists - Anilist.animeSplitCompletedSectionByFormat = animeList.splitCompletedSectionByFormat ?: false } it.mangaList?.let { mangaList -> Anilist.mangaCustomLists = mangaList.customLists - Anilist.mangaSplitCompletedSectionByFormat = mangaList.splitCompletedSectionByFormat ?: false } } return true diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt index 833e8162..b887c710 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt @@ -215,8 +215,8 @@ data class MediaListTypeOptions( // The order each list should be displayed in @SerialName("sectionOrder") var sectionOrder: List?, - // If the completed sections of the list should be separated by format - @SerialName("splitCompletedSectionByFormat") var splitCompletedSectionByFormat: Boolean?, + // // If the completed sections of the list should be separated by format + // @SerialName("splitCompletedSectionByFormat") var splitCompletedSectionByFormat: Boolean?, // The names of the user's custom lists @SerialName("customLists") var customLists: List?, diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt index c9c64825..abef37cc 100644 --- a/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/SettingsAnilistActivity.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.LinearLayout -import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.view.children import androidx.core.view.updateLayoutParams @@ -25,6 +24,7 @@ import ani.dantotsu.restartApp import ani.dantotsu.statusBarHeight import ani.dantotsu.themes.ThemeManager import ani.dantotsu.toast +import ani.dantotsu.util.customAlertDialog import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import kotlinx.coroutines.launch @@ -264,6 +264,7 @@ class SettingsAnilistActivity : AppCompatActivity() { LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) } + private fun addCustomListItem(listName: String, container: LinearLayout, isAnime: Boolean) { val customListItemView = layoutInflater.inflate(R.layout.item_custom_list, container, false) val textInputLayout = customListItemView.findViewById(R.id.customListItem) @@ -279,15 +280,15 @@ class SettingsAnilistActivity : AppCompatActivity() { } if (listExists) { - AlertDialog.Builder(this@SettingsAnilistActivity, R.style.MyPopup) - .setTitle(getString(R.string.delete_custom_list)) - .setMessage(getString(R.string.delete_custom_list_confirm, name)) - .setPositiveButton(getString(R.string.delete)) { _, _ -> + customAlertDialog().apply { + setTitle(getString(R.string.delete_custom_list)) + setMessage(getString(R.string.delete_custom_list_confirm, name)) + setPosButton(getString(R.string.delete)) { deleteCustomList(name, isAnime) container.removeView(customListItemView) } - .setNegativeButton(getString(R.string.cancel), null) - .show() + setNegButton(getString(R.string.cancel)) + }.show() } else { container.removeView(customListItemView) }