From 6abaf596e4db5a36057f6a8acf31b72f57a12e18 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 17 Apr 2021 20:06:36 -0700
Subject: Remove koin dependency in production

---
 .../kotlin/com/pitchedapps/frost/utils/Utils.kt    | 42 +++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 73572a44..ec8aec6c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -266,15 +266,23 @@ fun Throwable?.logFrostEvent(text: String) {
     frostEvent("Errors", "text" to text, "message" to (this?.message ?: "NA"))
 }
 
-fun Activity.frostSnackbar(@StringRes text: Int, builder: Snackbar.() -> Unit = {}) =
-    snackbar(text, Snackbar.LENGTH_LONG, frostSnackbar(builder))
-
-fun View.frostSnackbar(@StringRes text: Int, builder: Snackbar.() -> Unit = {}) =
-    snackbar(text, Snackbar.LENGTH_LONG, frostSnackbar(builder))
+fun Activity.frostSnackbar(
+    @StringRes text: Int,
+    themeProvider: ThemeProvider,
+    builder: Snackbar.() -> Unit = {}
+) = snackbar(text, Snackbar.LENGTH_LONG, frostSnackbar(themeProvider, builder))
+
+fun View.frostSnackbar(
+    @StringRes text: Int,
+    themeProvider: ThemeProvider,
+    builder: Snackbar.() -> Unit = {}
+) = snackbar(text, Snackbar.LENGTH_LONG, frostSnackbar(themeProvider, builder))
 
 @SuppressLint("RestrictedApi")
-private inline fun frostSnackbar(crossinline builder: Snackbar.() -> Unit): Snackbar.() -> Unit = {
-    val themeProvider = ThemeProvider.get()
+private inline fun frostSnackbar(
+    themeProvider: ThemeProvider,
+    crossinline builder: Snackbar.() -> Unit
+): Snackbar.() -> Unit = {
     builder()
     // hacky workaround, but it has proper checks and shouldn't crash
     ((view as? FrameLayout)?.getChildAt(0) as? SnackbarContentLayout)?.apply {
@@ -421,18 +429,20 @@ fun Context.frostUri(entry: String): Uri {
 
 inline fun Context.sendFrostEmail(
     @StringRes subjectId: Int,
+    prefs: Prefs,
     crossinline builder: EmailBuilder.() -> Unit
-) =
-    sendFrostEmail(string(subjectId), builder)
+) = sendFrostEmail(string(subjectId), prefs, builder)
 
-inline fun Context.sendFrostEmail(subjectId: String, crossinline builder: EmailBuilder.() -> Unit) =
-    sendEmail("", subjectId) {
-        builder()
-        addFrostDetails()
-    }
+inline fun Context.sendFrostEmail(
+    subjectId: String,
+    prefs: Prefs,
+    crossinline builder: EmailBuilder.() -> Unit
+) = sendEmail("", subjectId) {
+    builder()
+    addFrostDetails(prefs)
+}
 
-fun EmailBuilder.addFrostDetails() {
-    val prefs = Prefs.get()
+fun EmailBuilder.addFrostDetails(prefs: Prefs) {
     addItem("Prev version", prefs.prevVersionCode.toString())
     val proTag = "FO"
     addItem("Random Frost ID", "${prefs.frostId}-$proTag")
-- 
cgit v1.2.3