fix: convert textSize unit sp to dp

fix: watch-only screen (cherry picked from commit 3b55777)
Blockstream · May 23, 2023 · e3be853 · e3be853
1 parent ba2b0f1
commit e3be853
Show file tree

Hide file tree

Showing 26 changed files with 327 additions and 327 deletions.
diff --git a/green/src/main/res/layout/about_fragment.xml b/green/src/main/res/layout/about_fragment.xml
@@ -140,7 +140,7 @@
             android:text="@{buildVersion}"
             android:textAppearance="?attr/textAppearanceBodySmall"
             android:textColor="@color/color_on_surface_emphasis_high"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintEnd_toEndOf="@+id/logo"
             app:layout_constraintTop_toBottomOf="@+id/logo"
             tools:text="4.0.0" />

diff --git a/green/src/main/res/layout/account_asset_layout.xml b/green/src/main/res/layout/account_asset_layout.xml
@@ -95,7 +95,7 @@
             android:textAllCaps="true"
             android:textAppearance="?attr/textAppearanceLabelSmall"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="11sp"
+            android:textSize="11dp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/accountType"
             app:layout_constraintEnd_toStartOf="@+id/barrier"
@@ -140,7 +140,7 @@
             android:text="@{ExtensionsKt.titleRes(account.type)}"
             android:textAlignment="center"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="9sp"
+            android:textSize="9dp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/icon"

diff --git a/green/src/main/res/layout/account_card_layout.xml b/green/src/main/res/layout/account_card_layout.xml
@@ -102,7 +102,7 @@
                     android:text="@{account.name}"
                     android:textAppearance="?attr/textAppearanceBodyMedium"
                     android:textColor="@color/color_on_surface_emphasis_high"
-                    android:textSize="16sp"
+                    android:textSize="16dp"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@+id/assetsIcons"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/green/src/main/res/layout/device_info_fragment.xml b/green/src/main/res/layout/device_info_fragment.xml
@@ -143,7 +143,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 

diff --git a/green/src/main/res/layout/drawer_fragment.xml b/green/src/main/res/layout/drawer_fragment.xml
@@ -189,7 +189,7 @@
                 android:layout_marginEnd="4dp"
                 android:text="@string/id_app_settings"
                 android:textColor="@color/color_on_surface_emphasis_medium"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 

diff --git a/green/src/main/res/layout/enter_recovery_phrase_fragment.xml b/green/src/main/res/layout/enter_recovery_phrase_fragment.xml
@@ -100,7 +100,7 @@
                 android:singleLine="true"
                 android:text="@{vm.messageResource}"
                 android:textColor="@color/color_on_surface_emphasis_low"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 android:textStyle="italic"
                 app:drawableEndCompat="@drawable/ic_info_16"
                 app:drawableTint="@color/color_on_surface_emphasis_low"
@@ -218,7 +218,7 @@
                 android:singleLine="true"
                 android:text="@string/id_invalid_mnemonic"
                 android:textColor="@color/error"
-                android:textSize="14sp"
+                android:textSize="14dp"
                 app:drawableStartCompat="@drawable/ic_baseline_error_outline_18"
                 app:drawableTint="@color/error"
                 app:layout_constraintBottom_toBottomOf="@+id/buttonHelp"

diff --git a/green/src/main/res/layout/green_switch.xml b/green/src/main/res/layout/green_switch.xml
@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textSize="12sp"
+                android:textSize="12dp"
                 android:visibility="gone"
                 android:includeFontPadding="false"
                 tools:text="Caption\nMultiline"

diff --git a/green/src/main/res/layout/intro_fragment.xml b/green/src/main/res/layout/intro_fragment.xml
@@ -113,7 +113,7 @@
             android:layout_marginStart="9dp"
             android:text="@string/id_about"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:icon="@drawable/ic_shield_white"
             app:iconSize="24dp"
             app:iconTint="@color/color_on_surface_emphasis_medium"
@@ -136,7 +136,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_medium"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 

diff --git a/green/src/main/res/layout/list_item_account.xml b/green/src/main/res/layout/list_item_account.xml
@@ -83,7 +83,7 @@
                     android:text="@{account.name}"
                     android:textAppearance="?attr/textAppearanceBodyMedium"
                     android:textColor="@color/color_on_surface_emphasis_high"
