Rename to StrUtil

MRepoApp · Jun 29, 2024 · a9f7699 · a9f7699
1 parent 5ebe3d0
commit a9f7699
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/model/json/UpdateJson.kt b/app/src/main/kotlin/dev/sanmer/mrepo/model/json/UpdateJson.kt
@@ -2,7 +2,7 @@ package dev.sanmer.mrepo.model.json
 
 import dev.sanmer.mrepo.compat.NetworkCompat
 import dev.sanmer.mrepo.model.online.VersionItem
-import dev.sanmer.mrepo.utils.Utils
+import dev.sanmer.mrepo.utils.StrUtil
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.decodeFromStream
 
@@ -24,7 +24,7 @@ data class UpdateJson(
 
         return VersionItem(
             timestamp = timestamp,
-            version = Utils.getVersionDisplay(version, versionCode),
+            version = StrUtil.getVersionDisplay(version, versionCode),
             versionCode = versionCode,
             zipUrl = zipUrl,
             changelog = changelog

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/model/local/LocalModule.kt b/app/src/main/kotlin/dev/sanmer/mrepo/model/local/LocalModule.kt
@@ -1,8 +1,8 @@
 package dev.sanmer.mrepo.model.local
 
-import dev.sanmer.mrepo.utils.Utils
 import dev.sanmer.mrepo.content.Module
+import dev.sanmer.mrepo.utils.StrUtil
 
 typealias LocalModule = Module
 
-val Module.versionDisplay get() = Utils.getVersionDisplay(version, versionCode)
+val Module.versionDisplay get() = StrUtil.getVersionDisplay(version, versionCode)
diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/model/online/OnlineModule.kt b/app/src/main/kotlin/dev/sanmer/mrepo/model/online/OnlineModule.kt
@@ -1,6 +1,6 @@
 package dev.sanmer.mrepo.model.online
 
-import dev.sanmer.mrepo.utils.Utils
+import dev.sanmer.mrepo.utils.StrUtil
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -17,7 +17,7 @@ data class OnlineModule(
     val versions: List<VersionItem>,
 ) {
     val versionDisplay by lazy {
-        Utils.getVersionDisplay(version, versionCode)
+        StrUtil.getVersionDisplay(version, versionCode)
     }
 
     @Serializable

diff --git a/...in/kotlin/dev/sanmer/mrepo/utils/Utils.kt → .../kotlin/dev/sanmer/mrepo/utils/StrUtil.kt b/...in/kotlin/dev/sanmer/mrepo/utils/Utils.kt → .../kotlin/dev/sanmer/mrepo/utils/StrUtil.kt
@@ -1,6 +1,6 @@
 package dev.sanmer.mrepo.utils
 
-object Utils {
+object StrUtil {
     fun getVersionDisplay(version: String, versionCode: Int): String {
         val included = "\\(.*?${versionCode}.*?\\)".toRegex()
             .containsMatchIn(version)

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModuleViewModel.kt b/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModuleViewModel.kt
@@ -21,7 +21,7 @@ import dev.sanmer.mrepo.repository.UserPreferencesRepository
 import dev.sanmer.mrepo.service.DownloadService
 import dev.sanmer.mrepo.ui.activity.InstallActivity
 import dev.sanmer.mrepo.ui.navigation.graphs.RepositoryScreen
-import dev.sanmer.mrepo.utils.Utils
+import dev.sanmer.mrepo.utils.StrUtil
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -107,7 +107,7 @@ class ModuleViewModel @Inject constructor(
             val userPreferences = userPreferencesRepository.data.first()
             val downloadPath = userPreferences.downloadPath
 
-            val filename = Utils.getFilename(
+            val filename = StrUtil.getFilename(
                 name = online.name,
                 version = item.version,
                 versionCode = item.versionCode,

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModulesViewModel.kt b/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModulesViewModel.kt
@@ -22,7 +22,7 @@ import dev.sanmer.mrepo.repository.UserPreferencesRepository
 import dev.sanmer.mrepo.service.DownloadService
 import dev.sanmer.mrepo.stub.IModuleOpsCallback
 import dev.sanmer.mrepo.ui.activity.InstallActivity
-import dev.sanmer.mrepo.utils.Utils
+import dev.sanmer.mrepo.utils.StrUtil
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
@@ -246,7 +246,7 @@ class ModulesViewModel @Inject constructor(
             val userPreferences = userPreferencesRepository.data.first()
             val downloadPath = userPreferences.downloadPath
 
-            val filename = Utils.getFilename(
+            val filename = StrUtil.getFilename(
                 name = module.name,
                 version = item.version,
                 versionCode = item.versionCode,