fix: idr

rebelonion · Apr 11, 2024 · 3619355 · 3619355
1 parent 674a512
commit 3619355
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git 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 = if (PrefManager.getVal(PrefName.ShowIcon))  Discord.small_Image_AniList.discordUrl() else Discord.small_Image.discordUrl(),
-                                smallText = if (PrefManager.getVal(PrefName.ShowIcon)) "Anilist" else "Dantotsu",
+                                smallImage = if (PrefManager.getVal(PrefName.ShowAniListIcon))  Discord.small_Image_AniList.discordUrl() else Discord.small_Image.discordUrl(),
+                                smallText = if (PrefManager.getVal(PrefName.ShowAniListIcon)) "Anilist" else "Dantotsu",
                             ),
                             buttons = data.buttons.map { it.label },
                             metadata = Activity.Metadata(

diff --git a/app/src/main/java/ani/dantotsu/connections/github/Contributors.kt b/app/src/main/java/ani/dantotsu/connections/github/Contributors.kt
@@ -23,6 +23,7 @@ class Contributors {
                     Mapper.json.decodeFromJsonElement<GithubResponse>(it)
                 }
             res.forEach {
+                if (it.login == "SunglassJerry") return@forEach
                 val role = when (it.login) {
                     "rebelonion" -> "Owner & Maintainer"
                     "sneazy-ibo" -> "Contributor & Comment Moderator"
@@ -61,7 +62,7 @@ class Contributors {
                     Developer(
                         "SunglassJeery",
                         "https://s4.anilist.co/file/anilistcdn/user/avatar/large/b5804776-FEKfP5wbz2xv.png",
-                        "Discord & Comment Moderator",
+                        "Head Discord & Comment Moderator",
                         "https://anilist.co/user/5804776"
                     ),
                     Developer(

diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1830,13 +1830,11 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
                     }
                     timer = object : CountDownTimer(5000, 1000) {
                         override fun onTick(millisUntilFinished: Long) {
-                            if (new == null) {
                                 skipTimeButton.visibility = View.GONE
                                 exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0
                                 disappeared = false
                                 functionstarted = false
                                 cancelTimer()
-                            }
                         }
 
                         override fun onFinish() {

diff --git a/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/DiscordDialogFragment.kt
@@ -31,9 +31,9 @@ class DiscordDialogFragment: BottomSheetDialogFragment() {
             "anilist" -> binding.radioAnilist.isChecked = true
             else -> binding.radioAnilist.isChecked = true
         }
-        binding.showIcon.isChecked = PrefManager.getVal(PrefName.ShowIcon)
+        binding.showIcon.isChecked = PrefManager.getVal(PrefName.ShowAniListIcon)
         binding.showIcon.setOnCheckedChangeListener { _, isChecked ->
-            PrefManager.setVal(PrefName.ShowIcon, isChecked)
+            PrefManager.setVal(PrefName.ShowAniListIcon, isChecked)
         }
         binding.anilistLinkPreview.text = getString(R.string.anilist_link, PrefManager.getVal<String>(PrefName.AnilistUserName))
 

diff --git a/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt b/app/src/main/java/ani/dantotsu/settings/ExtensionsActivity.kt
@@ -292,7 +292,7 @@ class ExtensionsActivity : AppCompatActivity() {
                 val alertDialog = AlertDialog.Builder(this@ExtensionsActivity, R.style.MyPopup)
                     .setTitle(R.string.edit_repositories)
                     .setView(dialogView.root)
-                    .setPositiveButton(getString(R.string.add)) { dialog, _ ->
+                    .setPositiveButton(getString(R.string.add)) { _, _ ->
                         if (!dialogView.repositoryTextBox.text.isNullOrBlank())
                             processUserInput(dialogView.repositoryTextBox.text.toString(), type)
                     }

diff --git a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
@@ -166,7 +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)),
+    ShowAniListIcon(Pref(Location.Irrelevant, Boolean::class, false)),
     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/drawable/score.xml b/app/src/main/res/drawable/score.xml
@@ -1,4 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="?attr/colorTertiary" />
+    <solid android:color="?attr/colorPrimary" />
 </shape>
diff --git a/app/src/main/res/drawable/user_score.xml b/app/src/main/res/drawable/user_score.xml
@@ -1,4 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="?attr/colorPrimary" />
+    <solid android:color="?attr/colorTertiary" />
 </shape>
diff --git a/app/src/main/res/layout/fragment_anime_watch.xml b/app/src/main/res/layout/fragment_anime_watch.xml
@@ -46,7 +46,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="64dp"
         app:cardBackgroundColor="?android:colorBackground"
         app:cardCornerRadius="24dp"
         app:contentPadding="12dp">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -890,4 +890,5 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="users">Users</string>
     <string name="social">Social</string>
     <string name="auto_skip_recap">Auto Skip Recap</string>
+    <string name="use_anilist_icon">Use AniList Icon</string>
 </resources>