diff --git a/app/src/main/res/drawable/bg_half_transparent_overlay.xml b/app/src/main/res/drawable/bg_half_transparent_overlay.xml deleted file mode 100644 index 1e819d64aa..0000000000 --- a/app/src/main/res/drawable/bg_half_transparent_overlay.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_collapsed.xml b/app/src/main/res/drawable/ic_arrow_collapsed.xml deleted file mode 100644 index 1413304110..0000000000 --- a/app/src/main/res/drawable/ic_arrow_collapsed.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_arrow_extended.xml b/app/src/main/res/drawable/ic_arrow_extended.xml deleted file mode 100644 index 2fb4af04cd..0000000000 --- a/app/src/main/res/drawable/ic_arrow_extended.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml deleted file mode 100644 index ef1cbb3777..0000000000 --- a/app/src/main/res/drawable/ic_arrow_right.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml deleted file mode 100644 index 96faa98e71..0000000000 --- a/app/src/main/res/drawable/ic_arrows_up_down.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml deleted file mode 100644 index 4291149aff..0000000000 --- a/app/src/main/res/drawable/ic_check_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_clear_24.xml b/app/src/main/res/drawable/ic_clear_24.xml deleted file mode 100644 index cd2a842a1f..0000000000 --- a/app/src/main/res/drawable/ic_clear_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_hide_password.xml b/app/src/main/res/drawable/ic_hide_password.xml deleted file mode 100644 index e0ace3f008..0000000000 --- a/app/src/main/res/drawable/ic_hide_password.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml deleted file mode 100644 index bb3455d671..0000000000 --- a/app/src/main/res/drawable/ic_link.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_locked_24.xml b/app/src/main/res/drawable/ic_locked_24.xml deleted file mode 100644 index 2afb4d8a14..0000000000 --- a/app/src/main/res/drawable/ic_locked_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_paste.xml b/app/src/main/res/drawable/ic_paste.xml deleted file mode 100644 index b971249451..0000000000 --- a/app/src/main/res/drawable/ic_paste.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_paste_disabled.xml b/app/src/main/res/drawable/ic_paste_disabled.xml deleted file mode 100644 index 156ddafc4b..0000000000 --- a/app/src/main/res/drawable/ic_paste_disabled.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_qr_code_scan.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml deleted file mode 100644 index 5ec455e546..0000000000 --- a/app/src/main/res/drawable/ic_qr_code_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml deleted file mode 100644 index 46fe7fa730..0000000000 --- a/app/src/main/res/drawable/ic_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_show_password.xml b/app/src/main/res/drawable/ic_show_password.xml deleted file mode 100644 index 4bbf87adb5..0000000000 --- a/app/src/main/res/drawable/ic_show_password.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/img_flag_ru_24.xml b/app/src/main/res/drawable/img_flag_ru_24.xml deleted file mode 100644 index deff0dc4bb..0000000000 --- a/app/src/main/res/drawable/img_flag_ru_24.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/img_ring_placeholder.png b/app/src/main/res/drawable/img_ring_placeholder.png deleted file mode 100644 index b39d9f9f76..0000000000 Binary files a/app/src/main/res/drawable/img_ring_placeholder.png and /dev/null differ diff --git a/app/src/main/res/drawable/paste_selector.xml b/app/src/main/res/drawable/paste_selector.xml deleted file mode 100644 index 7d83495828..0000000000 --- a/app/src/main/res/drawable/paste_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_password_toggle.xml b/app/src/main/res/drawable/selector_password_toggle.xml deleted file mode 100644 index bdff307019..0000000000 --- a/app/src/main/res/drawable/selector_password_toggle.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_line.xml b/app/src/main/res/drawable/shape_line.xml deleted file mode 100644 index cf7b6cfb0f..0000000000 --- a/app/src/main/res/drawable/shape_line.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rectangle_rounded_4.xml b/app/src/main/res/drawable/shape_rectangle_rounded_4.xml deleted file mode 100644 index b7d03c2907..0000000000 --- a/app/src/main/res/drawable/shape_rectangle_rounded_4.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_backup_access_code_submit.xml b/app/src/main/res/layout/layout_backup_access_code_submit.xml index fdf4387f56..58b97cc2a6 100644 --- a/app/src/main/res/layout/layout_backup_access_code_submit.xml +++ b/app/src/main/res/layout/layout_backup_access_code_submit.xml @@ -14,9 +14,9 @@ android:layout_marginTop="14dp" android:paddingStart="32dp" android:paddingEnd="32dp" - android:textColor="@color/text_secondary" android:text="@string/onboarding_access_code_hint" android:textAlignment="center" + android:textColor="@color/text_secondary" app:layout_constraintTop_toTopOf="parent" /> @@ -56,9 +55,9 @@ android:id="@+id/btn_access_code_submit" style="@style/TapPrimaryButton" android:layout_width="match_parent" + android:layout_height="wrap_content" android:layout_marginStart="@dimen/dimen16" android:layout_marginEnd="@dimen/dimen16" - android:layout_height="wrap_content" android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom" android:text="@string/common_create" android:textSize="16sp" diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/model/MultiWalletAccessCodeModel.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/model/MultiWalletAccessCodeModel.kt index e4b8f341f3..a2f3f24de7 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/model/MultiWalletAccessCodeModel.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/model/MultiWalletAccessCodeModel.kt @@ -73,15 +73,8 @@ internal class MultiWalletAccessCodeModel @Inject constructor( onAccessCodeFirstChange = ::onAccessCodeFirstChange, onAccessCodeSecondChange = ::onAccessCodeSecondChange, onContinue = ::onContinue, - onAccessCodeHideClick = ::onAccessCodeHideClick, ) - private fun onAccessCodeHideClick() { - _uiState.update { - it.copy(accessCodeHidden = !it.accessCodeHidden) - } - } - private fun onAccessCodeFirstChange(textFieldValue: TextFieldValue) { _uiState.update { it.copy( diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeBS.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeBS.kt index 0eee40db84..8ac18706c6 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeBS.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeBS.kt @@ -21,10 +21,7 @@ internal fun MultiWalletAccessCodeBS( state: MultiWalletAccessCodeUM, onBack: () -> Unit, ) { - TangemBottomSheet( - config = config, - onBack = onBack, - ) { _ -> + TangemBottomSheet(config = config, onBack = onBack) { _ -> Content(state) } } diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt index 2e91718db8..bc0d8551bd 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/MultiWalletAccessCodeEnter.kt @@ -13,10 +13,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.text.input.PasswordVisualTransformation -import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.tangem.core.ui.components.OutlineTextFieldWithIcon +import com.tangem.core.ui.components.OutlineTextField import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview @@ -57,17 +56,10 @@ internal fun MultiWalletAccessCodeEnter( val focusRequester = remember { FocusRequester() } - OutlineTextFieldWithIcon( + OutlineTextField( modifier = modifier .focusRequester(focusRequester) .fillMaxWidth(), - iconResId = if (state.accessCodeHidden) { - R.drawable.ic_eye_outline_24 - } else { - R.drawable.ic_eye_off_outline_24 - }, - iconColor = TangemTheme.colors.icon.primary1, - onIconClick = state.onAccessCodeHideClick, value = if (reEnterAccessCodeState) { state.accessCodeSecond } else { @@ -80,11 +72,7 @@ internal fun MultiWalletAccessCodeEnter( }, label = stringResourceSafe(id = R.string.onboarding_wallet_info_title_third), isError = state.codesNotMatchError || state.atLeast4CharError, - visualTransformation = if (state.accessCodeHidden) { - PasswordVisualTransformation() - } else { - VisualTransformation.None - }, + visualTransformation = PasswordVisualTransformation(), caption = when { state.codesNotMatchError && reEnterAccessCodeState -> stringResourceSafe(R.string.onboarding_access_codes_doesnt_match) diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/state/MultiWalletAccessCodeUM.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/state/MultiWalletAccessCodeUM.kt index 33d4b95d3a..3352a88dbf 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/state/MultiWalletAccessCodeUM.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/ui/state/MultiWalletAccessCodeUM.kt @@ -8,11 +8,9 @@ internal data class MultiWalletAccessCodeUM( val accessCodeSecond: TextFieldValue = TextFieldValue(""), val codesNotMatchError: Boolean = false, val atLeast4CharError: Boolean = false, - val accessCodeHidden: Boolean = true, val onAccessCodeFirstChange: (TextFieldValue) -> Unit = {}, val onAccessCodeSecondChange: (TextFieldValue) -> Unit = {}, val onContinue: () -> Unit = {}, - val onAccessCodeHideClick: () -> Unit = {}, ) { enum class Step { Intro,