From af78ea0978dc96f1d5f9707d1e43d465aa2469ee Mon Sep 17 00:00:00 2001
From: sneazy-ibo <41344259+sneazy-ibo@users.noreply.github.com>
Date: Fri, 29 Mar 2024 00:53:33 +0100
Subject: [PATCH] fine...

---
 .../ani/dantotsu/media/anime/ExoplayerView.kt |  8 --
 .../manga/mangareader/MangaReaderActivity.kt  |  8 --
 .../ani/dantotsu/settings/SettingsActivity.kt | 40 ---------
 .../main/res/layout/discord_rpc_layout.xml    | 90 -------------------
 app/src/main/res/values/strings.xml           |  4 +-
 5 files changed, 3 insertions(+), 147 deletions(-)

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 0ca02de7..2dbfcd12 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1098,14 +1098,6 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
                                     RPC.Link("View My AniList", anilistLink)
                                 )
                             }
-                            "custom" -> {
-                                val customButtonText = PrefManager.getCustomVal("custom_button_text", "")
-                                val customButtonLink = PrefManager.getCustomVal("custom_button_link", "")
-                                mutableListOf(
-                                    RPC.Link(getString(R.string.view_anime), media.shareLink ?: ""),
-                                    RPC.Link(customButtonText, customButtonLink)
-                                )
-                            }
                             else -> mutableListOf()
                         }
                         val presence = RPC.createPresence(
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 4b54fe2f..438a8b08 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
@@ -388,14 +388,6 @@ class MangaReaderActivity : AppCompatActivity() {
                                     RPC.Link("View My AniList", anilistLink)
                                 )
                             }
-                            "custom" -> {
-                                val customButtonText = PrefManager.getCustomVal("custom_button_text", "")
-                                val customButtonLink = PrefManager.getCustomVal("custom_button_link", "")
-                                mutableListOf(
-                                    RPC.Link(getString(R.string.view_manga), media.shareLink ?: ""),
-                                    RPC.Link(customButtonText, customButtonLink)
-                                )
-                            }
                             else -> mutableListOf()
                         }
                         val presence = RPC.createPresence(
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
index 60300009..493502f9 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
@@ -13,16 +13,12 @@ import android.os.Build.VERSION.CODENAME
 import android.os.Build.VERSION.RELEASE
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.EditorInfo
 import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.TextView
@@ -33,7 +29,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import android.view.HapticFeedbackConstants
 import androidx.core.view.updateLayoutParams
-import androidx.core.widget.doAfterTextChanged
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
@@ -310,47 +305,17 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
                         val radioGroup = dialogView.findViewById<RadioGroup>(R.id.radio_group)
                         val radioDantotsu = dialogView.findViewById<RadioButton>(R.id.radio_dantotsu)
                         val radioAnilist = dialogView.findViewById<RadioButton>(R.id.radio_anilist)
-                        val radioCustom = dialogView.findViewById<RadioButton>(R.id.radio_custom)
                         val anilistLinkPreview = dialogView.findViewById<TextView>(R.id.anilistLinkPreview)
-                        val customButtonPreview = dialogView.findViewById<TextView>(R.id.customButtonPreview)
-                        val customLinkPreview = dialogView.findViewById<TextView>(R.id.customLinkPreview)
-                        val buttonEditText = dialogView.findViewById<EditText>(R.id.buttonEditText)
-                        val linkEditText = dialogView.findViewById<EditText>(R.id.linkEditText)
-
-                        buttonEditText.addTextChangedListener(object : TextWatcher {
-                            override fun afterTextChanged(s: Editable?) {}
-                            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-                            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                                PrefManager.setCustomVal("custom_button_text", s.toString())
-                                customButtonPreview.text = s.toString().ifEmpty { "Sample" }
-                            }
-                        })
-
-                        linkEditText.addTextChangedListener(object : TextWatcher {
-                            override fun afterTextChanged(s: Editable?) {}
-                            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-                            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                                PrefManager.setCustomVal("custom_button_link", s.toString())
-                                customLinkPreview.text = s.toString().ifEmpty { "https://example.com/" }
-                            }
-                        })
 
                         val userId = PrefManager.getVal<String>(PrefName.AnilistUserName)
                         val currentMode = PrefManager.getCustomVal("discord_mode", "dantotsu")
-                        val customButtonText = PrefManager.getCustomVal("custom_button_text", "")
-                        val customButtonLink = PrefManager.getCustomVal("custom_button_link", "")
 
                         when (currentMode) {
                             "dantotsu" -> radioDantotsu.isChecked = true
                             "anilist" -> radioAnilist.isChecked = true
-                            "custom" -> radioCustom.isChecked = true
                         }
 
                         anilistLinkPreview.text = getString(R.string.anilist_link, userId)
