From 14ea1d38077377c49f9b4d5719dc08cba6dc5532 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 26 Mar 2020 02:08:01 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../_main/entryPoint/ActionListFragment.kt | 6 +- .../tangemtest/_main/entryPoint/RvActions.kt | 6 +- .../cardUseCase/domain/actions/CardActions.kt | 128 ------------------ .../managers/PersonalizeParamsManager.kt | 17 --- .../{commons => ucase}/NavigationOp.kt | 2 +- .../ucase/domain/actions/CardAction.kt | 42 ++++++ .../domain/actions/DepesonalizeAction.kt | 20 +++ .../ucase/domain/actions/PersonalizeAction.kt | 44 ++++++ .../ucase/domain/actions/ScanAction.kt | 10 ++ .../ucase/domain/actions/SignAction.kt | 28 ++++ .../domain/paramsManager/Factory.kt | 12 +- .../domain/paramsManager/ParamsManager.kt | 2 +- .../managers}/BaseParamsManager.kt | 9 +- .../managers/DepersonalizeParamsManager.kt | 9 +- .../managers/PersonalizeParamsManager.kt | 16 +++ .../managers/ScanParamsManager.kt | 9 +- .../managers/SignParamsManager.kt | 9 +- .../afterAction/AfterActionModifiers.kt | 15 ++ .../afterAction/AfterScanModifier.kt} | 17 +-- .../ParamChangeConsequence.kt | 4 +- .../{cardUseCase => ucase}/resources/Ids.kt | 2 +- .../resources/MainResourceHolder.kt | 6 +- .../resources/ResourseTypes.kt | 2 +- .../resources/initializers/ActionResources.kt | 8 +- .../initializers/PersonalizeResources.kt | 6 +- .../ui}/BaseCardActionFragment.kt | 12 +- .../ui/card => ucase/ui}/ParamsViewModel.kt | 6 +- .../ui}/widgets/ParameterWidget.kt | 10 +- .../ui}/DepesonalizeActionFragment.kt | 6 +- .../converter/BlockToJsonConverter.kt | 4 +- .../personalize/converter/EncodeDecode.kt | 4 +- .../converter/JsonToBlockConverter.kt | 6 +- .../personalize/dto/PersonalizeJsonDto.kt | 2 +- .../personalize/ui}/PersonalizeFragment.kt | 14 +- .../personalize/ui}/PersonalizeViewModel.kt | 10 +- .../personalize/ui}/widgets/WidgetBuilder.kt | 10 +- .../ui}/widgets/abstraction/ViewWidget.kt | 6 +- .../ui}/widgets/impl/StubWidget.kt | 4 +- .../widgets/impl/block/LinearBlockWidget.kt | 4 +- .../widgets/impl/item/DescriptionWidget.kt | 6 +- .../ui}/widgets/impl/item/EditTextWidget.kt | 4 +- .../ui}/widgets/impl/item/NumberWidget.kt | 4 +- .../ui}/widgets/impl/item/SpinnerWidget.kt | 4 +- .../ui}/widgets/impl/item/SwitchWidget.kt | 4 +- .../ui}/widgets/impl/item/TextWidget.kt | 4 +- .../variants/scan/ui}/ScanActionFragment.kt | 6 +- .../variants/sign/ui}/SignActionFragment.kt | 6 +- .../src/main/res/navigation/navigation.xml | 24 ++-- 48 files changed, 303 insertions(+), 286 deletions(-) delete mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt delete mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/PersonalizeParamsManager.kt rename tangem-demo/src/main/java/com/tangem/tangemtest/{commons => ucase}/NavigationOp.kt (91%) create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/CardAction.kt create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/DepesonalizeAction.kt create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/ScanAction.kt create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/domain/paramsManager/Factory.kt (54%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/domain/paramsManager/ParamsManager.kt (93%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/domain/paramsManager => ucase/domain/paramsManager/managers}/BaseParamsManager.kt (78%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/domain/paramsManager/managers/DepersonalizeParamsManager.kt (62%) create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeParamsManager.kt rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/domain/paramsManager/managers/ScanParamsManager.kt (53%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/domain/paramsManager/managers/SignParamsManager.kt (65%) create mode 100644 tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterActionModifiers.kt rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt => ucase/domain/paramsManager/triggers/afterAction/AfterScanModifier.kt} (50%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/domain/paramsManager/modifiers => ucase/domain/paramsManager/triggers/changeConsequence}/ParamChangeConsequence.kt (83%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/resources/Ids.kt (86%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/resources/MainResourceHolder.kt (72%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/resources/ResourseTypes.kt (83%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/resources/initializers/ActionResources.kt (90%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase => ucase}/resources/initializers/PersonalizeResources.kt (98%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card => ucase/ui}/BaseCardActionFragment.kt (90%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card => ucase/ui}/ParamsViewModel.kt (95%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card/actions => ucase/ui}/widgets/ParameterWidget.kt (91%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card/actions => ucase/variants/depersonalize/ui}/DepesonalizeActionFragment.kt (57%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui => ucase/variants}/personalize/converter/BlockToJsonConverter.kt (68%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui => ucase/variants}/personalize/converter/EncodeDecode.kt (80%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui => ucase/variants}/personalize/converter/JsonToBlockConverter.kt (98%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui => ucase/variants}/personalize/dto/PersonalizeJsonDto.kt (97%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/PersonalizeFragment.kt (87%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/PersonalizeViewModel.kt (81%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/WidgetBuilder.kt (77%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/abstraction/ViewWidget.kt (87%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/StubWidget.kt (65%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/block/LinearBlockWidget.kt (78%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/DescriptionWidget.kt (82%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/EditTextWidget.kt (89%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/NumberWidget.kt (90%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/SpinnerWidget.kt (94%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/SwitchWidget.kt (85%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/personalize => ucase/variants/personalize/ui}/widgets/impl/item/TextWidget.kt (72%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card/actions => ucase/variants/scan/ui}/ScanActionFragment.kt (55%) rename tangem-demo/src/main/java/com/tangem/tangemtest/{cardUseCase/ui/card/actions => ucase/variants/sign/ui}/SignActionFragment.kt (55%) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt index c4e56b5e28..313c4aaffe 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt @@ -16,9 +16,9 @@ import androidx.transition.AutoTransition import androidx.transition.TransitionManager import com.tangem.tangemtest.R import com.tangem.tangemtest._main.MainViewModel -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder -import com.tangem.tangemtest.commons.getDefaultNavigationOptions +import com.tangem.tangemtest.ucase.getDefaultNavigationOptions +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.resources.MainResourceHolder import kotlinx.android.synthetic.main.fg_entry_point.* /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt index 679d2498fe..df045a572d 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt @@ -6,9 +6,9 @@ import android.widget.TextView import androidx.annotation.StringRes import androidx.recyclerview.widget.RecyclerView import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.resources.ActionRes -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder +import com.tangem.tangemtest.ucase.resources.ActionRes +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.resources.MainResourceHolder import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate import ru.dev.gbixahue.eu4d.lib.android._android.views.recycler_view.RvBaseAdapter import ru.dev.gbixahue.eu4d.lib.android._android.views.recycler_view.RvBaseVH diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt deleted file mode 100644 index a83d9a210c..0000000000 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt +++ /dev/null @@ -1,128 +0,0 @@ -package com.tangem.tangemtest.cardUseCase.domain.actions - -import com.tangem.CardManager -import com.tangem.commands.personalization.CardConfig -import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.AppTangemDemo -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ActionCallback -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.findParameter -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers.AfterActionModification -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers.AfterScanModifier -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers.ParamsChangeConsequence -import com.tangem.tangemtest.extensions.init -import com.tangem.tasks.ScanEvent -import com.tangem.tasks.TaskEvent -import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf - -/** -[REDACTED_AUTHOR] - * - * The Card Action class family is designed for calling Card Manager functions - * and then processing the response. It also allows you to extract the main action as a lambda expression - */ -data class AttrForAction( - val cardManager: CardManager, - val paramsList: List, - val consequence: ParamsChangeConsequence? -) - -interface CardAction { - fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) - fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? = null -} - -abstract class BaseCardAction : CardAction { - protected open fun handleResponse( - taskEvent: TaskEvent<*>, - modifier: AfterActionModification?, - attrs: AttrForAction, - callback: ActionCallback - ) { - val allModifiedParams = mutableListOf() - modifier?.modify(taskEvent, attrs.paramsList)?.forEach { parameter -> - allModifiedParams.add(parameter) - attrs.consequence?.affectChanges(parameter, attrs.paramsList)?.let { allModifiedParams.addAll(it) } - } - callback(taskEvent, allModifiedParams) - } -} - -class ScanAction : BaseCardAction() { - override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { - attrs.cardManager.scanCard { handleResponse(it, AfterScanModifier(), attrs, callback) } - } -} - -class SignAction : BaseCardAction() { - override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { - val dataForHashing = attrs.paramsList.findParameter(TlvTag.TransactionOutHash) ?: return - - val arHashes = createHashes(stringOf(dataForHashing.data)) - val cardId = attrs.paramsList.findParameter(TlvTag.CardId)?.data ?: return - - attrs.cardManager.sign(arHashes, stringOf(cardId)) { handleResponse(it, null, attrs, callback) } - } - - override fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? { - return when (tag) { - TlvTag.CardId -> { callback -> ScanAction().executeMainAction(attrs, callback) } - else -> null - } - } - - private fun createHashes(value: String): Array { - return arrayOf(value.toByteArray()) - } -} - -class PersonalizeAction : BaseCardAction() { - override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { - ScanAction().executeMainAction(attrs) { response, b -> - when (response) { - is TaskEvent.Event -> { - val taskEvent = response as TaskEvent.Event - val cardId = handleDataEvent(taskEvent.data) - if (cardId == null) { - handleResponse(response, null, attrs, callback) - return@executeMainAction - } - - attrs.cardManager.personalize(CardConfig.init(AppTangemDemo.appInstance), cardId) { - handleResponse(it, null, attrs, callback) - } - } - is TaskEvent.Completion -> { - handleResponse(response, null, attrs, callback) - } - } - - - } - } - - private fun handleDataEvent(event: Any?): String? { - return when (event) { - is ScanEvent.OnReadEvent -> { - event.card.cardId - } - else -> null - } - - } -} - -class DepesonalizeAction : BaseCardAction() { - override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { - val cardId = attrs.paramsList.findParameter(TlvTag.CardId)?.data as? String ?: return - - attrs.cardManager.depersonalize(cardId) { handleResponse(it, null, attrs, callback) } - } - - override fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? { - return when (tag) { - TlvTag.CardId -> { callback -> ScanAction().executeMainAction(attrs, callback) } - else -> null - } - } -} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/PersonalizeParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/PersonalizeParamsManager.kt deleted file mode 100644 index abfdc5631c..0000000000 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/PersonalizeParamsManager.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers - -import com.tangem.CardManager -import com.tangem.tangemtest.cardUseCase.domain.actions.PersonalizeAction -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ActionCallback -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.BaseParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter - -class PersonalizeParamsManager : BaseParamsManager(PersonalizeAction()) { - override fun createParamsList(): List { - return listOf() - } - - override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { - action.executeMainAction(getAttrsForAction(cardManager), callback) - } -} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/NavigationOp.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/NavigationOp.kt similarity index 91% rename from tangem-demo/src/main/java/com/tangem/tangemtest/commons/NavigationOp.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/NavigationOp.kt index 77fd815a41..739a40dd14 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/NavigationOp.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/NavigationOp.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.commons +package com.tangem.tangemtest.ucase import androidx.navigation.NavOptions import androidx.navigation.navOptions diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/CardAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/CardAction.kt new file mode 100644 index 0000000000..bf622ac218 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/CardAction.kt @@ -0,0 +1,42 @@ +package com.tangem.tangemtest.ucase.domain.actions + +import com.tangem.CardManager +import com.tangem.common.tlv.TlvTag +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.paramsManager.triggers.afterAction.AfterActionModification +import com.tangem.tangemtest.ucase.domain.paramsManager.triggers.changeConsequence.ParamsChangeConsequence +import com.tangem.tasks.TaskEvent + +/** +[REDACTED_AUTHOR] + * + * The Card Action class family is designed for calling Card Manager functions + * and then processing the response. It also allows you to extract the main action as a lambda expression + */ +data class AttrForAction( + val cardManager: CardManager, + val paramsList: List, + val consequence: ParamsChangeConsequence? +) + +interface CardAction { + fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) + fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? = null +} + +abstract class BaseCardAction : CardAction { + protected open fun handleResponse( + taskEvent: TaskEvent<*>, + modifier: AfterActionModification?, + attrs: AttrForAction, + callback: ActionCallback + ) { + val allModifiedParams = mutableListOf() + modifier?.modify(taskEvent, attrs.paramsList)?.forEach { parameter -> + allModifiedParams.add(parameter) + attrs.consequence?.affectChanges(parameter, attrs.paramsList)?.let { allModifiedParams.addAll(it) } + } + callback(taskEvent, allModifiedParams) + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/DepesonalizeAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/DepesonalizeAction.kt new file mode 100644 index 0000000000..0dac65db7d --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/DepesonalizeAction.kt @@ -0,0 +1,20 @@ +package com.tangem.tangemtest.ucase.domain.actions + +import com.tangem.common.tlv.TlvTag +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.findParameter + +class DepesonalizeAction : BaseCardAction() { + override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { + val cardId = attrs.paramsList.findParameter(TlvTag.CardId)?.data as? String ?: return + + attrs.cardManager.depersonalize(cardId) { handleResponse(it, null, attrs, callback) } + } + + override fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? { + return when (tag) { + TlvTag.CardId -> { callback -> ScanAction().executeMainAction(attrs, callback) } + else -> null + } + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt new file mode 100644 index 0000000000..ee0ac72440 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt @@ -0,0 +1,44 @@ +package com.tangem.tangemtest.ucase.domain.actions + +import com.tangem.commands.personalization.CardConfig +import com.tangem.tangemtest.AppTangemDemo +import com.tangem.tangemtest.extensions.init +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tasks.ScanEvent +import com.tangem.tasks.TaskEvent + +class PersonalizeAction : BaseCardAction() { + override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { + ScanAction().executeMainAction(attrs) { response, b -> + when (response) { + is TaskEvent.Event -> { + val taskEvent = response as TaskEvent.Event + val cardId = handleDataEvent(taskEvent.data) + if (cardId == null) { + handleResponse(response, null, attrs, callback) + return@executeMainAction + } + + attrs.cardManager.personalize(CardConfig.init(AppTangemDemo.appInstance), cardId) { + handleResponse(it, null, attrs, callback) + } + } + is TaskEvent.Completion -> { + handleResponse(response, null, attrs, callback) + } + } + + + } + } + + private fun handleDataEvent(event: Any?): String? { + return when (event) { + is ScanEvent.OnReadEvent -> { + event.card.cardId + } + else -> null + } + + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/ScanAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/ScanAction.kt new file mode 100644 index 0000000000..16031ae925 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/ScanAction.kt @@ -0,0 +1,10 @@ +package com.tangem.tangemtest.ucase.domain.actions + +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.triggers.afterAction.AfterScanModifier + +class ScanAction : BaseCardAction() { + override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { + attrs.cardManager.scanCard { handleResponse(it, AfterScanModifier(), attrs, callback) } + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt new file mode 100644 index 0000000000..ff3818422f --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/SignAction.kt @@ -0,0 +1,28 @@ +package com.tangem.tangemtest.ucase.domain.actions + +import com.tangem.common.tlv.TlvTag +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.findParameter +import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf + +class SignAction : BaseCardAction() { + override fun executeMainAction(attrs: AttrForAction, callback: ActionCallback) { + val dataForHashing = attrs.paramsList.findParameter(TlvTag.TransactionOutHash) ?: return + + val arHashes = createHashes(stringOf(dataForHashing.data)) + val cardId = attrs.paramsList.findParameter(TlvTag.CardId)?.data ?: return + + attrs.cardManager.sign(arHashes, stringOf(cardId)) { handleResponse(it, null, attrs, callback) } + } + + override fun getActionByTag(tag: TlvTag, attrs: AttrForAction): ((ActionCallback) -> Unit)? { + return when (tag) { + TlvTag.CardId -> { callback -> ScanAction().executeMainAction(attrs, callback) } + else -> null + } + } + + private fun createHashes(value: String): Array { + return arrayOf(value.toByteArray()) + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/Factory.kt similarity index 54% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/Factory.kt index a93a97b93e..2842ac7a50 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/Factory.kt @@ -1,10 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager +package com.tangem.tangemtest.ucase.domain.paramsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers.DepersonalizeParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers.PersonalizeParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers.ScanParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers.SignParamsManager -import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.ucase.domain.paramsManager.managers.DepersonalizeParamsManager +import com.tangem.tangemtest.ucase.domain.paramsManager.managers.PersonalizeParamsManager +import com.tangem.tangemtest.ucase.domain.paramsManager.managers.ScanParamsManager +import com.tangem.tangemtest.ucase.domain.paramsManager.managers.SignParamsManager +import com.tangem.tangemtest.ucase.resources.ActionType import ru.dev.gbixahue.eu4d.lib.kotlin.common.BaseTypedHolder /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/ParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ParamsManager.kt similarity index 93% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/ParamsManager.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ParamsManager.kt index f16b52ece5..aa48db34bb 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/ParamsManager.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/ParamsManager.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager +package com.tangem.tangemtest.ucase.domain.paramsManager import com.tangem.CardManager import com.tangem.common.tlv.TlvTag diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/BaseParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseParamsManager.kt similarity index 78% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/BaseParamsManager.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseParamsManager.kt index 3b03585ab8..017cacf156 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/BaseParamsManager.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/BaseParamsManager.kt @@ -1,10 +1,11 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager +package com.tangem.tangemtest.ucase.domain.paramsManager.managers import com.tangem.CardManager import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.actions.AttrForAction -import com.tangem.tangemtest.cardUseCase.domain.actions.CardAction -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers.ParamsChangeConsequence +import com.tangem.tangemtest.ucase.domain.actions.AttrForAction +import com.tangem.tangemtest.ucase.domain.actions.CardAction +import com.tangem.tangemtest.ucase.domain.paramsManager.* +import com.tangem.tangemtest.ucase.domain.paramsManager.triggers.changeConsequence.ParamsChangeConsequence abstract class BaseParamsManager(protected val action: CardAction) : ParamsManager { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/DepersonalizeParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/DepersonalizeParamsManager.kt similarity index 62% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/DepersonalizeParamsManager.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/DepersonalizeParamsManager.kt index 8f05948517..15d2205871 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/DepersonalizeParamsManager.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/DepersonalizeParamsManager.kt @@ -1,11 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers +package com.tangem.tangemtest.ucase.domain.paramsManager.managers import com.tangem.CardManager import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.actions.DepesonalizeAction -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ActionCallback -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.BaseParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.actions.DepesonalizeAction +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter class DepersonalizeParamsManager : BaseParamsManager(DepesonalizeAction()) { override fun createParamsList(): List { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeParamsManager.kt new file mode 100644 index 0000000000..990648ffe8 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeParamsManager.kt @@ -0,0 +1,16 @@ +package com.tangem.tangemtest.ucase.domain.paramsManager.managers + +import com.tangem.CardManager +import com.tangem.tangemtest.ucase.domain.actions.PersonalizeAction +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter + +class PersonalizeParamsManager : BaseParamsManager(PersonalizeAction()) { + override fun createParamsList(): List { + return listOf() + } + + override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { + action.executeMainAction(getAttrsForAction(cardManager), callback) + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/ScanParamsManager.kt similarity index 53% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/ScanParamsManager.kt index 8ded402548..87fafa04e8 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/ScanParamsManager.kt @@ -1,11 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers +package com.tangem.tangemtest.ucase.domain.paramsManager.managers import com.tangem.CardManager import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.actions.ScanAction -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ActionCallback -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.BaseParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.actions.ScanAction +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter class ScanParamsManager : BaseParamsManager(ScanAction()) { override fun createParamsList(): List { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/SignParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/SignParamsManager.kt similarity index 65% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/SignParamsManager.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/SignParamsManager.kt index 2046375f9e..181503332c 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/SignParamsManager.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/SignParamsManager.kt @@ -1,11 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.managers +package com.tangem.tangemtest.ucase.domain.paramsManager.managers import com.tangem.CardManager import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.actions.SignAction -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ActionCallback -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.BaseParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.actions.SignAction +import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter class SignParamsManager : BaseParamsManager(SignAction()) { override fun createParamsList(): List { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterActionModifiers.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterActionModifiers.kt new file mode 100644 index 0000000000..c808aeaa76 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterActionModifiers.kt @@ -0,0 +1,15 @@ +package com.tangem.tangemtest.ucase.domain.paramsManager.triggers.afterAction + +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter +import com.tangem.tasks.TaskEvent + +/** +[REDACTED_AUTHOR] + * + * The After Action Modification class family is intended for modifying parameters (if necessary) + * after calling CardManager.anyAction. + * Returns a list of parameters that have been modified + */ +interface AfterActionModification { + fun modify(taskEvent: TaskEvent<*>, paramsList: List): List +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterScanModifier.kt similarity index 50% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterScanModifier.kt index e34d02fbb7..43c2a9c5d3 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/afterAction/AfterScanModifier.kt @@ -1,22 +1,11 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers +package com.tangem.tangemtest.ucase.domain.paramsManager.triggers.afterAction import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.findParameter +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.paramsManager.findParameter import com.tangem.tasks.ScanEvent import com.tangem.tasks.TaskEvent -/** -[REDACTED_AUTHOR] - * - * The After Action Modification class family is intended for modifying parameters (if necessary) - * after calling CardManager.anyAction. - * Returns a list of parameters that have been modified - */ -interface AfterActionModification { - fun modify(taskEvent: TaskEvent<*>, paramsList: List): List -} - class AfterScanModifier : AfterActionModification { override fun modify(taskEvent: TaskEvent<*>, paramsList: List): List { val parameter = paramsList.findParameter(TlvTag.CardId) ?: return listOf() diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt similarity index 83% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt index 2d1c6756a8..cb2fa2dd98 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/triggers/changeConsequence/ParamChangeConsequence.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers +package com.tangem.tangemtest.ucase.domain.paramsManager.triggers.changeConsequence import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/Ids.kt similarity index 86% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/Ids.kt index 1c9d7b5fda..e686f0f8c3 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/Ids.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.resources +package com.tangem.tangemtest.ucase.resources import com.tangem.tangemtest._arch.structure.Id diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt similarity index 72% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt index bbcf1c33fa..997701527b 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.cardUseCase.resources +package com.tangem.tangemtest.ucase.resources import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.Id -import com.tangem.tangemtest.cardUseCase.resources.initializers.ActionResources -import com.tangem.tangemtest.cardUseCase.resources.initializers.PersonalizeResources +import com.tangem.tangemtest.ucase.resources.initializers.ActionResources +import com.tangem.tangemtest.ucase.resources.initializers.PersonalizeResources import ru.dev.gbixahue.eu4d.lib.kotlin.common.BaseTypedHolder /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/ResourseTypes.kt similarity index 83% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/ResourseTypes.kt index 4fdb23254e..72fad2464a 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/ResourseTypes.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.resources +package com.tangem.tangemtest.ucase.resources /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ActionResources.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ActionResources.kt index 504d0ccd67..053710adf7 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/ActionResources.kt @@ -1,10 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.resources.initializers +package com.tangem.tangemtest.ucase.resources.initializers import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.Id -import com.tangem.tangemtest.cardUseCase.resources.ActionRes -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.resources.ResourceHolder +import com.tangem.tangemtest.ucase.resources.ActionRes +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.resources.ResourceHolder /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt similarity index 98% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt index 5a1d886181..a2f944044f 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.cardUseCase.resources.initializers +package com.tangem.tangemtest.ucase.resources.initializers import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.* -import com.tangem.tangemtest.cardUseCase.resources.ResourceHolder -import com.tangem.tangemtest.cardUseCase.resources.Resources +import com.tangem.tangemtest.ucase.resources.ResourceHolder +import com.tangem.tangemtest.ucase.resources.Resources import ru.dev.gbixahue.eu4d.lib.kotlin.common.TypedHolder class PersonalizeResources() { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt index 8fde1eecad..46b38b597f 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/BaseCardActionFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.card +package com.tangem.tangemtest.ucase.ui import android.os.Bundle import android.view.LayoutInflater @@ -15,11 +15,11 @@ import com.google.android.material.snackbar.Snackbar import com.tangem.CardManager import com.tangem.tangem_sdk_new.extensions.init import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ParamsManagerFactory -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder -import com.tangem.tangemtest.cardUseCase.ui.card.actions.widgets.ParameterWidget +import com.tangem.tangemtest.ucase.domain.paramsManager.ParamsManager +import com.tangem.tangemtest.ucase.domain.paramsManager.ParamsManagerFactory +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.resources.MainResourceHolder +import com.tangem.tangemtest.ucase.ui.widgets.ParameterWidget import ru.dev.gbixahue.eu4d.lib.android._android.views.find import ru.dev.gbixahue.eu4d.lib.android.global.log.Log import ru.dev.gbixahue.eu4d.lib.kotlin.common.LayoutHolder diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/ParamsViewModel.kt similarity index 95% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/ParamsViewModel.kt index 913b468b5e..600a3d054c 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/ParamsViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.card +package com.tangem.tangemtest.ucase.ui import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData @@ -9,9 +9,9 @@ import com.tangem.CardManager import com.tangem.commands.Card import com.tangem.common.tlv.TlvTag import com.tangem.tangemtest._arch.SingleLiveEvent -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ParamsManager import com.tangem.tangemtest.commons.performAction +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.domain.paramsManager.ParamsManager import com.tangem.tasks.ScanEvent import com.tangem.tasks.TaskError import com.tangem.tasks.TaskEvent diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt similarity index 91% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt index 29a797a838..6aad9b7fb1 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.card.actions.widgets +package com.tangem.tangemtest.ucase.ui.widgets import android.text.Editable import android.text.TextWatcher @@ -11,10 +11,10 @@ import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import com.tangem.common.tlv.TlvTag import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder -import com.tangem.tangemtest.cardUseCase.resources.Resources +import com.tangem.tangemtest.ucase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.resources.MainResourceHolder +import com.tangem.tangemtest.ucase.resources.Resources import ru.dev.gbixahue.eu4d.lib.android.global.log.Log import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepesonalizeActionFragment.kt similarity index 57% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepesonalizeActionFragment.kt index d0de79d047..98e0d53ab4 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/depersonalize/ui/DepesonalizeActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.cardUseCase.ui.card.actions +package com.tangem.tangemtest.ucase.variants.depersonalize.ui import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/BlockToJsonConverter.kt similarity index 68% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/BlockToJsonConverter.kt index 87c6108563..383c61a04b 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/BlockToJsonConverter.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.converter +package com.tangem.tangemtest.ucase.variants.personalize.converter import com.tangem.tangemtest._arch.structure.abstraction.Block -import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.ucase.variants.personalize.dto.TestJsonDto import ru.dev.gbixahue.eu4d.lib.kotlin.common.Converter class BlockToJsonConverter : Converter, TestJsonDto> { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/EncodeDecode.kt similarity index 80% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/EncodeDecode.kt index e1325b61a7..915ea05eac 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/EncodeDecode.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.converter +package com.tangem.tangemtest.ucase.variants.personalize.converter import com.tangem.tangemtest._arch.structure.abstraction.Block -import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.ucase.variants.personalize.dto.TestJsonDto /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/JsonToBlockConverter.kt similarity index 98% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/JsonToBlockConverter.kt index ed66d57c97..6fa1d98058 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/JsonToBlockConverter.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.converter +package com.tangem.tangemtest.ucase.variants.personalize.converter import com.tangem.tangemtest._arch.structure.* import com.tangem.tangemtest._arch.structure.abstraction.Block import com.tangem.tangemtest._arch.structure.abstraction.ListItemBlock import com.tangem.tangemtest._arch.structure.impl.* -import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.Ndef -import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.ucase.variants.personalize.dto.Ndef +import com.tangem.tangemtest.ucase.variants.personalize.dto.TestJsonDto import ru.dev.gbixahue.eu4d.lib.kotlin.common.Converter class JsonToBlockConverter : Converter> { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeJsonDto.kt similarity index 97% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeJsonDto.kt index 91b2bcca81..60ea8e0271 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeJsonDto.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.dto +package com.tangem.tangemtest.ucase.variants.personalize.dto class TestJsonDto { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt similarity index 87% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt index 2eecbc30cb..9a96d95f20 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize +package com.tangem.tangemtest.ucase.variants.personalize.ui import android.content.Context import android.os.Bundle @@ -16,12 +16,12 @@ import com.tangem.CardManager import com.tangem.tangem_sdk_new.extensions.init import com.tangem.tangemtest.R import com.tangem.tangemtest._main.MainViewModel -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ParamsManager -import com.tangem.tangemtest.cardUseCase.domain.paramsManager.ParamsManagerFactory -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.ui.card.ActionViewModelFactory -import com.tangem.tangemtest.cardUseCase.ui.card.ParamsViewModel -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.WidgetBuilder +import com.tangem.tangemtest.ucase.domain.paramsManager.ParamsManager +import com.tangem.tangemtest.ucase.domain.paramsManager.ParamsManagerFactory +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.ui.ActionViewModelFactory +import com.tangem.tangemtest.ucase.ui.ParamsViewModel +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.WidgetBuilder import kotlinx.android.synthetic.main.fg_personalize.* import ru.dev.gbixahue.eu4d.lib.android.global.log.Log import java.io.IOException diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeViewModel.kt similarity index 81% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeViewModel.kt index b4c7bfd430..a9abce2b64 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize +package com.tangem.tangemtest.ucase.variants.personalize.ui import android.view.View import androidx.lifecycle.MutableLiveData @@ -7,10 +7,10 @@ import androidx.lifecycle.ViewModelProvider import com.google.gson.Gson import com.tangem.tangemtest._arch.structure.abstraction.BaseItem import com.tangem.tangemtest._arch.structure.abstraction.Block -import com.tangem.tangemtest.cardUseCase.ui.personalize.converter.BlockToJsonConverter -import com.tangem.tangemtest.cardUseCase.ui.personalize.converter.JsonBlockEnDe -import com.tangem.tangemtest.cardUseCase.ui.personalize.converter.JsonToBlockConverter -import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.ucase.variants.personalize.converter.BlockToJsonConverter +import com.tangem.tangemtest.ucase.variants.personalize.converter.JsonBlockEnDe +import com.tangem.tangemtest.ucase.variants.personalize.converter.JsonToBlockConverter +import com.tangem.tangemtest.ucase.variants.personalize.dto.TestJsonDto /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/WidgetBuilder.kt similarity index 77% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/WidgetBuilder.kt index 09a8e71cad..8261c9eb52 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/WidgetBuilder.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets import android.view.ViewGroup import com.tangem.tangemtest._arch.structure.abstraction.BaseItem @@ -6,10 +6,10 @@ import com.tangem.tangemtest._arch.structure.abstraction.Block import com.tangem.tangemtest._arch.structure.abstraction.Item import com.tangem.tangemtest._arch.structure.abstraction.ListItemBlock import com.tangem.tangemtest._arch.structure.impl.* -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.ViewWidget -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.StubWidget -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.block.LinearBlockWidget -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item.* +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.ViewWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.StubWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.block.LinearBlockWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item.* class WidgetBuilder { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/abstraction/ViewWidget.kt similarity index 87% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/abstraction/ViewWidget.kt index adc4148107..6295598d1f 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/abstraction/ViewWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction import android.view.LayoutInflater import android.view.View @@ -7,8 +7,8 @@ import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.DataHolder import com.tangem.tangemtest._arch.structure.abstraction.BaseItem import com.tangem.tangemtest._arch.structure.abstraction.ItemViewModel -import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder -import com.tangem.tangemtest.cardUseCase.resources.Resources +import com.tangem.tangemtest.ucase.resources.MainResourceHolder +import com.tangem.tangemtest.ucase.resources.Resources import ru.dev.gbixahue.eu4d.lib.kotlin.common.LayoutHolder /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/StubWidget.kt similarity index 65% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/StubWidget.kt index e701a61456..47a7620ebd 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/StubWidget.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl import android.view.ViewGroup import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.abstraction.ItemViewModel -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.BaseBlockWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.BaseBlockWidget class StubWidget(parent: ViewGroup) : BaseBlockWidget(parent) { override fun getLayoutId(): Int = R.layout.w_empty diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/block/LinearBlockWidget.kt similarity index 78% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/block/LinearBlockWidget.kt index f3b3d40f55..fb4be30444 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/block/LinearBlockWidget.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.block +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.block import android.view.ViewGroup import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.abstraction.BaseItem import com.tangem.tangemtest._arch.structure.abstraction.ItemViewModel import com.tangem.tangemtest._arch.structure.abstraction.ListItemBlock -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.BaseBlockWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.BaseBlockWidget /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/DescriptionWidget.kt similarity index 82% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/DescriptionWidget.kt index c99a086e6f..c6ded4ac0d 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/DescriptionWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.view.ViewGroup import android.widget.TextView @@ -6,8 +6,8 @@ import androidx.transition.AutoTransition import androidx.transition.TransitionManager import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.abstraction.BaseItem -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.BaseWidget -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResDescription +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.BaseWidget +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResDescription import ru.dev.gbixahue.eu4d.lib.android.global.log.Log /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/EditTextWidget.kt similarity index 89% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/EditTextWidget.kt index 9861f8a204..4a14450e7e 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/EditTextWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.text.Editable import android.text.TextWatcher @@ -7,7 +7,7 @@ import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.impl.EditTextItem -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResNameId import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf class EditTextWidget(parent: ViewGroup, data: EditTextItem) : DescriptionWidget(parent, data) { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/NumberWidget.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/NumberWidget.kt index 08f3f94ace..de479076cb 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/NumberWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.text.Editable import android.text.TextWatcher @@ -7,7 +7,7 @@ import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.impl.NumberItem -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResNameId import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf class NumberWidget(parent: ViewGroup, data: NumberItem) : DescriptionWidget(parent, data) { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SpinnerWidget.kt similarity index 94% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SpinnerWidget.kt index 44818dedab..dcd650d4df 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SpinnerWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.view.View import android.view.ViewGroup @@ -10,7 +10,7 @@ import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.impl.KeyValue import com.tangem.tangemtest._arch.structure.impl.ListItem import com.tangem.tangemtest._arch.structure.impl.ListValueWrapper -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResNameId import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SwitchWidget.kt similarity index 85% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SwitchWidget.kt index df21197a53..c0c69699b1 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/SwitchWidget.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.view.ViewGroup import android.widget.CompoundButton import androidx.appcompat.widget.SwitchCompat import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.impl.BoolItem -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResNameId class SwitchWidget(parent: ViewGroup, data: BoolItem) : DescriptionWidget(parent, data) { override fun getLayoutId(): Int = R.layout.w_personalize_item_switch diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/TextWidget.kt similarity index 72% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/TextWidget.kt index 3af2f62315..73cf1f21a1 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/impl/item/TextWidget.kt @@ -1,10 +1,10 @@ -package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.impl.item import android.view.ViewGroup import android.widget.TextView import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.impl.TextItem -import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.abstraction.getResNameId class TextWidget(parent: ViewGroup, data: TextItem) : DescriptionWidget(parent, data) { override fun getLayoutId(): Int = R.layout.w_personalize_item_text diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt similarity index 55% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt index 4db5974cda..8ea13a4516 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.cardUseCase.ui.card.actions +package com.tangem.tangemtest.ucase.variants.scan.ui import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt similarity index 55% rename from tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt index 44950909f0..9ce99ee075 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/sign/ui/SignActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.cardUseCase.ui.card.actions +package com.tangem.tangemtest.ucase.variants.sign.ui import com.tangem.tangemtest.R -import com.tangem.tangemtest.cardUseCase.resources.ActionType -import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.ucase.resources.ActionType +import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/res/navigation/navigation.xml b/tangem-demo/src/main/res/navigation/navigation.xml index 34ebff7dc3..2c0c71483e 100644 --- a/tangem-demo/src/main/res/navigation/navigation.xml +++ b/tangem-demo/src/main/res/navigation/navigation.xml @@ -51,73 +51,73 @@