From 9e80fccbbda0bc411dcb2b1b8ea2b082921eff86 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 29 Aug 2025 09:33:17 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/res/drawable/inset_splash.xml     | 10 +++++-----
 app/src/main/res/values/colors.xml             |  2 --
 app/src/main/res/values/styles.xml             |  2 +-
 .../core/ui/components/fields/PinTextField.kt  | 18 ++++++++++--------
 core/ui/src/main/res/drawable/ic_tangem_24.xml |  6 +++---
 .../ui}/src/main/res/drawable/splash_logo.xml  | 10 +++++-----
 core/ui/src/main/res/values-night/colors.xml   |  4 ++++
 core/ui/src/main/res/values/colors.xml         |  4 ++++
 .../features/welcome/impl/ui/WelcomePlain.kt   |  4 ++--
 9 files changed, 34 insertions(+), 26 deletions(-)
 rename {app => core/ui}/src/main/res/drawable/splash_logo.xml (80%)
 create mode 100644 core/ui/src/main/res/values-night/colors.xml
 create mode 100644 core/ui/src/main/res/values/colors.xml

diff --git a/app/src/main/res/drawable/inset_splash.xml b/app/src/main/res/drawable/inset_splash.xml
index 1d66dc1301..2886ecbd00 100644
--- a/app/src/main/res/drawable/inset_splash.xml
+++ b/app/src/main/res/drawable/inset_splash.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
     android:drawable="@drawable/splash_logo"
-    android:insetLeft="48dp"
-    android:insetRight="48dp"
-    android:insetTop="48dp"
-    android:insetBottom="48dp"/>
+    android:insetLeft="55dp"
+    android:insetRight="55dp"
+    android:insetTop="55dp"
+    android:insetBottom="55dp"/>
 
 <!-- image should fit exactly in square 192x192 dp-->
-<!-- (192 - splash_logo_side)/2 = 48dp -->
\ No newline at end of file
+<!-- (192 - splash_logo_side)/2 = 55dp -->
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db52974e28..bf4703e8e2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,6 +26,4 @@
     <color name="text_primary_1">#1E1E1E</color>
     <color name="text_secondary">#656565</color>
 
-    <color name="background_splash">#000000</color>
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2b866d0894..d91dbb1dbe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
     </style>
 
     <style name="SplashTheme" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/background_splash</item>
+        <item name="windowSplashScreenBackground">@color/background_primary</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/inset_splash</item>
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
index 214da97109..a3226e0b46 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.utils.StringsSigns.PASSWORD_VISUAL_CHAR
@@ -159,14 +158,17 @@ private fun CellDecoration(
                             )
                         }
                     } else {
-                        Text(
+                        Box(
                             modifier = Modifier.sizeIn(minWidth = minWidth, minHeight = minHeight),
-                            text = text,
-                            style = TangemTheme.typography.h3,
-                            color = color,
-                            textAlign = TextAlign.Center,
-                            lineHeight = 48.sp,
-                        )
+                        ) {
+                            Text(
+                                modifier = Modifier.align(Alignment.Center),
+                                text = text,
+                                style = TangemTheme.typography.h3,
+                                color = color,
+                                textAlign = TextAlign.Center,
+                            )
+                        }
                     }
                 }
             }
diff --git a/core/ui/src/main/res/drawable/ic_tangem_24.xml b/core/ui/src/main/res/drawable/ic_tangem_24.xml
index b4ccb9cc5a..cd606d5acf 100644
--- a/core/ui/src/main/res/drawable/ic_tangem_24.xml
+++ b/core/ui/src/main/res/drawable/ic_tangem_24.xml
@@ -6,11 +6,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M15.682,3.25H8.318C7.157,3.25 6.576,3.25 6.132,3.476C5.742,3.675 5.424,3.992 5.226,4.382C5,4.826 5,5.407 5,6.568V7.8H19V6.568C19,5.407 19,4.826 18.774,4.382C18.575,3.992 18.258,3.674 17.868,3.476C17.424,3.25 16.844,3.25 15.682,3.25Z"
-      android:fillColor="#1E1E1E"/>
+      android:fillColor="@color/icon_primary1"/>
   <path
       android:pathData="M14.333,11.65H19V17.432C19,18.594 19,19.174 18.773,19.618C18.574,20.008 18.258,20.326 17.868,20.524C17.423,20.75 16.843,20.75 15.681,20.75H14.334L14.333,11.65Z"
