From 9660c8a96562f4b5328e18acd259dfd8ae3e8faf Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 29 Oct 2021 21:52:35 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../main/java/com/tangem/tap/features/home/HomeFragment.kt | 6 +++++- .../onboarding/products/twins/ui/TwinsCardsFragment.kt | 7 +++++++ app/src/main/res/layout/fragment_onboarding_main.xml | 1 + app/src/main/res/layout/view_bg_home.xml | 5 ++++- app/src/main/res/layout/view_bg_twins_welcome.xml | 3 +++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt index 0d337c6da9..f28523564f 100644 --- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt @@ -18,6 +18,7 @@ import com.tangem.wallet.R import kotlinx.android.synthetic.main.fragment_onboarding_main.* import kotlinx.android.synthetic.main.layout_onboarding_container_bottom.* import kotlinx.android.synthetic.main.layout_onboarding_home_top.* +import kotlinx.android.synthetic.main.view_bg_home.* class HomeFragment : BaseOnboardingFragment() { @@ -39,7 +40,10 @@ class HomeFragment : BaseOnboardingFragment() { val shareTransition = FragmentShareTransition( listOf( ShareElement(imv_front_card, ShareElement.imvFrontCard), - ShareElement(imv_back_card, ShareElement.imvBackCard) + ShareElement(imv_back_card, ShareElement.imvBackCard), + ShareElement(bg_circle_large), + ShareElement(bg_circle_medium), + ShareElement(bg_circle_min), ), FrontCardEnterTransition(), FrontCardExitTransition() diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt index 81e11f7e47..a634d311c0 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt @@ -102,6 +102,9 @@ class TwinsCardsFragment : BaseOnboardingFragment() { imv_twin_front_card.transitionName = ShareElement.imvFrontCard imv_twin_back_card.transitionName = ShareElement.imvBackCard + + // if don't this, the bg_circle_... is overflow the app_bar + app_bar.bringToFront() } override fun subscribeToStore() { @@ -158,6 +161,7 @@ class TwinsCardsFragment : BaseOnboardingFragment() { private fun setupWelcomeState(state: TwinCardsState, mainAction: Action) { twinsWidget.toWelcome(false) { startPostponedEnterTransition() } + onboarding_twins_welcome_bg.show() pb_state.hide() tv_header.setText(R.string.twins_onboarding_subtitle) @@ -169,6 +173,8 @@ class TwinsCardsFragment : BaseOnboardingFragment() { private fun setupWarningState(state: TwinCardsState) { twinsWidget.toWelcome(false) { startPostponedEnterTransition() } + + onboarding_twins_welcome_bg.hide() pb_state.hide() chb_understand.show() @@ -186,6 +192,7 @@ class TwinsCardsFragment : BaseOnboardingFragment() { } private fun setupCreateFirstWalletState(state: TwinCardsState) { + onboarding_twins_welcome_bg.hide() bg_circle_large.hide() bg_circle_medium.hide() bg_circle_min.hide() diff --git a/app/src/main/res/layout/fragment_onboarding_main.xml b/app/src/main/res/layout/fragment_onboarding_main.xml index 40df33aeb5..6d567ce91b 100644 --- a/app/src/main/res/layout/fragment_onboarding_main.xml +++ b/app/src/main/res/layout/fragment_onboarding_main.xml @@ -14,6 +14,7 @@ style="@style/Widget.MaterialComponents.Toolbar.Surface" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@android:color/transparent" android:fitsSystemWindows="false" app:liftOnScroll="true"> diff --git a/app/src/main/res/layout/view_bg_home.xml b/app/src/main/res/layout/view_bg_home.xml index bff701e6c4..4cba83727d 100644 --- a/app/src/main/res/layout/view_bg_home.xml +++ b/app/src/main/res/layout/view_bg_home.xml @@ -9,6 +9,7 @@ android:layout_width="670dp" android:layout_height="670dp" android:src="@drawable/shape_circle_home_screen" + android:transitionName="bg_circle_large" android:translationX="160dp" android:translationY="-175dp" /> @@ -18,14 +19,16 @@ android:layout_height="650dp" android:src="@drawable/shape_circle" android:tint="@color/backgroundWhite" + android:transitionName="bg_circle_medium" android:translationX="170dp" android:translationY="-165dp" /> diff --git a/app/src/main/res/layout/view_bg_twins_welcome.xml b/app/src/main/res/layout/view_bg_twins_welcome.xml index 5202b1851b..acfee09420 100644 --- a/app/src/main/res/layout/view_bg_twins_welcome.xml +++ b/app/src/main/res/layout/view_bg_twins_welcome.xml @@ -12,6 +12,7 @@ android:scaleType="fitXY" android:src="@drawable/shape_circle" android:tint="#DEDEE0" + android:transitionName="bg_circle_large" android:translationX="-272dp" android:translationY="-200dp" app:layout_constraintStart_toStartOf="parent" @@ -25,6 +26,7 @@ android:scaleType="fitXY" android:src="@drawable/shape_circle" android:tint="#DCDCDC" + android:transitionName="bg_circle_medium" android:translationX="-254dp" android:translationY="-269dp" app:layout_constraintStart_toStartOf="parent" @@ -38,6 +40,7 @@ android:scaleType="fitXY" android:src="@drawable/shape_circle" android:tint="#D9D9D9" + android:transitionName="bg_circle_min" android:translationX="-394dp" android:translationY="-411dp" app:layout_constraintStart_toStartOf="parent"