diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/live_data.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_arch/SingleLiveEvent.kt similarity index 100% rename from tangem-demo/src/main/java/com/tangem/tangemtest/_arch/live_data.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/_arch/SingleLiveEvent.kt diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/EntryPointFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt similarity index 93% rename from tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/EntryPointFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt index a348ed58f3..c4e56b5e28 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/EntryPointFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/ActionListFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest._main.entry_point +package com.tangem.tangemtest._main.entryPoint import android.os.Bundle import android.view.LayoutInflater @@ -16,15 +16,15 @@ import androidx.transition.AutoTransition import androidx.transition.TransitionManager import com.tangem.tangemtest.R import com.tangem.tangemtest._main.MainViewModel -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.resources.MainResourceHolder +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder import com.tangem.tangemtest.commons.getDefaultNavigationOptions import kotlinx.android.synthetic.main.fg_entry_point.* /** [REDACTED_AUTHOR] */ -class EntryPointFragment : Fragment() { +class ActionListFragment : Fragment() { private val navController: NavController by lazy { findNavController() } private lateinit var rvActions: RecyclerView diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/rv.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/rv.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt index 5ae9c4c33c..679d2498fe 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entry_point/rv.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/_main/entryPoint/RvActions.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest._main.entry_point +package com.tangem.tangemtest._main.entryPoint import android.view.View import android.view.ViewGroup @@ -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.card_use_cases.resources.ActionRes -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.resources.MainResourceHolder +import com.tangem.tangemtest.cardUseCase.resources.ActionRes +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.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/card_use_cases/domain/card_action/card_actions.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt similarity index 87% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/card_action/card_actions.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt index 228aac2180..a83d9a210c 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/card_action/card_actions.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/actions/CardActions.kt @@ -1,15 +1,15 @@ -package com.tangem.tangemtest.card_use_cases.domain.card_action +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.card_use_cases.domain.params_manager.ActionCallback -import com.tangem.tangemtest.card_use_cases.domain.params_manager.IncomingParameter -import com.tangem.tangemtest.card_use_cases.domain.params_manager.findParameter -import com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers.AfterActionModification -import com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers.AfterScanModifier -import com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers.ParamsChangeConsequence +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 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/cardUseCase/domain/paramsManager/BaseParamsManager.kt new file mode 100644 index 0000000000..3b03585ab8 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/BaseParamsManager.kt @@ -0,0 +1,36 @@ +package com.tangem.tangemtest.cardUseCase.domain.paramsManager + +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 + +abstract class BaseParamsManager(protected val action: CardAction) : ParamsManager { + + protected val paramsList: List by lazy { createParamsList() } + + abstract fun createParamsList(): List + + override fun parameterChanged(tag: TlvTag, value: Any?, callback: AffectedParamsCallback?) { + if (paramsList.isEmpty()) return + val foundParam = paramsList.findParameter(tag) ?: return + + foundParam.data = value + applyChangesByAffectedParams(foundParam, callback) + } + + override fun getParams(): MutableList = paramsList.toMutableList() + + override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? = null + + // Use it if current parameter needs to be affect any other parameters + protected open fun applyChangesByAffectedParams(param: IncomingParameter, callback: AffectedParamsCallback?) { + getChangeConsequence()?.affectChanges(param, paramsList)?.let { callback?.invoke(it) } + } + + protected open fun getChangeConsequence(): ParamsChangeConsequence? = null + + protected fun getAttrsForAction(cardManager: CardManager) + : AttrForAction = AttrForAction(cardManager, paramsList, getChangeConsequence()) +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/factory.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt similarity index 54% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/factory.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt index a95a25eb81..a93a97b93e 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/factory.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/Factory.kt @@ -1,6 +1,10 @@ -package com.tangem.tangemtest.card_use_cases.domain.params_manager +package com.tangem.tangemtest.cardUseCase.domain.paramsManager -import com.tangem.tangemtest.card_use_cases.resources.ActionType +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 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/cardUseCase/domain/paramsManager/ParamsManager.kt new file mode 100644 index 0000000000..f16b52ece5 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/ParamsManager.kt @@ -0,0 +1,25 @@ +package com.tangem.tangemtest.cardUseCase.domain.paramsManager + +import com.tangem.CardManager +import com.tangem.common.tlv.TlvTag +import com.tangem.tasks.TaskEvent + +typealias ActionResponse = TaskEvent<*> +typealias AffectedList = List +typealias AffectedParamsCallback = (AffectedList) -> Unit +typealias ActionCallback = (ActionResponse, AffectedList) -> Unit + +interface ParamsManager { + + fun parameterChanged(tag: TlvTag, value: Any?, callback: AffectedParamsCallback? = null) + fun getParams(): List + fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) + fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? + +} + +class IncomingParameter(val tlvTag: TlvTag, var data: Any? = null) + +fun List.findParameter(tag: TlvTag): IncomingParameter? { + return firstOrNull { it.tlvTag == tag } +} \ No newline at end of file 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/cardUseCase/domain/paramsManager/managers/DepersonalizeParamsManager.kt new file mode 100644 index 0000000000..8f05948517 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/DepersonalizeParamsManager.kt @@ -0,0 +1,22 @@ +package com.tangem.tangemtest.cardUseCase.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 + +class DepersonalizeParamsManager : BaseParamsManager(DepesonalizeAction()) { + override fun createParamsList(): List { + return listOf(IncomingParameter(TlvTag.CardId, null)) + } + + override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { + action.executeMainAction(getAttrsForAction(cardManager), callback) + } + + override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? { + return action.getActionByTag(tag, getAttrsForAction(cardManager)) + } +} \ 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 new file mode 100644 index 0000000000..abfdc5631c --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/PersonalizeParamsManager.kt @@ -0,0 +1,17 @@ +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/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt new file mode 100644 index 0000000000..8ded402548 --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/ScanParamsManager.kt @@ -0,0 +1,18 @@ +package com.tangem.tangemtest.cardUseCase.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 + +class ScanParamsManager : BaseParamsManager(ScanAction()) { + override fun createParamsList(): List { + return listOf(IncomingParameter(TlvTag.CardId, null)) + } + + 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/SignParamsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/SignParamsManager.kt new file mode 100644 index 0000000000..2046375f9e --- /dev/null +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/managers/SignParamsManager.kt @@ -0,0 +1,25 @@ +package com.tangem.tangemtest.cardUseCase.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 + +class SignParamsManager : BaseParamsManager(SignAction()) { + override fun createParamsList(): List { + return listOf( + IncomingParameter(TlvTag.CardId, null), + IncomingParameter(TlvTag.TransactionOutHash, "Data used for hashing") + ) + } + + override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { + action.executeMainAction(getAttrsForAction(cardManager), callback) + } + + override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? { + return action.getActionByTag(tag, getAttrsForAction(cardManager)) + } +} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/after_action_modifiers.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt similarity index 79% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/after_action_modifiers.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt index f4ca3b51a2..e34d02fbb7 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/after_action_modifiers.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/AfterActionModifiers.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers +package com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.card_use_cases.domain.params_manager.IncomingParameter -import com.tangem.tangemtest.card_use_cases.domain.params_manager.findParameter +import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter +import com.tangem.tangemtest.cardUseCase.domain.paramsManager.findParameter import com.tangem.tasks.ScanEvent import com.tangem.tasks.TaskEvent diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/param_change_consequence.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt similarity index 83% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/param_change_consequence.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt index e2c2148bd9..2d1c6756a8 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/modifiers/param_change_consequence.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/domain/paramsManager/modifiers/ParamChangeConsequence.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers +package com.tangem.tangemtest.cardUseCase.domain.paramsManager.modifiers import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.card_use_cases.domain.params_manager.IncomingParameter +import com.tangem.tangemtest.cardUseCase.domain.paramsManager.IncomingParameter /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt similarity index 85% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/Ids.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt index 8f7c373508..1c9d7b5fda 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/Ids.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/Ids.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.resources +package com.tangem.tangemtest.cardUseCase.resources import com.tangem.tangemtest._arch.structure.Id diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/MainResourceHolder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt similarity index 71% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/MainResourceHolder.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt index 97912e4f23..bbcf1c33fa 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/MainResourceHolder.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/MainResourceHolder.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.card_use_cases.resources +package com.tangem.tangemtest.cardUseCase.resources import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.Id -import com.tangem.tangemtest.card_use_cases.resources.initializers.ActionResources -import com.tangem.tangemtest.card_use_cases.resources.initializers.PersonalizeResources +import com.tangem.tangemtest.cardUseCase.resources.initializers.ActionResources +import com.tangem.tangemtest.cardUseCase.resources.initializers.PersonalizeResources import ru.dev.gbixahue.eu4d.lib.kotlin.common.BaseTypedHolder /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/ResourseTypes.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt similarity index 83% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/ResourseTypes.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt index 6851aa31e0..4fdb23254e 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/ResourseTypes.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/ResourseTypes.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.resources +package com.tangem.tangemtest.cardUseCase.resources /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/ActionResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/ActionResources.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt index 2faac7e097..504d0ccd67 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/ActionResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/ActionResources.kt @@ -1,10 +1,10 @@ -package com.tangem.tangemtest.card_use_cases.resources.initializers +package com.tangem.tangemtest.cardUseCase.resources.initializers import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.Id -import com.tangem.tangemtest.card_use_cases.resources.ActionRes -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.resources.ResourceHolder +import com.tangem.tangemtest.cardUseCase.resources.ActionRes +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.resources.ResourceHolder /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/PersonalizeResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt similarity index 98% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/PersonalizeResources.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt index cb27504c31..5a1d886181 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/resources/initializers/PersonalizeResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/resources/initializers/PersonalizeResources.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.card_use_cases.resources.initializers +package com.tangem.tangemtest.cardUseCase.resources.initializers import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.* -import com.tangem.tangemtest.card_use_cases.resources.ResourceHolder -import com.tangem.tangemtest.card_use_cases.resources.Resources +import com.tangem.tangemtest.cardUseCase.resources.ResourceHolder +import com.tangem.tangemtest.cardUseCase.resources.Resources import ru.dev.gbixahue.eu4d.lib.kotlin.common.TypedHolder class PersonalizeResources() { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/BaseCardActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt similarity index 87% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/BaseCardActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt index 550f645fe7..8fde1eecad 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/BaseCardActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/BaseCardActionFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.card +package com.tangem.tangemtest.cardUseCase.ui.card import android.os.Bundle import android.view.LayoutInflater @@ -15,13 +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.card_use_cases.domain.params_manager.ParamsManager -import com.tangem.tangemtest.card_use_cases.domain.params_manager.ParamsManagerFactory -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.resources.MainResourceHolder -import com.tangem.tangemtest.card_use_cases.ui.card.actions.ActionViewModelFactory -import com.tangem.tangemtest.card_use_cases.ui.card.actions.ParamsViewModel -import com.tangem.tangemtest.card_use_cases.ui.card.actions.widgets.ParameterWidget +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 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/card_use_cases/ui/card/actions/ParamsViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt similarity index 94% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/ParamsViewModel.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt index d280a32ec9..913b468b5e 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/ParamsViewModel.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/ParamsViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.card.actions +package com.tangem.tangemtest.cardUseCase.ui.card import androidx.annotation.UiThread import androidx.lifecycle.MutableLiveData @@ -9,8 +9,8 @@ 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.card_use_cases.domain.params_manager.IncomingParameter -import com.tangem.tangemtest.card_use_cases.domain.params_manager.ParamsManager +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.tasks.ScanEvent import com.tangem.tasks.TaskError diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/DepesonalizeActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt similarity index 56% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/DepesonalizeActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt index 0605dc00a7..d0de79d047 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/DepesonalizeActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/DepesonalizeActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.card_use_cases.ui.card.actions +package com.tangem.tangemtest.cardUseCase.ui.card.actions import com.tangem.tangemtest.R -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt similarity index 54% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/ScanActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt index 333a941eb0..4db5974cda 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/ScanActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/ScanActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.card_use_cases.ui.card.actions +package com.tangem.tangemtest.cardUseCase.ui.card.actions import com.tangem.tangemtest.R -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/SignActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt similarity index 54% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/SignActionFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt index 49177a3abc..44950909f0 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/SignActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/SignActionFragment.kt @@ -1,8 +1,8 @@ -package com.tangem.tangemtest.card_use_cases.ui.card.actions +package com.tangem.tangemtest.cardUseCase.ui.card.actions import com.tangem.tangemtest.R -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.ui.card.BaseCardActionFragment +import com.tangem.tangemtest.cardUseCase.resources.ActionType +import com.tangem.tangemtest.cardUseCase.ui.card.BaseCardActionFragment /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/widgets/ParameterWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt similarity index 91% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/widgets/ParameterWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt index 1f761bf602..29a797a838 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/card/actions/widgets/ParameterWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/card/actions/widgets/ParameterWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.card.actions.widgets +package com.tangem.tangemtest.cardUseCase.ui.card.actions.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.card_use_cases.domain.params_manager.IncomingParameter -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.resources.MainResourceHolder -import com.tangem.tangemtest.card_use_cases.resources.Resources +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 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/card_use_cases/ui/personalize/PersonalizeFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt similarity index 86% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/PersonalizeFragment.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt index 3c5dc87e52..2eecbc30cb 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/PersonalizeFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeFragment.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize +package com.tangem.tangemtest.cardUseCase.ui.personalize 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.card_use_cases.domain.params_manager.ParamsManager -import com.tangem.tangemtest.card_use_cases.domain.params_manager.ParamsManagerFactory -import com.tangem.tangemtest.card_use_cases.resources.ActionType -import com.tangem.tangemtest.card_use_cases.ui.card.actions.ActionViewModelFactory -import com.tangem.tangemtest.card_use_cases.ui.card.actions.ParamsViewModel -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.WidgetBuilder +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 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/card_use_cases/ui/personalize/PersonalizeViewModel.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt similarity index 77% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/PersonalizeViewModel.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt index 34cf553880..b4c7bfd430 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/PersonalizeViewModel.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/PersonalizeViewModel.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize +package com.tangem.tangemtest.cardUseCase.ui.personalize 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.card_use_cases.ui.personalize.converter.BlockToJsonConverter -import com.tangem.tangemtest.card_use_cases.ui.personalize.converter.JsonBlockEnDe -import com.tangem.tangemtest.card_use_cases.ui.personalize.converter.JsonToBlockConverter -import com.tangem.tangemtest.card_use_cases.ui.personalize.dto.TestJsonDto +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 /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/BlockToJsonConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt similarity index 64% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/BlockToJsonConverter.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt index dca1764a60..87c6108563 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/BlockToJsonConverter.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/BlockToJsonConverter.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.converter +package com.tangem.tangemtest.cardUseCase.ui.personalize.converter import com.tangem.tangemtest._arch.structure.abstraction.Block -import com.tangem.tangemtest.card_use_cases.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.cardUseCase.ui.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/card_use_cases/ui/personalize/converter/EncodeDecode.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt similarity index 78% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/EncodeDecode.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt index 918ded2812..e1325b61a7 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/EncodeDecode.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/EncodeDecode.kt @@ -1,7 +1,7 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.converter +package com.tangem.tangemtest.cardUseCase.ui.personalize.converter import com.tangem.tangemtest._arch.structure.abstraction.Block -import com.tangem.tangemtest.card_use_cases.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.TestJsonDto /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/JsonToBlockConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt similarity index 98% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/JsonToBlockConverter.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt index e9c31e71f6..ed66d57c97 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/converter/JsonToBlockConverter.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/converter/JsonToBlockConverter.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.converter +package com.tangem.tangemtest.cardUseCase.ui.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.card_use_cases.ui.personalize.dto.Ndef -import com.tangem.tangemtest.card_use_cases.ui.personalize.dto.TestJsonDto +import com.tangem.tangemtest.cardUseCase.ui.personalize.dto.Ndef +import com.tangem.tangemtest.cardUseCase.ui.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/card_use_cases/ui/personalize/dto/PersonalizeJsonDto.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt similarity index 97% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/dto/PersonalizeJsonDto.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt index 093bfac912..91b2bcca81 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/dto/PersonalizeJsonDto.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/dto/PersonalizeJsonDto.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.dto +package com.tangem.tangemtest.cardUseCase.ui.personalize.dto class TestJsonDto { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/WidgetBuilder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt similarity index 77% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/WidgetBuilder.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt index d6ec468702..09a8e71cad 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/WidgetBuilder.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/WidgetBuilder.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.ViewWidget -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.StubWidget -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.block.LinearBlockWidget -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item.* +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.* class WidgetBuilder { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/abstraction/ViewWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt similarity index 86% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/abstraction/ViewWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt index 58b07675c4..adc4148107 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/abstraction/ViewWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/abstraction/ViewWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.abstraction +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.resources.MainResourceHolder -import com.tangem.tangemtest.card_use_cases.resources.Resources +import com.tangem.tangemtest.cardUseCase.resources.MainResourceHolder +import com.tangem.tangemtest.cardUseCase.resources.Resources import ru.dev.gbixahue.eu4d.lib.kotlin.common.LayoutHolder /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/StubWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt similarity index 65% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/StubWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt index d541d9abd4..e701a61456 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/StubWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/StubWidget.kt @@ -1,9 +1,9 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl +package com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.impl import android.view.ViewGroup import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.abstraction.ItemViewModel -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.abstraction.BaseBlockWidget +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/ui/personalize/widgets/impl/block/LinearBlockWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt similarity index 78% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/block/LinearBlockWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt index 6e0bff63ad..f3b3d40f55 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/block/LinearBlockWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/block/LinearBlockWidget.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.block +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.BaseBlockWidget +import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.BaseBlockWidget /** [REDACTED_AUTHOR] diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/DescriptionWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt similarity index 82% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/DescriptionWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt index 703ea69344..c99a086e6f 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/DescriptionWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/DescriptionWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.BaseWidget -import com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.abstraction.getResDescription +import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.BaseWidget +import com.tangem.tangemtest.cardUseCase.ui.personalize.widgets.abstraction.getResDescription import ru.dev.gbixahue.eu4d.lib.android.global.log.Log /** diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/EditTextWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt similarity index 89% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/EditTextWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt index 9c720ed7d4..9861f8a204 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/EditTextWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/EditTextWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/ui/personalize/widgets/impl/item/NumberWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt similarity index 90% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/NumberWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt index 2f217028d0..08f3f94ace 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/NumberWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/NumberWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/ui/personalize/widgets/impl/item/SpinnerWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt similarity index 94% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/SpinnerWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt index 4fd88eebce..44818dedab 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/SpinnerWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SpinnerWidget.kt @@ -1,4 +1,4 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/ui/personalize/widgets/impl/item/SwitchWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt similarity index 85% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/SwitchWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt index 07693e3719..df21197a53 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/SwitchWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/SwitchWidget.kt @@ -1,11 +1,11 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/ui/personalize/widgets/impl/item/TextWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt similarity index 72% rename from tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/TextWidget.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt index b426592056..3af2f62315 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/ui/personalize/widgets/impl/item/TextWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/cardUseCase/ui/personalize/widgets/impl/item/TextWidget.kt @@ -1,10 +1,10 @@ -package com.tangem.tangemtest.card_use_cases.ui.personalize.widgets.impl.item +package com.tangem.tangemtest.cardUseCase.ui.personalize.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.card_use_cases.ui.personalize.widgets.abstraction.getResNameId +import com.tangem.tangemtest.cardUseCase.ui.personalize.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/card_use_cases/domain/params_manager/params_managers.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/params_managers.kt deleted file mode 100644 index 3f5dd51993..0000000000 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/card_use_cases/domain/params_manager/params_managers.kt +++ /dev/null @@ -1,113 +0,0 @@ -package com.tangem.tangemtest.card_use_cases.domain.params_manager - -import com.tangem.CardManager -import com.tangem.common.tlv.TlvTag -import com.tangem.tangemtest.card_use_cases.domain.card_action.* -import com.tangem.tangemtest.card_use_cases.domain.params_manager.modifiers.ParamsChangeConsequence -import com.tangem.tasks.TaskEvent - -/** -[REDACTED_AUTHOR] - * - * ParamsManager monitors parameter changes and runs the CardManager command - */ - -typealias ActionResponse = TaskEvent<*> -typealias AffectedList = List -typealias AffectedParamsCallback = (AffectedList) -> Unit -typealias ActionCallback = (ActionResponse, AffectedList) -> Unit - -class IncomingParameter(val tlvTag: TlvTag, var data: Any? = null) - -interface ParamsManager { - - fun parameterChanged(tag: TlvTag, value: Any?, callback: AffectedParamsCallback? = null) - fun getParams(): List - fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) - fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? - -} - -fun List.findParameter(tag: TlvTag): IncomingParameter? { - return firstOrNull { it.tlvTag == tag } -} - -abstract class BaseParamsManager(protected val action: CardAction) : ParamsManager { - - protected val paramsList: List by lazy { createParamsList() } - - abstract fun createParamsList(): List - - override fun parameterChanged(tag: TlvTag, value: Any?, callback: AffectedParamsCallback?) { - if (paramsList.isEmpty()) return - val foundParam = paramsList.findParameter(tag) ?: return - - foundParam.data = value - applyChangesByAffectedParams(foundParam, callback) - } - - override fun getParams(): MutableList = paramsList.toMutableList() - - override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? = null - - // Use it if current parameter needs to be affect any other parameters - protected open fun applyChangesByAffectedParams(param: IncomingParameter, callback: AffectedParamsCallback?) { - getChangeConsequence()?.affectChanges(param, paramsList)?.let { callback?.invoke(it) } - } - - protected open fun getChangeConsequence(): ParamsChangeConsequence? = null - - protected fun getAttrsForAction(cardManager: CardManager) - : AttrForAction = AttrForAction(cardManager, paramsList, getChangeConsequence()) -} - -class ScanParamsManager : BaseParamsManager(ScanAction()) { - override fun createParamsList(): List { - return listOf(IncomingParameter(TlvTag.CardId, null)) - } - - override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { - action.executeMainAction(getAttrsForAction(cardManager), callback) - } -} - -class SignParamsManager : BaseParamsManager(SignAction()) { - override fun createParamsList(): List { - return listOf( - IncomingParameter(TlvTag.CardId, null), - IncomingParameter(TlvTag.TransactionOutHash, "Data used for hashing") - ) - } - - override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { - action.executeMainAction(getAttrsForAction(cardManager), callback) - } - - override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? { - return action.getActionByTag(tag, getAttrsForAction(cardManager)) - } -} - -class PersonalizeParamsManager : BaseParamsManager(PersonalizeAction()) { - override fun createParamsList(): List { - return listOf() - } - - override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { - action.executeMainAction(getAttrsForAction(cardManager), callback) - } -} - -class DepersonalizeParamsManager : BaseParamsManager(DepesonalizeAction()) { - override fun createParamsList(): List { - return listOf(IncomingParameter(TlvTag.CardId, null)) - } - - override fun invokeMainAction(cardManager: CardManager, callback: ActionCallback) { - action.executeMainAction(getAttrsForAction(cardManager), callback) - } - - override fun getActionByTag(tag: TlvTag, cardManager: CardManager): ((ActionCallback) -> Unit)? { - return action.getActionByTag(tag, getAttrsForAction(cardManager)) - } -} \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/global_func.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/GlobalFunctions.kt similarity index 100% rename from tangem-demo/src/main/java/com/tangem/tangemtest/commons/global_func.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/commons/GlobalFunctions.kt diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/logs.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/Logger.kt similarity index 100% rename from tangem-demo/src/main/java/com/tangem/tangemtest/commons/logs.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/commons/Logger.kt diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/commons/navigation.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/commons/NavigationOp.kt similarity index 100% rename from tangem-demo/src/main/java/com/tangem/tangemtest/commons/navigation.kt rename to tangem-demo/src/main/java/com/tangem/tangemtest/commons/NavigationOp.kt diff --git a/tangem-demo/src/main/res/navigation/navigation.xml b/tangem-demo/src/main/res/navigation/navigation.xml index 3b89fe8844..34ebff7dc3 100644 --- a/tangem-demo/src/main/res/navigation/navigation.xml +++ b/tangem-demo/src/main/res/navigation/navigation.xml @@ -6,7 +6,7 @@ @@ -51,73 +51,73 @@