Refactoring names

gee12 · May 11, 2024 · bc670d8 · bc670d8
1 parent 791ceb7
commit bc670d8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/app/src/main/java/com/gee12/mytetroid/di/modules/UseCasesModule.kt b/app/src/main/java/com/gee12/mytetroid/di/modules/UseCasesModule.kt
@@ -823,13 +823,13 @@ object UseCasesModule {
             }
 
             scoped {
-                SetScriptIsEnabledUseCase(
+                SetScriptIsActivatedUseCase(
                     scriptsManager = get(),
                 )
             }
 
             scoped {
-                SetScriptToObjectIsEnabledUseCase(
+                SetScriptToObjectIsActivatedUseCase(
                     scriptsManager = get(),
                 )
             }

diff --git a/app/src/main/java/com/gee12/mytetroid/di/modules/ViewModelsModule.kt b/app/src/main/java/com/gee12/mytetroid/di/modules/ViewModelsModule.kt
@@ -369,9 +369,9 @@ object ViewModelsModule {
                     saveScriptUseCase = get(),
                     addDefaultScriptUseCase = get(),
                     editScriptUseCase = get(),
-                    setScriptIsEnabledUseCase = get(),
+                    setScriptIsActivatedUseCase = get(),
                     setScriptsIsActivatedUseCase = get(),
-                    setScriptToObjectIsEnabledUseCase = get(),
+                    setScriptToObjectIsActivatedUseCase = get(),
                     duplicateScriptUseCase = get(),
                     deleteScriptFileUseCase = get(),
                     prepareFileForOpenUseCase = get(),

diff --git a/...rc/main/java/com/gee12/mytetroid/domain/usecase/script/SetAllScriptsIsActivatedUseCase.kt b/...rc/main/java/com/gee12/mytetroid/domain/usecase/script/SetAllScriptsIsActivatedUseCase.kt
@@ -6,7 +6,7 @@ import com.gee12.mytetroid.model.TetroidObject
 
 class SetAllScriptsIsActivatedUseCase(
     private val scriptsManager: ScriptsManager,
-    private val setScriptIsEnabledUseCase: SetScriptIsEnabledUseCase,
+    private val setScriptIsEnabledUseCase: SetScriptIsActivatedUseCase,
 ) : UseCase<UseCase.None, SetAllScriptsIsActivatedUseCase.Params>() {
 
     data class Params(
@@ -24,7 +24,7 @@ class SetAllScriptsIsActivatedUseCase(
 
         scripts.forEach { script ->
             setScriptIsEnabledUseCase.run(
-                SetScriptIsEnabledUseCase.Params(
+                SetScriptIsActivatedUseCase.Params(
                     script = script,
                     obj = obj,
                     isActive = isActive,

diff --git a/...ecase/script/SetScriptIsEnabledUseCase.kt → ...ase/script/SetScriptIsActivatedUseCase.kt b/...ecase/script/SetScriptIsEnabledUseCase.kt → ...ase/script/SetScriptIsActivatedUseCase.kt
@@ -8,9 +8,9 @@ import com.gee12.mytetroid.model.TetroidScript
 import com.gee12.mytetroid.model.TetroidScriptToObject
 import com.gee12.mytetroid.model.enums.TetroidObjectType
 
-class SetScriptIsEnabledUseCase(
+class SetScriptIsActivatedUseCase(
     private val scriptsManager: ScriptsManager,
-) : UseCase<UseCase.None, SetScriptIsEnabledUseCase.Params>() {
+) : UseCase<UseCase.None, SetScriptIsActivatedUseCase.Params>() {
 
     data class Params(
         val script: TetroidScript,

diff --git a/...ript/SetScriptToObjectIsEnabledUseCase.kt → ...pt/SetScriptToObjectIsActivatedUseCase.kt b/...ript/SetScriptToObjectIsEnabledUseCase.kt → ...pt/SetScriptToObjectIsActivatedUseCase.kt
@@ -4,20 +4,20 @@ import com.gee12.mytetroid.common.*
 import com.gee12.mytetroid.domain.manager.ScriptsManager
 import com.gee12.mytetroid.model.TetroidScriptToObject
 
-class SetScriptToObjectIsEnabledUseCase(
+class SetScriptToObjectIsActivatedUseCase(
     private val scriptsManager: ScriptsManager,
-) : UseCase<UseCase.None, SetScriptToObjectIsEnabledUseCase.Params>() {
+) : UseCase<UseCase.None, SetScriptToObjectIsActivatedUseCase.Params>() {
 
     data class Params(
         val scriptToObject: TetroidScriptToObject,
-        val isEnabled: Boolean,
+        val isActive: Boolean,
     )
 
     override suspend fun run(params: Params): Either<Failure, None> {
         val scriptToObject = params.scriptToObject
-        val isEnabled = params.isEnabled
+        val isActive = params.isActive
 
-        return if (scriptsManager.updateScriptIsActiveForObject(scriptToObject, isEnabled)) {
+        return if (scriptsManager.updateScriptIsActiveForObject(scriptToObject, isActive)) {
             None.toRight()
         } else {
             Failure.Database.Update.toLeft()

diff --git a/app/src/main/java/com/gee12/mytetroid/ui/scripts/ScriptsActivity.kt b/app/src/main/java/com/gee12/mytetroid/ui/scripts/ScriptsActivity.kt
@@ -80,7 +80,7 @@ class ScriptsActivity : TetroidActivity<ScriptsViewModel>() {
             showScriptPopupMenu(view, script)
         }
         adapter.onObjectItemSwitchClickListener = { scriptToObject, isChecked, _ ->
-            viewModel.setScriptToObjectEnabled(scriptToObject, isEnabled = isChecked)
+            viewModel.setScriptToObjectActivated(scriptToObject, isActive = isChecked)
         }
         recyclerView.adapter = adapter
 

diff --git a/app/src/main/java/com/gee12/mytetroid/ui/scripts/ScriptsViewModel.kt b/app/src/main/java/com/gee12/mytetroid/ui/scripts/ScriptsViewModel.kt
@@ -42,9 +42,9 @@ class ScriptsViewModel(
     private val saveScriptUseCase: SaveScriptUseCase,
     private val addDefaultScriptUseCase: AddDefaultScriptUseCase,
     private val editScriptUseCase: EditScriptUseCase,
-    private val setScriptIsEnabledUseCase: SetScriptIsEnabledUseCase,
+    private val setScriptIsActivatedUseCase: SetScriptIsActivatedUseCase,
     private val setScriptsIsActivatedUseCase: SetAllScriptsIsActivatedUseCase,
-    private val setScriptToObjectIsEnabledUseCase: SetScriptToObjectIsEnabledUseCase,
+    private val setScriptToObjectIsActivatedUseCase: SetScriptToObjectIsActivatedUseCase,
     private val duplicateScriptUseCase: DuplicateScriptUseCase,
     private val deleteScriptFileUseCase: DeleteScriptFileUseCase,
     private val prepareFileForOpenUseCase: PrepareFileForOpenUseCase,
@@ -201,8 +201,8 @@ class ScriptsViewModel(
     private fun setScriptIsActive(script: TetroidScript, isActive: Boolean, forCurrentObjectOnly: Boolean) {
         launchOnMain {
             withIo {
-                setScriptIsEnabledUseCase.run(
-                    SetScriptIsEnabledUseCase.Params(
+                setScriptIsActivatedUseCase.run(
+                    SetScriptIsActivatedUseCase.Params(
                         script = script,
                         obj = scriptObject,
                         isActive = isActive,
@@ -236,13 +236,13 @@ class ScriptsViewModel(
         }
     }
 
-    fun setScriptToObjectEnabled(scriptToObject: TetroidScriptToObject, isEnabled: Boolean) {
+    fun setScriptToObjectActivated(scriptToObject: TetroidScriptToObject, isActive: Boolean) {
         launchOnMain {
             withIo {
-                setScriptToObjectIsEnabledUseCase.run(
-                    SetScriptToObjectIsEnabledUseCase.Params(
+                setScriptToObjectIsActivatedUseCase.run(
+                    SetScriptToObjectIsActivatedUseCase.Params(
                         scriptToObject = scriptToObject,
-                        isEnabled = isEnabled,
+                        isActive = isActive,
                     )
                 )
             }.onFailure {