diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/view/MultiActionView.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/view/MultiActionView.kt index 1586f00232..ce21b9fae6 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/view/MultiActionView.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/view/MultiActionView.kt @@ -12,14 +12,14 @@ import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf [REDACTED_AUTHOR] */ open class MultiActionView( - stateList: MutableList, + stateActionList: MutableList, val child: V ) { interface State { val id: Id - fun getAction(): StateButtonAction + fun getAction(): SimpleFunction fun getResNameId(): Int } @@ -53,7 +53,7 @@ open class MultiActionView( child.setText(value.getResNameId()) } - protected val stateHolder: MutableMap = stateList.associateBy { getKey(it.id) }.toMutableMap() + protected val stateHolder: MutableMap = stateActionList.associateBy { getKey(it.id) }.toMutableMap() fun performAction(id: Id) { Log.d(this, "performAction ${getKey(id)}") @@ -71,15 +71,15 @@ open class MultiActionView( enum class DefaultId : Id { default } -typealias StateButtonAction = () -> Unit +typealias SimpleFunction = () -> Unit -class ButtonState( +class ViewAction( override val id: Id, @StringRes val name: Int, - private val action: StateButtonAction + private val action: SimpleFunction ) : MultiActionView.State { - override fun getAction(): StateButtonAction = action + override fun getAction(): SimpleFunction = action override fun getResNameId(): Int = name } \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt index d9d467df53..40133ebfd6 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt @@ -11,8 +11,8 @@ import com.tangem.tangemtest._arch.structure.Id import com.tangem.tangemtest._arch.structure.StringId import com.tangem.tangemtest._arch.structure.abstraction.Item import com.tangem.tangemtest._arch.widget.WidgetBuilder -import com.tangem.tangemtest.commons.view.ButtonState import com.tangem.tangemtest.commons.view.MultiActionView +import com.tangem.tangemtest.commons.view.ViewAction import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager import com.tangem.tangemtest.ucase.domain.paramsManager.PayloadKey import com.tangem.tangemtest.ucase.domain.paramsManager.managers.PersonalizationItemsManager @@ -48,8 +48,8 @@ class PersonalizationFragment : BaseCardActionFragment() { val show = StringId("show") val hide = StringId("hide") val multiAction = MultiActionView(mutableListOf( - ButtonState(show, R.string.show_rare_fields) { actionVM.showFields(ActionType.Personalize) }, - ButtonState(hide, R.string.hide_rare_fields) { actionVM.hideFields(ActionType.Personalize) } + ViewAction(show, R.string.show_rare_fields) { actionVM.showFields(ActionType.Personalize) }, + ViewAction(hide, R.string.hide_rare_fields) { actionVM.hideFields(ActionType.Personalize) } ), btn) multiAction.afterAction = { multiAction.state = if (it == show) hide else show