empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update payment toolbars to match M3 specification.

Browse source
This commit is contained in:
Alex Hart 2022-09-15 11:05:07 -03:00 • committed by Greyson Parrelli
parent c96fec9537
commit 75af1b69e8
17 changed files with 79 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View file

@ -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);
}};
/**

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

@ -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"

5
app/src/main/res/layout/deactivate_wallet_fragment.xml
View file

@ -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"

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

@ -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"

9
app/src/main/res/layout/payment_details_fragment.xml
View file

@ -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"

15
app/src/main/res/layout/payment_recipient_selection_fragment.xml
View file

@ -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" />

5
app/src/main/res/layout/payments_activity_fragment.xml
View file

@ -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"

5
app/src/main/res/layout/payments_add_money_fragment.xml
View file

@ -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"

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

@ -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"

9
app/src/main/res/layout/payments_recovery_entry_fragment.xml
View file

@ -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"

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

@ -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"

9
app/src/main/res/layout/payments_recovery_phrase_confirm_fragment.xml
View file

@ -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"

9
app/src/main/res/layout/payments_recovery_phrase_fragment.xml
View file

@ -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"

9
app/src/main/res/layout/payments_recovery_start_fragment.xml
View file

@ -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"

5
app/src/main/res/layout/payments_transfer_fragment.xml
View file

@ -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"

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

@ -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"

5
app/src/main/res/layout/set_currency_fragment.xml
View file

@ -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"