Updated on 2026-08-14
This commit is contained in:
parent
8b25bda266
commit
f161da5fbd
5 changed files with 15 additions and 11 deletions
|
|
@ -43,7 +43,7 @@ class BackupCardsWidget(
|
|||
createAnimator(BackupCardType.FIRST_BACKUP, createLeapfrogProperties(BackupCardType.FIRST_BACKUP)),
|
||||
createAnimator(BackupCardType.SECOND_BACKUP, createLeapfrogProperties(BackupCardType.SECOND_BACKUP))
|
||||
)
|
||||
leapfrogWidget.fold { animator.start() }
|
||||
leapfrogWidget.fold(animate) { animator.start() }
|
||||
}
|
||||
|
||||
fun toFan(animate: Boolean = true, onEnd: () -> Unit = {}) {
|
||||
|
|
@ -71,7 +71,7 @@ class BackupCardsWidget(
|
|||
)
|
||||
leapfrogWidget.fold {
|
||||
animator.doOnEnd {
|
||||
leapfrogWidget.initViews()
|
||||
// leapfrogWidget.initViews()
|
||||
leapfrogWidget.unfold()
|
||||
}
|
||||
animator.start()
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import com.squareup.picasso.Picasso
|
|||
import com.tangem.common.CardIdFormatter
|
||||
import com.tangem.common.core.CardIdDisplayFormat
|
||||
import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
|
||||
import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.PropertyCalculator
|
||||
import com.tangem.tap.common.extensions.hide
|
||||
import com.tangem.tap.common.extensions.show
|
||||
import com.tangem.tap.features.FragmentOnBackPressedHandler
|
||||
|
|
@ -50,10 +51,13 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
|
|||
|
||||
val typedValue = TypedValue()
|
||||
resources.getValue(R.dimen.device_scale_factor_for_twins_welcome, typedValue, true)
|
||||
val deviceScaleFactorForWelcomeState = typedValue.float
|
||||
val deviceScaleFactor = typedValue.float
|
||||
|
||||
val leapfrog = LeapfrogWidget(fl_cards_container)
|
||||
cardsWidget = BackupCardsWidget(leapfrog, deviceScaleFactorForWelcomeState) { 200f * deviceScaleFactorForWelcomeState }
|
||||
val leapfrogCalculator = PropertyCalculator(
|
||||
yTranslationFactor = 25f * deviceScaleFactor,
|
||||
)
|
||||
val leapfrog = LeapfrogWidget(fl_cards_container, leapfrogCalculator)
|
||||
cardsWidget = BackupCardsWidget(leapfrog, deviceScaleFactor) { 200f * deviceScaleFactor }
|
||||
startPostponedEnterTransition()
|
||||
|
||||
view_pager_backup_info.adapter = BackupInfoAdapter()
|
||||
|
|
@ -126,8 +130,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
|
|||
tv_header.setText(R.string.onboarding_create_wallet_header)
|
||||
tv_body.setText(R.string.onboarding_create_wallet_body)
|
||||
|
||||
cardsWidget.toFolded()
|
||||
startPostponedEnterTransition()
|
||||
cardsWidget.toFolded(false) { startPostponedEnterTransition() }
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -384,7 +387,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
|
|||
|
||||
val shopMenuShouldBeVisible =
|
||||
(backupStep == BackupStep.ScanOriginCard || backupStep == BackupStep.AddBackupCards) &&
|
||||
backupState.buyAdditionalCardsUrl != null
|
||||
backupState.buyAdditionalCardsUrl != null
|
||||
menu.getItem(0).isVisible = shopMenuShouldBeVisible
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,13 +140,14 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:textAlignment="center"
|
||||
android:textColor="#060606"
|
||||
android:textSize="24sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.504"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/guideline2"
|
||||
tools:text="Header" />
|
||||
tools:text="Добавлена одна резервная карта" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_body"
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@
|
|||
<dimen name="onboarding_card_margin_top">106dp</dimen>
|
||||
<dimen name="onboarding_square_background_height">230dp</dimen>
|
||||
<dimen name="onboarding_square_background_margin_top">67dp</dimen>
|
||||
<item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.6</item>
|
||||
<item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.56</item>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -61,6 +61,6 @@
|
|||
<dimen name="onboarding_card_margin_top">50dp</dimen>
|
||||
<dimen name="onboarding_square_background_height">180dp</dimen>
|
||||
<dimen name="onboarding_square_background_margin_top">37dp</dimen>
|
||||
<item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.5</item>>
|
||||
<item name="onboarding_wallet_top_guide_line_weight" type="dimen" format="float">0.48</item>>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue