From 75af1b69e89ea376aa98df39e213ab6340ffd8a9 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 15 Sep 2022 11:05:07 -0300
Subject: [PATCH] Update payment toolbars to match M3 specification.

---
 .../thoughtcrime/securesms/util/FeatureFlags.java |  1 -
 .../main/res/layout/create_payment_fragment.xml   | 10 ++++++----
 .../res/layout/deactivate_wallet_fragment.xml     |  5 +++--
 app/src/main/res/layout/edit_note_fragment.xml    | 11 ++++++-----
 .../main/res/layout/payment_details_fragment.xml  |  9 +++++----
 .../payment_recipient_selection_fragment.xml      | 15 ++++++++-------
 .../res/layout/payments_activity_fragment.xml     |  5 +++--
 .../res/layout/payments_add_money_fragment.xml    |  5 +++--
 .../main/res/layout/payments_home_fragment.xml    | 13 +++++++------
 .../layout/payments_recovery_entry_fragment.xml   |  9 +++++----
 .../layout/payments_recovery_paste_fragment.xml   | 11 ++++++-----
 .../payments_recovery_phrase_confirm_fragment.xml |  9 +++++----
 .../layout/payments_recovery_phrase_fragment.xml  |  9 +++++----
 .../layout/payments_recovery_start_fragment.xml   |  9 +++++----
 .../res/layout/payments_transfer_fragment.xml     |  5 +++--
 .../layout/payments_transfer_qr_scan_fragment.xml | 11 ++++++-----
 app/src/main/res/layout/set_currency_fragment.xml |  5 +++--
 17 files changed, 79 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 357595e24e..1977b6767b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -178,7 +178,6 @@ public final class FeatureFlags {
   @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
   @VisibleForTesting
   static final Map<String, Object> FORCED_VALUES = new HashMap<String, Object>() {{
-    put(USERNAMES, true);
   }};
 
   /**
diff --git a/app/src/main/res/layout/create_payment_fragment.xml b/app/src/main/res/layout/create_payment_fragment.xml
index 9ebc10eb88..b406464123 100644
--- a/app/src/main/res/layout/create_payment_fragment.xml
+++ b/app/src/main/res/layout/create_payment_fragment.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/create_payment_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_left_24" />
+        app:navigationIcon="@drawable/ic_arrow_left_24"
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/deactivate_wallet_fragment.xml b/app/src/main/res/layout/deactivate_wallet_fragment.xml
index 1ae7ea1029..45f9705f1e 100644
--- a/app/src/main/res/layout/deactivate_wallet_fragment.xml
+++ b/app/src/main/res/layout/deactivate_wallet_fragment.xml
@@ -10,12 +10,13 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/deactivate_wallet_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/DeactivateWalletFragment__deactivate_wallet"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/edit_note_fragment.xml b/app/src/main/res/layout/edit_note_fragment.xml
index 0e59bc969a..d2b6481686 100644
--- a/app/src/main/res/layout/edit_note_fragment.xml
+++ b/app/src/main/res/layout/edit_note_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/edit_note_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/CreatePaymentFragment__add_note"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiEditText
         android:id="@+id/edit_note_fragment_edit_text"
diff --git a/app/src/main/res/layout/payment_details_fragment.xml b/app/src/main/res/layout/payment_details_fragment.xml
index 5472f43a67..abde7225c6 100644
--- a/app/src/main/res/layout/payment_details_fragment.xml
+++ b/app/src/main/res/layout/payment_details_fragment.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_details_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsDetailsFragment__details"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payment_recipient_selection_fragment.xml b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
index b16f49b617..c666043b81 100644
--- a/app/src/main/res/layout/payment_recipient_selection_fragment.xml
+++ b/app/src/main/res/layout/payment_recipient_selection_fragment.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -15,14 +15,15 @@
         <org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
             android:id="@+id/payment_recipient_selection_fragment_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="@dimen/signal_m3_toolbar_height"
+            android:minHeight="@dimen/signal_m3_toolbar_height"
             android:theme="?attr/settingsToolbarStyle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="@drawable/ic_arrow_left_24"
-            app:titleTextAppearance="@style/Signal.Text.Title"
-            app:title="@string/PaymentRecipientSelectionFragment__new_payment" />
+            app:title="@string/PaymentRecipientSelectionFragment__new_payment"
+            app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
         <org.thoughtcrime.securesms.components.ContactFilterView
             android:id="@+id/contact_filter_edit_text"
@@ -30,8 +31,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dsl_settings_gutter"
             android:layout_marginTop="4dp"
-            android:layout_marginBottom="12dp"
             android:layout_marginRight="@dimen/dsl_settings_gutter"
+            android:layout_marginBottom="12dp"
             android:minHeight="44dp" />
 
 
diff --git a/app/src/main/res/layout/payments_activity_fragment.xml b/app/src/main/res/layout/payments_activity_fragment.xml
index 8e7fdce8a1..167229891f 100644
--- a/app/src/main/res/layout/payments_activity_fragment.xml
+++ b/app/src/main/res/layout/payments_activity_fragment.xml
@@ -15,10 +15,11 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/payments_all_activity_fragment_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/signal_m3_toolbar_height"
+            android:minHeight="@dimen/signal_m3_toolbar_height"
             app:navigationIcon="@drawable/ic_arrow_left_24"
             app:title="@string/PaymentsActivityFragment__all_activity"
-            app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+            app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/payments_all_activity_fragment_tabs"
diff --git a/app/src/main/res/layout/payments_add_money_fragment.xml b/app/src/main/res/layout/payments_add_money_fragment.xml
index 720c637b51..45329b836a 100644
--- a/app/src/main/res/layout/payments_add_money_fragment.xml
+++ b/app/src/main/res/layout/payments_add_money_fragment.xml
@@ -14,12 +14,13 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/payments_add_money_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="@dimen/signal_m3_toolbar_height"
+            android:minHeight="@dimen/signal_m3_toolbar_height"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="@drawable/ic_arrow_left_24"
             app:title="@string/PaymentsAddMoneyFragment__add_funds"
-            app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+            app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
         <LinearLayout
             android:id="@+id/payments_add_money_qr_border"
diff --git a/app/src/main/res/layout/payments_home_fragment.xml b/app/src/main/res/layout/payments_home_fragment.xml
index 2e396e4c3f..5c211f652f 100644
--- a/app/src/main/res/layout/payments_home_fragment.xml
+++ b/app/src/main/res/layout/payments_home_fragment.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
-        android:theme="?actionBarStyle"
         android:id="@+id/payments_home_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
+        android:theme="?actionBarStyle"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/preferences__payments_beta"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <include
         layout="@layout/payments_home_fragment_header"
diff --git a/app/src/main/res/layout/payments_recovery_entry_fragment.xml b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
index 5fed706cb2..10871563bf 100644
--- a/app/src/main/res/layout/payments_recovery_entry_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_entry_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_recovery_entry_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_paste_fragment.xml b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
index b12e3a1b5c..bd4a7e5fe7 100644
--- a/app/src/main/res/layout/payments_recovery_paste_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_paste_fragment.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_recovery_paste_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsRecoveryPasteFragment__paste_recovery_phrase"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <EditText
         android:id="@+id/payments_recovery_paste_fragment_phrase"
diff --git a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
index fb06915de6..905ba9ad96 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_recovery_phrase_confirm_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
index 9a70f84c85..9581e48dce 100644
--- a/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_phrase_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_recovery_phrase_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_recovery_start_fragment.xml b/app/src/main/res/layout/payments_recovery_start_fragment.xml
index 0d9ea243f2..f63c6201a7 100644
--- a/app/src/main/res/layout/payments_recovery_start_fragment.xml
+++ b/app/src/main/res/layout/payments_recovery_start_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_recovery_start_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?actionBarStyle"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsRecoveryStartFragment__recovery_phrase"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/payments_transfer_fragment.xml b/app/src/main/res/layout/payments_transfer_fragment.xml
index b3fa5d52e1..df8f9b9cd4 100644
--- a/app/src/main/res/layout/payments_transfer_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_fragment.xml
@@ -9,12 +9,13 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_transfer_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsTransferFragment__transfer"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <EditText
         android:id="@+id/payments_transfer_to_address"
diff --git a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
index f0970c11cb..1fb7aeefe8 100644
--- a/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_qr_scan_fragment.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_transfer_scan_qr"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/PaymentsTransferQrScanFragment__scan_address_qr_code"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <FrameLayout
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/set_currency_fragment.xml b/app/src/main/res/layout/set_currency_fragment.xml
index f9ed567774..45d1a9908c 100644
--- a/app/src/main/res/layout/set_currency_fragment.xml
+++ b/app/src/main/res/layout/set_currency_fragment.xml
@@ -10,11 +10,12 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/set_currency_fragment_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="@dimen/signal_m3_toolbar_height"
+        android:minHeight="@dimen/signal_m3_toolbar_height"
         app:layout_constraintTop_toTopOf="parent"
         app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/SetCurrencyFragment__set_currency"
-        app:titleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" />
+        app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/set_currency_fragment_list"