-                        customButtonPreview.text = customButtonText.ifEmpty { "Sample" }
-                        customLinkPreview.text = customButtonLink.ifEmpty { "https://example.com/" }
-                        buttonEditText.setText(customButtonText)
-                        linkEditText.setText(customButtonLink)
 
                         val bottomSheetDialog = BottomSheetDialog(this@SettingsActivity)
                         bottomSheetDialog.setContentView(dialogView)
@@ -363,11 +328,6 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
                                 R.id.radio_anilist -> {
                                     PrefManager.setCustomVal("discord_mode", "anilist")
                                 }
-                                R.id.radio_custom -> {
-                                    PrefManager.setCustomVal("discord_mode", "custom")
-                                    PrefManager.setCustomVal("custom_button_text", buttonEditText.text.toString())
-                                    PrefManager.setCustomVal("custom_button_link", linkEditText.text.toString())
-                                }
                             }
                         }
                         bottomSheetDialog.show()
diff --git a/app/src/main/res/layout/discord_rpc_layout.xml b/app/src/main/res/layout/discord_rpc_layout.xml
index e482c533..355aa6ed 100644
--- a/app/src/main/res/layout/discord_rpc_layout.xml
+++ b/app/src/main/res/layout/discord_rpc_layout.xml
@@ -124,96 +124,6 @@
                     app:drawableTint="?attr/colorPrimary" />
 
             </LinearLayout>
-
-            <RadioButton
-                android:id="@+id/radio_custom"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/discord_custom_button" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/buttonTextInputLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/button_text"
-                app:boxCornerRadiusTopStart="16dp"
-                app:boxCornerRadiusTopEnd="16dp"
-                app:boxCornerRadiusBottomStart="16dp"
-                app:boxCornerRadiusBottomEnd="16dp">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/buttonEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="text"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/linkTextInputLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/button_link"
-                app:boxCornerRadiusTopStart="16dp"
-                app:boxCornerRadiusTopEnd="16dp"
-                app:boxCornerRadiusBottomStart="16dp"
-                app:boxCornerRadiusBottomEnd="16dp">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/linkEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp">
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/customCard"
-                    android:layout_width="wrap_content"
-                    android:layout_height="48dp"
-                    android:layout_gravity="start"
-                    android:padding="8dp"
-                    app:boxStrokeColor="@color/text_input_layout_stroke_color"
-                    app:cardBackgroundColor="@color/nav_bg"
-                    app:cardCornerRadius="16dp"
-                    app:contentPadding="4dp"
-                    app:contentPaddingLeft="8dp"
-                    app:contentPaddingRight="8dp"
-                    tools:ignore="ContentDescription,TextContrastCheck">
-
-                    <TextView
-                        android:id="@+id/customButtonPreview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:drawablePadding="4dp"
-                        android:fontFamily="@font/poppins_bold"
-                        android:text="@string/discord_custom_sample"
-                        android:textColor="?attr/colorPrimary"
-                        app:drawableTint="?attr/colorPrimary" />
-
-                </androidx.cardview.widget.CardView>
-
-                <TextView
-                    android:id="@+id/customLinkPreview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="10dp"
-                    android:drawablePadding="4dp"
-                    android:fontFamily="@font/poppins_bold"
-                    android:text="https://iwanttokillmyself.com"
-                    android:textColor="?attr/colorPrimary"
-                    app:drawableTint="?attr/colorPrimary" />
-
-            </LinearLayout>
         </RadioGroup>
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b32fbae7..a87428a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,8 @@
     <string name="telegram" translatable="false" tools:ignore="Typos">https://t.me/+gzBCQExtLQo1YTNh </string>
     <string name="coffee" translatable="false">https://www.buymeacoffee.com/rebelonion</string>
 
+    <string name="anilist_link">https://anilist.co/user/%1$s/</string>
+
     <string name="home">Home</string>
     <string name="anime">Anime</string>
     <string name="browse_anime">Browse Anime</string>
@@ -414,7 +416,7 @@
     <string name="note">NOTE</string>
   
     <string name="discord_dantotsu_button">Display dantotsu in the second button</string>
-    <string name="discord_anilist_button">Display your AniList profile</string>
+    <string name="discord_anilist_button">Display your AniList profile instead</string>
     <string name="discord_custom_button">Set up your own custom button</string>
     <string name="discord_rich_presence">Discord Rich Presence</string>
     <string name="stream_on_dantotsu">Stream on Dantotsu</string>