From 031955768313c2c6cbb20ff1e3ed0b9cccf04d52 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:24:23 -0600
Subject: [PATCH] Add support for passing UiText to showSnackbar

---
 .../lagradost/cloudstream3/MainActivity.kt    |  5 ++---
 .../cloudstream3/utils/SnackbarHelper.kt      | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index dfc91d68..6db63181 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1230,9 +1230,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         this@MainActivity,
                         R.string.jsdelivr_enabled,
                         Snackbar.LENGTH_LONG,
-                        getString(R.string.revert)) {
-                        setKey(getString(R.string.jsdelivr_proxy_key), false)
-                    }
+                        R.string.revert
+                    ) { setKey(getString(R.string.jsdelivr_proxy_key), false) }
                 }
             }
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt
index 43981420..e6a77795 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt
@@ -8,6 +8,7 @@ import com.google.android.material.snackbar.Snackbar
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.result.UiText
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 
 object SnackbarHelper {
@@ -18,13 +19,27 @@ object SnackbarHelper {
     @MainThread
     fun showSnackbar(
         act: Activity?,
-        @StringRes message: Int,
+        message: UiText,
         duration: Int = Snackbar.LENGTH_SHORT,
-        actionText: String? = null,
+        actionText: UiText? = null,
         actionCallback: (() -> Unit)? = null
     ) {
         if (act == null) return
-        showSnackbar(act, act.getString(message), duration, actionText, actionCallback)
+        showSnackbar(act, message.asString(act), duration,
+            actionText?.asString(act), actionCallback)
+    }
+
+    @MainThread
+    fun showSnackbar(
+        act: Activity?,
+        @StringRes message: Int,
+        duration: Int = Snackbar.LENGTH_SHORT,
+        @StringRes actionText: Int? = null,
+        actionCallback: (() -> Unit)? = null
+    ) {
+        if (act == null) return
+        showSnackbar(act, act.getString(message), duration,
+            actionText?.let { act.getString(it) }, actionCallback)
     }
 
     @MainThread