-      android:fillColor="#1E1E1E"/>
+      android:fillColor="@color/icon_primary1"/>
   <path
       android:pathData="M5,11.65H9.666V20.75H8.318C7.157,20.75 6.576,20.75 6.132,20.524C5.742,20.326 5.425,20.008 5.226,19.618C5,19.174 5,18.594 5,17.432V11.65Z"
-      android:fillColor="#1E1E1E"/>
+      android:fillColor="@color/icon_primary1"/>
 </vector>
diff --git a/app/src/main/res/drawable/splash_logo.xml b/core/ui/src/main/res/drawable/splash_logo.xml
similarity index 80%
rename from app/src/main/res/drawable/splash_logo.xml
rename to core/ui/src/main/res/drawable/splash_logo.xml
index ef37dfda51..f95768bf95 100644
--- a/app/src/main/res/drawable/splash_logo.xml
+++ b/core/ui/src/main/res/drawable/splash_logo.xml
@@ -1,15 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="96dp"
+    android:width="82dp"
+    android:height="82dp"
     android:viewportWidth="450"
     android:viewportHeight="450">
   <path
-      android:fillColor="#ffffff"
+      android:fillColor="@color/icon_primary1"
       android:pathData="M284.96,82H165.04C146.12,82 136.67,82 129.44,85.68C123.08,88.93 117.91,94.08 114.68,100.44C111,107.67 111,117.12 111,136.04V156.1H339V136.04C339,117.12 339,107.67 335.32,100.44C332.07,94.08 326.92,88.91 320.56,85.68C313.33,82 303.88,82 284.96,82Z" />
   <path
-      android:fillColor="#ffffff"
+      android:fillColor="@color/icon_primary1"
       android:pathData="M262.99,218.8H338.99V312.96C338.99,331.88 338.99,341.33 335.31,348.56C332.07,354.92 326.91,360.09 320.56,363.32C313.32,367 303.87,367 284.95,367H263.01L262.99,218.8Z" />
   <path
-      android:fillColor="#ffffff"
+      android:fillColor="@color/icon_primary1"
       android:pathData="M111,218.8H186.99V367H165.04C146.12,367 136.67,367 129.44,363.32C123.08,360.09 117.93,354.92 114.68,348.56C111,341.33 111,331.88 111,312.96V218.8Z" />
 </vector>
diff --git a/core/ui/src/main/res/values-night/colors.xml b/core/ui/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000..6c7b1cabaa
--- /dev/null
+++ b/core/ui/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="icon_primary1">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/core/ui/src/main/res/values/colors.xml b/core/ui/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..8dd91f8060
--- /dev/null
+++ b/core/ui/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="icon_primary1">#FF1E1E1E</color>
+</resources>
\ No newline at end of file
diff --git a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/WelcomePlain.kt b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/WelcomePlain.kt
index 5b80e192ee..9da4e13724 100644
--- a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/WelcomePlain.kt
+++ b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/ui/WelcomePlain.kt
@@ -22,8 +22,8 @@ internal fun WelcomePlain(modifier: Modifier = Modifier) {
         contentAlignment = Alignment.Center,
     ) {
         Icon(
-            modifier = Modifier.size(84.dp),
-            imageVector = ImageVector.vectorResource(R.drawable.ic_tangem_24),
+            modifier = Modifier.size(82.dp + 11.dp),
+            imageVector = ImageVector.vectorResource(R.drawable.splash_logo),
             tint = TangemTheme.colors.icon.primary1,
             contentDescription = null,
         )