Rename values of State

MRepoApp · Jun 11, 2024 · 66401d0 · 66401d0
1 parent 54344f9
commit 66401d0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesList.kt b/app/src/main/kotlin/dev/sanmer/mrepo/ui/screens/modules/ModulesList.kt
@@ -105,24 +105,24 @@ fun ModuleItem(
         progress = progress,
         indeterminate = ops.isOpsRunning,
         alpha = when (module.state) {
-            State.DISABLE, State.REMOVE -> 0.5f
+            State.Disable, State.Remove -> 0.5f
             else -> 1f
         },
         decoration = when (module.state) {
-            State.REMOVE -> TextDecoration.LineThrough
+            State.Remove -> TextDecoration.LineThrough
             else -> TextDecoration.None
         },
         switch = {
             Switch(
-                checked = module.state == State.ENABLE,
+                checked = module.state == State.Enable,
                 onCheckedChange = ops.toggle,
                 enabled = isProviderAlive
             )
         },
         indicator = {
             when (module.state) {
-                State.REMOVE -> StateIndicator(R.drawable.trash)
-                State.UPDATE -> StateIndicator(R.drawable.device_mobile_down)
+                State.Remove -> StateIndicator(R.drawable.trash)
+                State.Update -> StateIndicator(R.drawable.device_mobile_down)
                 else -> {}
             }
         },
@@ -178,7 +178,7 @@ private fun RemoveOrRestore(
 ) {
     Icon(
         modifier = Modifier.size(20.dp),
-        painter = painterResource(id = if (module.state == State.REMOVE) {
+        painter = painterResource(id = if (module.state == State.Remove) {
             R.drawable.rotate
         } else {
             R.drawable.trash
@@ -188,7 +188,7 @@ private fun RemoveOrRestore(
 
     Spacer(modifier = Modifier.width(6.dp))
     Text(
-        text = stringResource(id = if (module.state == State.REMOVE) {
+        text = stringResource(id = if (module.state == State.Remove) {
             R.string.module_restore
         } else {
             R.string.module_remove

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/InstallViewModel.kt b/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/InstallViewModel.kt
@@ -135,7 +135,7 @@ class InstallViewModel @Inject constructor(
     private fun insertLocal(module: LocalModule) {
         viewModelScope.launch {
             localRepository.insertLocal(
-                module.copy(state = State.UPDATE)
+                module.copy(state = State.Update)
             )
         }
     }

diff --git a/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModulesViewModel.kt b/app/src/main/kotlin/dev/sanmer/mrepo/viewmodel/ModulesViewModel.kt
@@ -105,7 +105,7 @@ class ModulesViewModel @Inject constructor(
                 comparator(menu.option, menu.descending)
             ).let { v ->
                 if (menu.pinEnabled) {
-                    v.sortedByDescending { it.state == State.ENABLE }
+                    v.sortedByDescending { it.state == State.Enable }
                 } else {
                     v
                 }
@@ -179,7 +179,7 @@ class ModulesViewModel @Inject constructor(
     }
 
     fun createModuleOps(module: LocalModule) = when (module.state) {
-        State.ENABLE -> ModuleOps(
+        State.Enable -> ModuleOps(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {
                 opsTasks.add(module.id)
@@ -191,7 +191,7 @@ class ModulesViewModel @Inject constructor(
             }
         )
 
-        State.DISABLE -> ModuleOps(
+        State.Disable -> ModuleOps(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {
                 opsTasks.add(module.id)
@@ -203,7 +203,7 @@ class ModulesViewModel @Inject constructor(
             }
         )
 
-        State.REMOVE -> ModuleOps(
+        State.Remove -> ModuleOps(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {},
             change = {
@@ -212,7 +212,7 @@ class ModulesViewModel @Inject constructor(
             }
         )
 
-        State.UPDATE -> ModuleOps(
+        State.Update -> ModuleOps(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {},
             change = {}

diff --git a/core/src/main/kotlin/dev/sanmer/mrepo/content/State.kt b/core/src/main/kotlin/dev/sanmer/mrepo/content/State.kt
@@ -1,8 +1,8 @@
 package dev.sanmer.mrepo.content
 
 enum class State {
-    ENABLE,
-    REMOVE,
-    DISABLE,
-    UPDATE
+    Enable,
+    Remove,
+    Disable,
+    Update
 }
diff --git a/core/src/main/kotlin/dev/sanmer/mrepo/impl/BaseModuleManagerImpl.kt b/core/src/main/kotlin/dev/sanmer/mrepo/impl/BaseModuleManagerImpl.kt
@@ -84,18 +84,18 @@ internal abstract class BaseModuleManagerImpl : IModuleManager.Stub() {
 
     private fun readState(moduleDir: File): State {
         moduleDir.resolve("remove").apply {
-            if (exists()) return State.REMOVE
+            if (exists()) return State.Remove
         }
 
         moduleDir.resolve("disable").apply {
-            if (exists()) return State.DISABLE
+            if (exists()) return State.Disable
         }
 
         moduleDir.resolve("update").apply {
-            if (exists()) return State.UPDATE
+            if (exists()) return State.Update
         }
 
-        return State.ENABLE
+        return State.Enable
     }
 
     private fun readLastUpdated(moduleDir: File): Long {
@@ -119,7 +119,7 @@ internal abstract class BaseModuleManagerImpl : IModuleManager.Stub() {
 
     private fun Map<String, String>.toModule(
         path: String = "unknown",
-        state: State = State.ENABLE,
+        state: State = State.Enable,
         lastUpdated: Long = 0L
     ) = Module(
         id = getOrDefault("id", path),