diff --git a/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt b/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt index 0a2f7b3f..9318e5e6 100644 --- a/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt +++ b/app/src/main/java/ani/dantotsu/connections/discord/Discord.kt @@ -71,4 +71,6 @@ object Discord { const val application_Id = "1163925779692912771" const val small_Image: String = "mp:external/GJEe4hKzr8w56IW6ZKQz43HFVEo8pOtA_C-dJiWwxKo/https/cdn.discordapp.com/app-icons/1163925779692912771/f6b42d41dfdf0b56fcc79d4a12d2ac66.png" + const val small_Image_AniList: String = + "mp:external/rHOIjjChluqQtGyL_UHk6Z4oAqiVYlo_B7HSGPLSoUg/%3Fsize%3D128/https/cdn.discordapp.com/icons/210521487378087947/a_f54f910e2add364a3da3bb2f2fce0c72.webp" } \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt b/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt index 8a4f314b..43ffd8a1 100644 --- a/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt +++ b/app/src/main/java/ani/dantotsu/connections/discord/RPC.kt @@ -71,8 +71,8 @@ open class RPC(val token: String, val coroutineContext: CoroutineContext) { assets = Activity.Assets( largeImage = data.largeImage?.url?.discordUrl(), largeText = data.largeImage?.label, - smallImage = data.smallImage?.url?.discordUrl(), - smallText = data.smallImage?.label + smallImage = if (PrefManager.getVal(PrefName.ShowIcon)) Discord.small_Image_AniList.discordUrl() else Discord.small_Image.discordUrl(), + smallText = if (PrefManager.getVal(PrefName.ShowIcon)) "Anilist" else "Dantotsu", ), buttons = data.buttons.map { it.label }, metadata = Activity.Metadata( diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt index 273ccf9b..d4cc57af 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt @@ -1139,7 +1139,6 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL it ) }, - smallImage = RPC.Link("Dantotsu", Discord.small_Image), buttons = buttons ) ) diff --git a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt index 57e099af..5cd84736 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt @@ -412,7 +412,6 @@ class MangaReaderActivity : AppCompatActivity() { ?: getString(R.string.chapter_num, chap.number), state = "${chap.number}/${media.manga?.totalChapters ?: "??"}", largeImage = media.cover?.let { cover -> RPC.Link(media.userPreferredName, cover) }, - smallImage = RPC.Link("Dantotsu", Discord.small_Image), buttons = buttons ) ) diff --git a/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt index 7925291b..c641e2a3 100644 --- a/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt @@ -31,7 +31,10 @@ class DiscordDialogFragment: BottomSheetDialogFragment() { "anilist" -> binding.radioAnilist.isChecked = true else -> binding.radioAnilist.isChecked = true } - + binding.showIcon.isChecked = PrefManager.getVal(PrefName.ShowIcon) + binding.showIcon.setOnCheckedChangeListener { _, isChecked -> + PrefManager.setVal(PrefName.ShowIcon, isChecked) + } binding.anilistLinkPreview.text = getString(R.string.anilist_link, PrefManager.getVal(PrefName.AnilistUserName)) binding.radioGroup.setOnCheckedChangeListener { _, checkedId -> diff --git a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt index a11b4727..7d55d689 100644 --- a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt +++ b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt @@ -166,6 +166,7 @@ enum class PrefName(val data: Pref) { //TODO: Split this into multiple files Incognito(Pref(Location.Irrelevant, Boolean::class, false)), OfflineMode(Pref(Location.Irrelevant, Boolean::class, false)), DiscordStatus(Pref(Location.Irrelevant, String::class, "online")), + ShowIcon(Pref(Location.Irrelevant, Boolean::class, true)), DownloadsKeys(Pref(Location.Irrelevant, String::class, "")), NovelLastExtCheck(Pref(Location.Irrelevant, Long::class, 0L)), ImageUrl(Pref(Location.Irrelevant, String::class, "")), diff --git a/app/src/main/res/layout/bottom_sheet_discord_rpc.xml b/app/src/main/res/layout/bottom_sheet_discord_rpc.xml index 13a16df2..7908cbff 100644 --- a/app/src/main/res/layout/bottom_sheet_discord_rpc.xml +++ b/app/src/main/res/layout/bottom_sheet_discord_rpc.xml @@ -30,7 +30,24 @@ android:textAlignment="center" android:textSize="20sp" android:textStyle="bold" /> - +