From 3fa07609bba544cc0e26878500d59e4c4c8e4674 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Sun, 23 Jun 2024 18:07:50 +0700
Subject: [PATCH] refactor: Move MokoExtensions to i18n module

---
 .../tachiyomi/network/interceptor/CloudflareInterceptor.kt    | 4 ++--
 .../kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt | 4 ++--
 .../src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt  | 2 +-
 .../main/java/yokai/presentation/widget/util/GlanceUtils.kt   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename {core => i18n}/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt (65%)

diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
index ca3d155395..cc618733b6 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
+++ b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@@ -15,7 +15,7 @@ import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import yokai.i18n.MR
-import yokai.util.lang.getMString
+import yokai.util.lang.getString
 import java.io.IOException
 import java.util.concurrent.*
 
@@ -49,7 +49,7 @@ class CloudflareInterceptor(
         // Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
         // we don't crash the entire app
         catch (e: CloudflareBypassException) {
-            throw IOException(context.getMString(MR.strings.failed_to_bypass_cloudflare))
+            throw IOException(context.getString(MR.strings.failed_to_bypass_cloudflare))
         } catch (e: Exception) {
             throw IOException(e)
         }
diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
index 1930e6eae7..d2eccb8e30 100644
--- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
+++ b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/ToastExtensions.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.widget.Toast
 import androidx.annotation.StringRes
 import dev.icerock.moko.resources.StringResource
-import yokai.util.lang.getMString
+import yokai.util.lang.getString
 
 /**
  * Display a toast in this context.
@@ -23,7 +23,7 @@ fun Context.toast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT)
  * @param duration the duration of the toast. Defaults to short.
  */
 fun Context.toast(resource: StringResource, duration: Int = Toast.LENGTH_SHORT) {
-    toast(getMString(resource), duration)
+    toast(getString(resource), duration)
 }
 
 /**
diff --git a/core/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt b/i18n/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt
similarity index 65%
rename from core/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt
rename to i18n/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt
index 4d431d9f6c..30368d819a 100644
--- a/core/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt
+++ b/i18n/src/androidMain/kotlin/yokai/util/lang/MokoExtensions.kt
@@ -5,4 +5,4 @@ import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.Resource
 import dev.icerock.moko.resources.desc.StringDesc
 
-fun Context.getMString(stringRes: StringResource): String = StringDesc.Resource(stringRes).toString(this)
+fun Context.getString(stringRes: StringResource): String = StringDesc.Resource(stringRes).toString(this)
diff --git a/presentation/widget/src/main/java/yokai/presentation/widget/util/GlanceUtils.kt b/presentation/widget/src/main/java/yokai/presentation/widget/util/GlanceUtils.kt
index 964a345eb0..e27438bda5 100644
--- a/presentation/widget/src/main/java/yokai/presentation/widget/util/GlanceUtils.kt
+++ b/presentation/widget/src/main/java/yokai/presentation/widget/util/GlanceUtils.kt
@@ -7,7 +7,7 @@ import androidx.glance.LocalContext
 import androidx.glance.appwidget.cornerRadius
 import dev.icerock.moko.resources.StringResource
 import yokai.presentation.widget.R
-import yokai.util.lang.getMString
+import yokai.util.lang.getString
 
 fun GlanceModifier.appWidgetBackgroundRadius(): GlanceModifier {
     return this.cornerRadius(R.dimen.appwidget_background_radius)
@@ -19,7 +19,7 @@ fun GlanceModifier.appWidgetInnerRadius(): GlanceModifier {
 
 @Composable
 fun stringResource(id: StringResource): String {
-    return LocalContext.current.getMString(id)
+    return LocalContext.current.getString(id)
 }
 
 /**