-                    android:textSize="16sp"
+                    android:textSize="16dp"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toTopOf="@+id/accountType"
                     app:layout_constraintEnd_toStartOf="@+id/linearLayout2"
@@ -105,7 +105,7 @@
                     android:textAllCaps="true"
                     android:textAppearance="?attr/textAppearanceBodySmall"
                     android:textColor="@color/color_on_surface_emphasis_low"
-                    android:textSize="11sp"
+                    android:textSize="11dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/linearLayout2"
                     app:layout_constraintHorizontal_bias="0.5"
@@ -128,7 +128,7 @@
                     android:text="@{ExtensionsKt.titleRes(account.type)}"
                     android:textAlignment="center"
                     android:textColor="@color/color_on_surface_emphasis_low"
-                    android:textSize="9sp"
+                    android:textSize="9dp"
                     android:visibility="gone"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/icon"

diff --git a/green/src/main/res/layout/list_item_account_type.xml b/green/src/main/res/layout/list_item_account_type.xml
@@ -80,7 +80,7 @@
                 android:textAllCaps="true"
                 android:textAppearance="?attr/textAppearanceBodySmall"
                 android:textColor="@color/color_on_surface_emphasis_medium"
-                android:textSize="11sp"
+                android:textSize="11dp"
                 app:layout_constraintEnd_toStartOf="@+id/arrow"
                 app:layout_constraintStart_toEndOf="@+id/policyIcon"
                 app:layout_constraintTop_toTopOf="parent"

diff --git a/green/src/main/res/layout/list_item_network_small.xml b/green/src/main/res/layout/list_item_network_small.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="?attr/textAppearanceLabelMedium"
-                android:textSize="18sp"
+                android:textSize="18dp"
                 android:textStyle="bold"
                 tools:text="Bitcoin" />
 

diff --git a/green/src/main/res/layout/list_item_preference.xml b/green/src/main/res/layout/list_item_preference.xml
@@ -95,7 +95,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="40dp"
                     android:text="@string/id_change"
-                    android:textSize="12sp"
+                    android:textSize="12dp"
                     tools:visibility="gone"
                     app:textAllCaps="true" />
 

diff --git a/green/src/main/res/layout/list_item_recovery_phrase_word.xml b/green/src/main/res/layout/list_item_recovery_phrase_word.xml
@@ -23,7 +23,7 @@
             android:minWidth="40dp"
             android:textAlignment="textEnd"
             android:textColor="@color/brand_green"
-            android:textSize="14sp"
+            android:textSize="14dp"
             app:layout_constraintBaseline_toBaselineOf="@+id/word"
             app:layout_constraintEnd_toStartOf="@+id/word"
             tools:text="99" />
@@ -42,7 +42,7 @@
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
             android:textColor="@color/color_on_surface_emphasis_high"
-            android:textSize="16sp"
+            android:textSize="16dp"
             android:singleLine="true"
             android:ellipsize="end"
             app:layout_constraintBottom_toBottomOf="parent"

diff --git a/green/src/main/res/layout/list_item_wallet.xml b/green/src/main/res/layout/list_item_wallet.xml
@@ -95,7 +95,7 @@
                     android:text="@{device != null ? device.name : wallet.ephemeralBip39Name}"
                     android:textAppearance="?attr/textAppearanceBodySmall"
                     android:textColor="@color/color_on_surface_emphasis_medium"
-                    android:textSize="10sp"
+                    android:textSize="10dp"
                     app:layout_constraintEnd_toEndOf="@+id/title"
                     app:layout_constraintStart_toStartOf="@+id/title"
                     app:layout_constraintTop_toBottomOf="@+id/title"

diff --git a/green/src/main/res/layout/login_fragment.xml b/green/src/main/res/layout/login_fragment.xml
@@ -334,7 +334,7 @@
             android:layout_marginStart="24dp"
             android:text="@string/id_login_with_biometrics"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -348,7 +348,7 @@
             android:enabled="@{!vm.onProgress}"
             android:text="@string/id_app_settings"
             android:textColor="@color/color_on_surface_emphasis_low"
-            android:textSize="12sp"
+            android:textSize="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />