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 index 41037ce8..c1ffa5b6 100644 --- 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 index 6216c106..389031d1 100644 --- 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/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetAllScriptsIsActivatedUseCase.kt b/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetAllScriptsIsActivatedUseCase.kt index 87410e97..dfef6b5a 100644 --- a/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetAllScriptsIsActivatedUseCase.kt +++ b/app/src/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() { 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/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptIsEnabledUseCase.kt b/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptIsActivatedUseCase.kt similarity index 95% rename from app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptIsEnabledUseCase.kt rename to app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptIsActivatedUseCase.kt index 848a93e7..a98757e6 100644 --- a/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptIsEnabledUseCase.kt +++ b/app/src/main/java/com/gee12/mytetroid/domain/usecase/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() { data class Params( val script: TetroidScript, diff --git a/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptToObjectIsEnabledUseCase.kt b/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptToObjectIsActivatedUseCase.kt similarity index 74% rename from app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptToObjectIsEnabledUseCase.kt rename to app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptToObjectIsActivatedUseCase.kt index 1fc8eaf1..487f5891 100644 --- a/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/SetScriptToObjectIsEnabledUseCase.kt +++ b/app/src/main/java/com/gee12/mytetroid/domain/usecase/script/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() { data class Params( val scriptToObject: TetroidScriptToObject, - val isEnabled: Boolean, + val isActive: Boolean, ) override suspend fun run(params: Params): Either { 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 index 7e55b4ab..9774d01b 100644 --- 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() { 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 index cd60b74b..a1bac49a 100644 --- 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 {