GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2023-09-11 16:47:41 +04:00
commit 693c64c2ee
35 changed files with 371 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
View file

@ -375,6 +375,9 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
)
mainBinding.onboardingTopContainer.imvCardBackground.backgroundTintList =
requireContext().resources.getColorStateList(R.color.onboarding_card_background, null)
updateConstraints(state.currentStep, R.layout.lp_onboarding_topup_wallet_twins)
}

2
app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
View file

@ -22,6 +22,7 @@ import com.tangem.common.CardIdFormatter
import com.tangem.common.CompletionResult
import com.tangem.common.core.CardIdDisplayFormat
import com.tangem.core.analytics.Analytics
import com.tangem.core.ui.extensions.setStatusBarColor
import com.tangem.domain.common.util.cardTypesResolver
import com.tangem.feature.onboarding.data.model.CreateWalletResponse
import com.tangem.feature.onboarding.presentation.wallet2.analytics.SeedPhraseSource
@ -158,6 +159,7 @@ class OnboardingWalletFragment :
oldState.onboardingWalletState == newState.onboardingWalletState
}.select { it.onboardingWalletState }
}
setStatusBarColor(R.color.background_primary)
}
override fun onStop() {

8
app/src/main/res/color/selector_edit_text.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#1ACE80" android:state_focused="true"/>
<item android:color="#1ACE80" android:state_hovered="true"/>
<item android:color="#E0E0E0" android:state_enabled="false"/>
<item android:color="#E0E0E0"/> <!-- unfocused -->
<item android:color="@color/accent" android:state_focused="true" />
<item android:color="@color/accent" android:state_hovered="true" />
<item android:color="@color/icon_primary_1" android:state_enabled="false" />
<item android:color="@color/icon_primary_1" /> <!-- unfocused -->
</selector>

24
app/src/main/res/drawable/ic_activation_success.xml
View file

@ -1,24 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path
android:strokeWidth="1"
android:pathData="M30,0.5L30,0.5A29.5,29.5 0,0 1,59.5 30L59.5,30A29.5,29.5 0,0 1,30 59.5L30,59.5A29.5,29.5 0,0 1,0.5 30L0.5,30A29.5,29.5 0,0 1,30 0.5z"
android:fillColor="#ffffff"
android:strokeColor="#1ACE80"/>
<path
android:pathData="M30,60C46.5685,60 60,46.5685 60,30C60,13.4315 46.5685,0 30,0C13.4315,0 0,13.4315 0,30C0,46.5685 13.4315,60 30,60Z"
android:strokeAlpha="0.2"
android:fillColor="#1ACE80"
android:fillType="evenOdd"
android:fillAlpha="0.2"/>
<path
android:pathData="M30,50C41.0457,50 50,41.0457 50,30C50,18.9543 41.0457,10 30,10C18.9543,10 10,18.9543 10,30C10,41.0457 18.9543,50 30,50Z"
android:fillColor="#1ACE80"
android:fillType="evenOdd"/>
<path
android:pathData="M35.3137,24.3607L28.0752,32.731L24.7481,29.5455C24.616,29.4145 24.4579,29.31 24.2832,29.2382C24.1084,29.1663 23.9205,29.1285 23.7303,29.1269C23.5402,29.1253 23.3516,29.16 23.1755,29.229C22.9995,29.2979 22.8396,29.3997 22.7051,29.5285C22.5707,29.6572 22.4643,29.8103 22.3923,29.9789C22.3203,30.1474 22.284,30.328 22.2857,30.51C22.2874,30.6921 22.3269,30.8721 22.4019,31.0394C22.477,31.2067 22.5861,31.358 22.7229,31.4845L27.0196,35.5983C27.2806,35.8482 27.6323,35.992 28.0014,35.9997C28.3704,36.0074 28.7283,35.8783 29.0004,35.6394L37.2501,26.382C37.53,26.1362 37.6965,25.7939 37.7129,25.4305C37.7293,25.0672 37.5942,24.7124 37.3374,24.4444C37.0806,24.1764 36.7232,24.017 36.3436,24.0013C35.9641,23.9856 35.5936,24.1149 35.3137,24.3607Z"
android:fillColor="#ffffff"/>
</vector>

2
app/src/main/res/drawable/ic_dot.xml
View file

@ -7,7 +7,7 @@
android:thickness="4.5dp"
android:useLevel="false">
<solid
android:color="#80686868"
android:color="@color/icon_informative"
android:fillAlpha="0.5"
/>
</shape>

2
app/src/main/res/drawable/ic_selected_dot.xml
View file

@ -6,7 +6,7 @@
android:shape="ring"
android:thickness="4.5dp"
android:useLevel="false">
<solid android:color="#060606"/>
<solid android:color="@color/icon_primary_1" />
</shape>
</item>
</layer-list>

14
app/src/main/res/drawable/img_onboarding_success.xml Normal file
View file

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="142dp"
android:height="142dp"
android:autoMirrored="true"
android:viewportWidth="142"
android:viewportHeight="142">
<path
android:fillColor="#0099FF"
android:fillType="evenOdd"
android:pathData="M71,117.66C96.77,117.66 117.66,96.77 117.66,71C117.66,45.23 96.77,24.34 71,24.34C45.23,24.34 24.34,45.23 24.34,71C24.34,96.77 45.23,117.66 71,117.66Z" />
<path
android:fillColor="#ffffff"
android:pathData="M83.58,57.65L66.44,77.46L58.57,69.92C58.26,69.61 57.88,69.37 57.47,69.2C57.06,69.03 56.61,68.94 56.16,68.93C55.71,68.93 55.27,69.01 54.85,69.18C54.43,69.34 54.05,69.58 53.74,69.88C53.42,70.19 53.17,70.55 53,70.95C52.82,71.35 52.74,71.78 52.74,72.21C52.75,72.64 52.84,73.06 53.02,73.46C53.2,73.86 53.45,74.21 53.78,74.51L63.95,84.25C64.56,84.84 65.4,85.18 66.27,85.2C67.14,85.22 67.99,84.91 68.63,84.35L88.16,62.44C88.82,61.86 89.22,61.05 89.25,60.19C89.29,59.33 88.97,58.49 88.37,57.85C87.76,57.22 86.91,56.84 86.01,56.8C85.12,56.77 84.24,57.07 83.58,57.65Z" />
</vector>

4
app/src/main/res/drawable/shape_refresh_button.xml
View file

@ -2,11 +2,11 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/white" />
<solid android:color="@color/icon_primary_2" />
<stroke
android:width="1dp"
android:color="#E2E2E2" />
android:color="@color/button_secondary" />
<size
android:width="40dp"

8
app/src/main/res/drawable/shape_success_circle.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/accent" />
<size
android:width="142dp"
android:height="142dp" />
</shape>

3
app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
View file

@ -93,6 +93,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_alternative_action"
style="@style/TapTextButton"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
android:layout_marginBottom="26dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

25
app/src/main/res/layout/dialog_onboarding_address_info.xml
View file

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="502dp">
android:layout_height="wrap_content"
android:background="@color/background_primary">
<include
android:id="@+id/pseudo_toolbar"
@ -32,9 +33,10 @@
android:layout_marginEnd="40dp"
android:textAlignment="center"
android:textAllCaps="false"
app:layout_constraintBottom_toTopOf="@+id/guideline3"
android:layout_marginTop="30dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:textColor="@color/text_secondary"
app:layout_constraintTop_toBottomOf="@+id/imv_qr_code"
tools:text="Send only Ethereum (ETH) from Ethereum network to this address. Using other tokens and networks may result in loss of funds." />
@ -52,13 +54,14 @@
android:layout_marginStart="32dp"
android:layout_marginEnd="8dp"
android:background="@drawable/shape_rectangle_rounded_100"
android:backgroundTint="@color/lightGray0"
android:layout_marginTop="30dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:layout_constraintEnd_toStartOf="@+id/btn_fl_share"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline3">
android:backgroundTint="@color/button_secondary"
app:layout_constraintTop_toBottomOf="@id/tv_receive_message">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@ -76,6 +79,7 @@
android:minWidth="120dp"
android:singleLine="true"
android:textSize="15sp"
android:textColor="@color/text_primary_1"
tools:text="addlkasLNXDLKNnkjkjhnjkjnljnnlsenn" />
<View
@ -85,6 +89,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/accent"
android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_copy_green" />
@ -98,13 +103,14 @@
android:layout_height="40dp"
android:layout_marginEnd="32dp"
android:background="@drawable/shape_rectangle_rounded_100"
android:backgroundTint="@color/lightGray0"
android:layout_marginTop="30dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:backgroundTint="@color/background_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/btn_fl_copy_address"
app:layout_constraintTop_toTopOf="@+id/guideline3">
app:layout_constraintTop_toBottomOf="@+id/tv_receive_message">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="22dp"
@ -116,4 +122,11 @@
</FrameLayout>
<View
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="30dp"
app:layout_constraintBaseline_toBaselineOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_fl_copy_address" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_onboarding_main.xml
View file

@ -22,6 +22,8 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
app:navigationIconTint="@color/icon_primary_1"
app:titleTextColor="@color/text_primary_1"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/ic_baseline_arrow_back_24" />

50
app/src/main/res/layout/fragment_onboarding_wallet.xml
View file

@ -5,7 +5,7 @@
android:id="@+id/coordinator_details_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_secondary"
android:background="@color/background_primary"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
@ -21,8 +21,10 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
app:navigationIconTint="@color/icon_primary_1"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@color/text_primary_1"
app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
app:title="@string/onboarding_getting_started" />
@ -59,7 +61,7 @@
android:layout_height="236dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_circle"
android:backgroundTint="@color/lightGray0"
android:backgroundTint="@color/background_primary"
android:elevation="0dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@id/fl_cards_container"
@ -113,17 +115,35 @@
</FrameLayout>
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_success"
android:layout_width="142dp"
android:layout_height="142dp"
android:src="@drawable/ic_activation_success"
android:visibility="gone"
android:background="@android:color/transparent"
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_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="142dp"
android:layout_height="142dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_header_body_container"
@ -146,7 +166,7 @@
android:layout_marginTop="12dp"
android:fontFamily="sans-serif-medium"
android:textAlignment="center"
android:textColor="#060606"
android:textColor="@color/text_primary_1"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.504"
@ -162,7 +182,7 @@
android:layout_marginTop="@dimen/home_bottom_tv_body_margin_top"
android:layout_marginEnd="@dimen/home_bottom_tv_body_margin_end"
android:textAlignment="center"
android:textColor="#686868"
android:textColor="@color/text_secondary"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -183,7 +203,7 @@
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginBottom="16dp"
android:background="@color/background_secondary"
android:background="@color/background_primary"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/layout_buttons_common"
app:layout_constraintEnd_toEndOf="parent"
@ -200,7 +220,11 @@
layout="@layout/layout_onboarding_buttons_common"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" />
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<include
android:id="@+id/layout_buttons_add_cards"
@ -208,7 +232,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" />
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
@ -216,6 +244,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
app:layout_constraintGuide_percent="@dimen/onboarding_wallet_top_guide_line_weight"
app:layout_constraintTop_toTopOf="parent" />

11
app/src/main/res/layout/item_backup_info_adapter.xml
View file

@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:id="@+id/tv_header"
@ -10,8 +11,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:fontFamily="sans-serif-medium"
android:text="Header"
android:textColor="#060606"
android:textColor="@color/text_primary_1"
tools:text="Header"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.504"
@ -25,9 +26,9 @@
android:layout_marginStart="64dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="64dp"
android:text="Body"
android:textColor="@color/text_secondary"
android:textAlignment="center"
android:textColor="#686868"
tools:text="Body"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

3
app/src/main/res/layout/layout_backup_access_code.xml
View file

@ -2,7 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/background_primary">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

12
app/src/main/res/layout/layout_backup_access_code_info.xml
View file

@ -12,7 +12,8 @@
android:src="@drawable/ic_access_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/icon_informative" />
<TextView
android:id="@+id/tv_feature_1_title"
@ -32,6 +33,7 @@
android:layout_marginStart="46dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_feature_1"
app:tint="@color/icon_primary_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_feature_1_title" />
@ -65,6 +67,7 @@
android:layout_marginStart="46dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_feature_2"
app:tint="@color/icon_primary_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_feature_2_title" />
@ -98,6 +101,7 @@
android:layout_marginStart="46dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_feature_3"
app:tint="@color/icon_primary_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_feature_3_title" />
@ -117,10 +121,10 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_access_code_create"
style="@style/TapPrimaryButton"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
android:layout_marginEnd="@dimen/access_code_btn_continue_margin_start"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
android:text="@string/common_continue"
android:textSize="16sp"

13
app/src/main/res/layout/layout_backup_access_code_submit.xml
View file

@ -14,6 +14,7 @@
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"
app:layout_constraintTop_toTopOf="parent" />
@ -28,12 +29,17 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="40dp"
android:hint="@string/onboarding_wallet_info_title_third"
android:textColorHint="@color/text_primary_1"
android:theme="@style/EditTextThemeOverlay"
app:boxStrokeColor="@color/selector_edit_text"
app:boxStrokeWidth="1dp"
app:endIconDrawable="@drawable/selector_password_toggle"
app:boxStrokeErrorColor="@color/icon_warning"
app:endIconMode="password_toggle"
app:hintTextColor="@color/accent"
app:endIconTint="@color/icon_primary_1"
app:errorIconTint="@color/icon_warning"
app:errorTextColor="@color/icon_warning"
app:layout_constraintTop_toBottomOf="@id/tv_access_code_enter_description">
<com.google.android.material.textfield.TextInputEditText
@ -41,6 +47,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textVisiblePassword"
android:textColor="@color/text_primary_1"
android:textSize="16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -48,10 +55,10 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_access_code_submit"
style="@style/TapPrimaryButton"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/access_code_btn_continue_margin_start"
android:layout_marginEnd="@dimen/access_code_btn_continue_margin_end"
android:layout_marginBottom="@dimen/access_code_btn_continue_margin_bottom"
android:text="@string/common_create"
android:textSize="16sp"

3
app/src/main/res/layout/layout_onboarding_buttons_add_cards.xml
View file

@ -8,7 +8,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_add_card"
style="@style/TapSecondaryIconButton"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="92dp"
app:layout_constraintBottom_toBottomOf="parent"
@ -19,6 +19,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_continue"
android:layout_width="match_parent"
style="@style/TapPrimaryButton"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"

3
app/src/main/res/layout/layout_onboarding_buttons_common.xml
View file

@ -8,17 +8,20 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_wallet_main_action"
style="@style/TapPrimaryIconButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:icon="@drawable/ic_tangem_24"
app:iconSize="20dp"
tools:text="Main Action" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_wallet_alternative_action"
style="@style/TapTextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
app:layout_constraintBottom_toBottomOf="parent"

10
app/src/main/res/layout/layout_onboarding_container_bottom.xml
View file

@ -55,6 +55,7 @@
android:textStyle="bold"
android:visibility="gone"
app:buttonTint="@color/accent"
android:textColor="@color/text_secondary"
app:layout_constraintBottom_toTopOf="@+id/btn_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -63,11 +64,13 @@
<FrameLayout
android:id="@+id/btn_container"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/home_bottom_fl_scan_card_container_margin_bottom"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@ -75,7 +78,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_main_action"
style="@style/TapPrimaryIconButton"
android:layout_width="match_parent"
tools:icon="@drawable/ic_tangem_24"
app:iconSize="20dp"
tools:text="@string/welcome_unlock_card" />
<ProgressBar
@ -93,6 +98,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_alternative_action"
style="@style/TapTextButton"
android:layout_width="match_parent"
android:layout_marginStart="@dimen/dimen16"
android:layout_marginEnd="@dimen/dimen16"
android:layout_marginBottom="@dimen/home_bottom_btn_alternative_action_margin_bottom"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

37
app/src/main/res/layout/layout_onboarding_container_top.xml
View file

@ -31,7 +31,7 @@
android:layout_height="236dp"
android:adjustViewBounds="true"
android:background="@drawable/shape_circle"
android:backgroundTint="@color/lightGray0"
android:backgroundTint="@color/onboarding_card_background"
android:elevation="0dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/imv_front_card"
@ -109,15 +109,40 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@android:color/transparent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/layout_pseudo_toolbar.xml
View file

@ -4,7 +4,7 @@
android:id="@+id/pseudo_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/background_secondary"
android:background="@color/background_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -18,6 +18,7 @@
android:clickable="true"
android:focusable="true"
android:padding="16dp"
android:tint="@color/icon_primary_1"
android:src="@drawable/ic_close_24" />
</FrameLayout>

34
app/src/main/res/layout/lp_onboarding_create_wallet.xml
View file

@ -104,15 +104,39 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@android:color/transparent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

25
app/src/main/res/layout/lp_onboarding_done.xml
View file

@ -105,14 +105,33 @@
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="142dp"
android:layout_height="142dp"
android:background="@android:color/transparent"
android:layout_marginTop="@dimen/onboarding_card_margin_top"
android:src="@drawable/ic_activation_success"
android:src="@drawable/img_onboarding_success"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pb_state" />
app:layout_constraintTop_toBottomOf="@+id/pb_state">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="142dp"
android:layout_height="142dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

35
app/src/main/res/layout/lp_onboarding_done_activation.xml
View file

@ -104,14 +104,39 @@
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

35
app/src/main/res/layout/lp_onboarding_done_activation_twins.xml
View file

@ -103,14 +103,39 @@
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

37
app/src/main/res/layout/lp_onboarding_topup_wallet.xml
View file

@ -30,7 +30,7 @@
android:layout_marginTop="@dimen/onboarding_square_background_margin_top"
android:layout_marginEnd="32dp"
android:background="@drawable/shape_rectangle_rounded_8"
android:backgroundTint="@color/lightGray0"
android:backgroundTint="@color/onboarding_card_background"
android:elevation="0dp"
android:scaleType="fitCenter"
app:layout_constraintEnd_toEndOf="parent"
@ -102,15 +102,40 @@
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@android:color/transparent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

37
app/src/main/res/layout/lp_onboarding_topup_wallet_twins.xml
View file

@ -30,7 +30,7 @@
android:layout_marginTop="@dimen/onboarding_square_background_margin_top"
android:layout_marginEnd="32dp"
android:background="@drawable/shape_rectangle_rounded_8"
android:backgroundTint="@color/lightGray0"
android:backgroundTint="@color/onboarding_card_background"
android:elevation="0dp"
android:scaleType="fitCenter"
app:layout_constraintEnd_toEndOf="parent"
@ -102,15 +102,40 @@
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
android:id="@+id/imv_activation_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_activation_success"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@android:color/transparent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/imv_card_background"
app:layout_constraintEnd_toEndOf="@+id/imv_card_background"
app:layout_constraintStart_toStartOf="@+id/imv_card_background"
app:layout_constraintTop_toBottomOf="@+id/imv_card_background" />
app:layout_constraintTop_toBottomOf="@+id/imv_card_background">
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/background_primary" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imv_success_middle"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/img_onboarding_success" />
<View
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0.2"
android:background="@drawable/shape_success_circle"
android:backgroundTint="@color/accent" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/view_bg_twins_welcome.xml
View file

@ -11,7 +11,7 @@
android:alpha="0.4"
android:scaleType="fitXY"
android:src="@drawable/shape_circle"
android:tint="#DEDEE0"
android:tint="@color/onboarding_twin_wave_1"
android:transitionName="bg_circle_large"
android:translationX="-272dp"
android:translationY="-200dp"
@ -25,7 +25,7 @@
android:alpha="0.4"
android:scaleType="fitXY"
android:src="@drawable/shape_circle"
android:tint="#DCDCDC"
android:tint="@color/onboarding_twin_wave_2"
android:transitionName="bg_circle_medium"
android:translationX="-254dp"
android:translationY="-269dp"
@ -39,7 +39,7 @@
android:alpha="0.4"
android:scaleType="fitXY"
android:src="@drawable/shape_circle"
android:tint="#D9D9D9"
android:tint="@color/onboarding_twin_wave_3"
android:transitionName="bg_circle_min"
android:translationX="-394dp"
android:translationY="-411dp"

4
app/src/main/res/layout/view_onboarding_progress.xml
View file

@ -7,6 +7,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:progressBackgroundTint="#32000000"
android:progressTint="@color/background_action" />
android:progressBackgroundTint="@color/icon_informative"
android:progressTint="@color/icon_primary_1" />
</merge>

18
app/src/main/res/layout/view_onboarding_refresh_balance.xml
View file

@ -11,6 +11,7 @@
android:id="@+id/imv_bg_circle"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:src="@drawable/shape_refresh_button" />
<ViewSwitcher
@ -30,6 +31,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:tint="@color/icon_primary_1"
android:src="@drawable/ic_arrow_refresh" />
</FrameLayout>
@ -39,23 +41,9 @@
android:layout_height="24dp"
android:layout_gravity="center"
android:indeterminate="true"
app:indicatorColor="@android:color/black"
app:indicatorColor="@color/icon_primary_1"
app:indicatorSize="23dp"
app:trackThickness="1.8dp" />
<!-- <ProgressBar-->
<!-- android:id="@+id/imv_progress"-->
<!-- android:layout_width="30dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:indeterminateTint="@android:color/black"-->
<!-- android:indeterminate="true" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/imv_progress"-->
<!-- android:layout_width="30dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:layout_gravity="center"-->
<!-- android:src="@drawable/ic_progress_balance" />-->
</ViewSwitcher>
</FrameLayout>

4
app/src/main/res/layout/view_onboarding_tv_balance.xml
View file

@ -14,7 +14,7 @@
android:letterSpacing="0.036"
android:text="@string/onboarding_balance_title"
android:textAllCaps="true"
android:textColor="#ABABAB"
android:textColor="@color/text_secondary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -31,6 +31,7 @@
android:maxLines="1"
android:textSize="28sp"
android:textStyle="bold"
android:textColor="@color/text_primary_1"
app:layout_constraintEnd_toStartOf="@+id/tv_balance_currency"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
@ -45,6 +46,7 @@
android:letterSpacing="0.036"
android:textSize="28sp"
android:textStyle="bold"
android:textColor="@color/text_primary_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/tv_balance_value"

7
app/src/main/res/values-night/colors.xml
View file

@ -2,7 +2,7 @@
<resources>
<color name="background_action">#C9C9C9</color>
<color name="background_action">#303030</color>
<!--<color name="background_plain">#000000</color>-->
<color name="background_primary">#1E1E1E</color>
<color name="background_secondary">#000000</color>
@ -20,6 +20,11 @@
<!--<color name="field_focused">#3B3B3B</color>-->
<!--<color name="field_primary">#303030</color>-->
<color name="onboarding_card_background">#3B3B3B</color>
<color name="onboarding_twin_wave_1">#3E3E3E</color>
<color name="onboarding_twin_wave_2">#404040</color>
<color name="onboarding_twin_wave_3">#444444</color>
<color name="icon_accent">#1ACE80</color>
<color name="icon_attention">#FFB71B</color>
<color name="icon_inactive">#3B3B3B</color>

8
app/src/main/res/values/colors.xml
View file

@ -36,13 +36,19 @@
<color name="blue">@color/colorSecondary</color>
<color name="blue_pale">#E0E6FA</color>
<color name="onboarding_card_background">#F3F3F3</color>
<color name="onboarding_twin_wave_1">#DDDEE0</color>
<color name="onboarding_twin_wave_2">#DCDCDC</color>
<color name="onboarding_twin_wave_3">#D9D9D9</color>
<color name="warning_info">#1C1C1E</color>
<color name="warning_warning">#FFB71B</color>
<color name="warning_critical">#CA0F03</color>
<color name="all_colors_azure">#007AFF</color>
<color name="background_action">#000000</color>
<color name="background_action">#FFFFFF</color>
<color name="background_primary">#FFFFFF</color>
<color name="background_secondary">#F5F5F5</color>

4
app/src/main/res/values/styles.xml
View file

@ -6,7 +6,7 @@
<item name="colorPrimary">@color/menu_accent_color</item>
<item name="colorSecondary">@color/menu_accent_color</item>
<item name="android:textColor">@color/text_primary_1</item>
<item name="actionMenuTextColor">@color/menu_accent_color</item>
<item name="actionMenuTextColor">@color/icon_primary_1</item>
<item name="colorControlNormal">@color/text_secondary</item>
<item name="colorControlActivated">@color/accent</item>
@ -32,7 +32,7 @@
</style>
<style name="ThemeOverlay.MyTheme.Toolbar.AccentColorMenu" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
<item name="actionMenuTextColor">@color/accent</item>
<item name="actionMenuTextColor">@color/icon_primary_1</item>
</style>