Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-29 21:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement small screen support for BankTransferMandateFragment.

Browse Source
This commit is contained in:
Alex Hart
2023-10-12 17:17:11 -03:00
committed by Cody Henthorne
parent 7001cedbc7
commit ebc6665224
8 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/res/layout/credit_card_fragment.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
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">
@@ -17,35 +16,26 @@
app:layout_constraintTop_toTopOf="parent"
app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:title="@string/CreditCardFragment__credit_or_debit_card"
app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingHorizontal="32dp"
android:textAppearance="@style/Signal.Text.TitleLarge"
app:layout_constraintTop_toBottomOf="@id/toolbar"
tools:text="Donation amount: $20" />
<org.thoughtcrime.securesms.util.views.LearnMoreTextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:paddingHorizontal="32dp"
android:layout_marginTop="12dp"
android:paddingHorizontal="@dimen/core_ui__gutter"
android:text="@string/CreditCardFragment__enter_your_card_details"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintTop_toBottomOf="@id/title" />
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/card_number_wrapper"
style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:layout_marginTop="24dp"
android:hint="@string/CreditCardFragment__card_number"
app:boxStrokeColor="@color/signal_colorPrimary"
app:boxStrokeErrorColor="@color/signal_colorError"
@@ -72,7 +62,7 @@
style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="12dp"
android:hint="@string/CreditCardFragment__mm_yy"
android:paddingEnd="18dp"
app:boxStrokeColor="@color/signal_colorPrimary"
@@ -103,7 +93,7 @@
style="@style/Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="12dp"
android:hint="@string/CreditCardFragment__cvv"
android:paddingStart="18dp"
app:boxStrokeColor="@color/signal_colorPrimary"
@@ -130,12 +120,13 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/continue_button"
style="@style/Signal.Widget.Button.Large.Primary"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dsl_settings_gutter"
android:layout_marginBottom="16dp"
android:enabled="false"
android:text="@string/CreditCardFragment__continue"
android:minWidth="220dp"
android:text="@string/CreditCardFragment__donate_s"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

1
app/src/main/res/values-sw360dp/dimens.xml
View File

@@ -15,6 +15,7 @@
<dimen name="payment_recovery_phrase_adapter_margin">92dp</dimen>
<dimen name="payment_recovery_phrase_outline_margin">48dp</dimen>
<dimen name="bank_transfer_mandate_gutter">32dp</dimen>
<dimen name="media_bubble_gif_width">260dp</dimen>
<dimen name="dsl_settings_gutter">24dp</dimen>
<dimen name="active_subscription_gutter_start">22dp</dimen>

1
app/src/main/res/values/dimens.xml
View File

@@ -170,6 +170,7 @@
<dimen name="payment_recovery_phrase_adapter_margin">49dp</dimen>
<dimen name="payment_recovery_phrase_outline_margin">32dp</dimen>
<dimen name="bank_transfer_mandate_gutter">16dp</dimen>
<dimen name="dsl_settings_gutter">16dp</dimen>
<dimen name="active_subscription_gutter_start">14dp</dimen>
<dimen name="media_overview_toggle_gutter">2dp</dimen>

13
app/src/main/res/values/strings.xml
View File

@@ -120,11 +120,8 @@
<string name="BlockedUsersActivity__block">Block</string>
<!-- CreditCardFragment -->
<!-- Title of fragment detailing the donation amount for one-time donation, displayed above the credit card text fields -->
<string name="CreditCardFragment__donation_amount_s">Donation amount: %1$s</string>
<!-- Title of fragment detailing the donation amount for monthly donation, displayed above the credit card text fields -->
<string name="CreditCardFragment__donation_amount_s_per_month">Donation amount: %1$s/month</string>
<!-- Explanation of how to fill in the form, displayed above the credit card text fields -->
<!-- Title of fragment -->
<string name="CreditCardFragment__credit_or_debit_card">Credit or debit card</string>
<!-- Explanation of how to fill in the form and a note about pii, displayed above the credit card text fields -->
<string name="CreditCardFragment__enter_your_card_details">Enter your card details. Signal does not collect or store your personal information.</string>
<!-- Displayed as a hint in the card number text field -->
@@ -149,8 +146,10 @@
<string name="CreditCardFragment__year_required">Year required</string>
<!-- Error displayed under the card expiry text field when the expiry year is invalid -->
<string name="CreditCardFragment__invalid_year">Invalid year</string>
<!-- Button label to confirm credit card input and proceed with payment -->
<string name="CreditCardFragment__continue">Continue</string>
<!-- Button label to confirm credit card input and proceed with one-time payment -->
<string name="CreditCardFragment__donate_s">Donate %1$s</string>
<!-- Button label to confirm credit card input and proceed with subscription payment -->
<string name="CreditCardFragment__donate_s_month">Donate %1$s/month</string>
<!-- BlockUnblockDialog -->
<string name="BlockUnblockDialog_block_and_leave_s">Block and leave %1$s?</string>