From 83f376b1398122d4dfc06f0bcb5a844a6c5077ec Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 26 Mar 2020 23:31:07 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangemtest/ucase/ui/widgets/ParameterWidget.kt | 5 +++-- .../src/main/res/layout/w_card_incoming_param.xml | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt index 28a70434ed..2147654525 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/ui/widgets/ParameterWidget.kt @@ -14,6 +14,7 @@ import com.tangem.tangemtest.R import com.tangem.tangemtest._arch.structure.Id import com.tangem.tangemtest._arch.structure.abstraction.BaseItem import com.tangem.tangemtest._arch.structure.abstraction.Item +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 @@ -53,7 +54,7 @@ class ParameterWidget( etValue.setText(stringOf(dataItem.viewModel.data)) etValue.addTextChangedListener(valueWatcher) btnAction.setOnClickListener { onActionBtnClickListener?.invoke() } - btnAction.setText(getResNameId()) + btnAction.setText(getResNameId(ActionType.Scan)) toggleActionBtnVisibility() initDescriptionWidget() } @@ -112,6 +113,6 @@ class ParameterWidget( } } -fun ParameterWidget.getResNameId(): Int = MainResourceHolder.safeGet(id).resName +fun ParameterWidget.getResNameId(id: Id? = null): Int = MainResourceHolder.safeGet(id?: this.id).resName fun ParameterWidget.getResDescription(): Int? = MainResourceHolder.safeGet(id).resDescription \ No newline at end of file diff --git a/tangem-demo/src/main/res/layout/w_card_incoming_param.xml b/tangem-demo/src/main/res/layout/w_card_incoming_param.xml index edc43e19d6..c2dc9aca40 100644 --- a/tangem-demo/src/main/res/layout/w_card_incoming_param.xml +++ b/tangem-demo/src/main/res/layout/w_card_incoming_param.xml @@ -9,16 +9,16 @@ + android:orientation="horizontal" + android:paddingStart="@dimen/def_indent" + android:paddingEnd="@dimen/def_indent"> @@ -28,7 +28,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="start|bottom" - android:paddingBottom="4dp" /> + android:paddingStart="0dp" + android:paddingEnd="@dimen/def_double_indent" + android:paddingBottom="4dp" + android:textSize="@dimen/unit_widget_text_size" /> @@ -37,7 +40,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="@dimen/def_indent" android:visibility="gone" tools:text="Action" tools:visibility="visible" />