diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupCardsWidget.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupCardsWidget.kt
index 1b4ecba2a7..07d27cf6ca 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupCardsWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupCardsWidget.kt
@@ -12,6 +12,7 @@ import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
class BackupCardsWidget(
val leapfrogWidget: LeapfrogWidget,
+ private val deviceScaleFactor: Float = 1f,
val getTopOfAnchorViewForActivateState: () -> Float,
) {
@@ -98,26 +99,26 @@ class BackupCardsWidget(
private fun createWelcomeProperties(cardType: BackupCardType): CardProperties {
return when (cardType) {
BackupCardType.ORIGIN -> CardProperties(
- xTranslation = 440f,
- yTranslation = 0f,
- rotation = 75f,
- elevation = 2f,
- scale = .9f,
- )
+ xTranslation = 440f * deviceScaleFactor,
+ yTranslation = 70f,
+ rotation = 75f,
+ elevation = 2f,
+ scale = .85f * deviceScaleFactor,
+ )
BackupCardType.FIRST_BACKUP -> CardProperties(
- xTranslation = 10f,
- yTranslation = -100f,
- rotation = 100f,
- elevation = 1f,
- scale = .9f,
-)
+ xTranslation = 10f * deviceScaleFactor,
+ yTranslation = -30f,
+ rotation = 100f,
+ elevation = 1f,
+ scale = .85f * deviceScaleFactor,
+ )
BackupCardType.SECOND_BACKUP -> CardProperties(
- xTranslation = -440f,
- yTranslation = -100f,
- rotation = 70f,
- elevation = 0f,
- scale = .9f,
- )
+ xTranslation = -440f * deviceScaleFactor,
+ yTranslation = -30f,
+ rotation = 70f,
+ elevation = 0f,
+ scale = .85f * deviceScaleFactor,
+ )
}
}
@@ -125,24 +126,24 @@ class BackupCardsWidget(
return when (cardType) {
BackupCardType.ORIGIN -> CardProperties(
xTranslation = 0f,
- yTranslation = 0f,
+ yTranslation = 30f,
rotation = 5f,
elevation = 2f,
- scale = 1f,
+ scale = 1f * deviceScaleFactor,
)
BackupCardType.FIRST_BACKUP -> CardProperties(
xTranslation = 0f,
- yTranslation = -80f,
+ yTranslation = -50f,
rotation = -5f,
elevation = 1f,
- scale = 0.9f,
+ scale = 0.9f * deviceScaleFactor,
)
BackupCardType.SECOND_BACKUP -> CardProperties(
xTranslation = 10f,
- yTranslation = -170f,
+ yTranslation = -120f,
rotation = -20f,
elevation = 0f,
- scale = 0.8f,
+ scale = 0.8f * deviceScaleFactor,
)
}
}
@@ -154,21 +155,21 @@ class BackupCardsWidget(
yTranslation = 0f,
rotation = 0f,
elevation = 2f,
- scale = 1f,
+ scale = 1f * deviceScaleFactor,
)
BackupCardType.FIRST_BACKUP -> CardProperties(
xTranslation = 0f,
yTranslation = 0f,
rotation = 0f,
elevation = 1f,
- scale = 0.9f,
+ scale = 0.9f * deviceScaleFactor,
)
BackupCardType.SECOND_BACKUP -> CardProperties(
xTranslation = 0f,
yTranslation = 0f,
rotation = 0f,
elevation = 0f,
- scale = 0.8f,
+ scale = 0.8f * deviceScaleFactor,
)
}
}
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 398ee44b55..0d1b1b0465 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -1,6 +1,7 @@
package com.tangem.tap.features.onboarding.products.wallet.ui
import android.os.Bundle
+import android.util.TypedValue
import android.view.*
import android.widget.ImageView
import androidx.appcompat.app.AppCompatActivity
@@ -47,8 +48,12 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ val typedValue = TypedValue()
+ resources.getValue(R.dimen.device_scale_factor_for_twins_welcome, typedValue, true)
+ val deviceScaleFactorForWelcomeState = typedValue.float
+
val leapfrog = LeapfrogWidget(fl_cards_container)
- cardsWidget = BackupCardsWidget(leapfrog) { 200f }
+ cardsWidget = BackupCardsWidget(leapfrog, deviceScaleFactorForWelcomeState) { 200f * deviceScaleFactorForWelcomeState }
startPostponedEnterTransition()
view_pager_backup_info.adapter = BackupInfoAdapter()
diff --git a/app/src/main/res/layout/fragment_onboarding_wallet.xml b/app/src/main/res/layout/fragment_onboarding_wallet.xml
index 5df3b30845..d6dcf19910 100644
--- a/app/src/main/res/layout/fragment_onboarding_wallet.xml
+++ b/app/src/main/res/layout/fragment_onboarding_wallet.xml
@@ -23,9 +23,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
+ app:menu="@menu/shop"
app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
- app:title="@string/onboarding_getting_started"
- app:menu="@menu/shop"/>
+ app:title="@string/onboarding_getting_started" />
@@ -33,6 +33,7 @@
android:id="@+id/onboarding_main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:clipChildren="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -51,28 +51,25 @@
android:id="@+id/imv_card_background"
android:layout_width="236dp"
android:layout_height="236dp"
- android:layout_gravity="center"
android:adjustViewBounds="true"
android:background="@drawable/shape_circle"
android:backgroundTint="@color/lightGray0"
android:elevation="0dp"
android:scaleType="fitCenter"
- app:layout_constraintStart_toStartOf="@id/fl_cards_container"
- app:layout_constraintEnd_toEndOf="@id/fl_cards_container"
- app:layout_constraintTop_toTopOf="@id/fl_cards_container"
app:layout_constraintBottom_toBottomOf="@id/fl_cards_container"
- android:layout_marginBottom="16dp"
- />
+ app:layout_constraintEnd_toEndOf="@id/fl_cards_container"
+ app:layout_constraintStart_toStartOf="@id/fl_cards_container"
+ app:layout_constraintTop_toTopOf="@id/fl_cards_container" />
@@ -81,36 +78,33 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:src="@drawable/card_placeholder_new"
- android:visibility="gone"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:scaleType="fitCenter"
-
- />
+ android:src="@drawable/card_placeholder_new"
+ android:visibility="gone" />
+ android:src="@drawable/card_placeholder_new"
+ android:visibility="gone" />
+ android:src="@drawable/card_placeholder_new"
+ android:transitionName="imv_front_card" />
@@ -119,12 +113,12 @@
android:layout_width="142dp"
android:layout_height="142dp"
android:src="@drawable/ic_activation_success"
+ android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/guideline2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.495"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/pb_state"
- android:visibility="gone"/>
+ app:layout_constraintTop_toBottomOf="@id/pb_state" />
+ app:layout_constraintTop_toTopOf="@+id/guideline2"
+ tools:text="Header" />
+ app:layout_constraintTop_toBottomOf="@+id/tv_header"
+ tools:text="Body" />
+ app:layout_constraintTop_toTopOf="@+id/guideline2" />
+ app:tabPaddingStart="8dp" />
+ app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/layout_onboarding_buttons_common.xml b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
index ff0472d121..e99f7dfe4a 100644
--- a/app/src/main/res/layout/layout_onboarding_buttons_common.xml
+++ b/app/src/main/res/layout/layout_onboarding_buttons_common.xml
@@ -1,33 +1,33 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ app:layout_constraintStart_toStartOf="parent"
+ tools:text="Main Action" />
+ app:layout_constraintStart_toStartOf="parent"
+ tools:text="Alternative action" />
\ No newline at end of file
diff --git a/app/src/main/res/values-h680dp/dimens.xml b/app/src/main/res/values-h680dp/dimens.xml
index 35206f9ed6..5b762af83e 100644
--- a/app/src/main/res/values-h680dp/dimens.xml
+++ b/app/src/main/res/values-h680dp/dimens.xml
@@ -26,4 +26,6 @@
106dp
230dp
67dp
+ - 0.6
+
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a4149bd548..39e1f215d0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -61,5 +61,6 @@
50dp
180dp
37dp
+ - 0.5
>