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

Update payment keyboard insets and colors.

Browse source
This commit is contained in:
Varsha 2022-09-20 10:30:21 -07:00 • committed by Cody Henthorne
parent 1cea615675
commit bc7b0b40b0
7 changed files with 60 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/res/drawable/ic_delete_button.xml Normal file
View file

File diff suppressed because one or more lines are too long

5
app/src/main/res/drawable/rounded_rectangle_num_pad_key.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<solid android:color="@color/num_pad_key_background"/>
<corners android:radius="38dp"/>
</shape>

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

@ -68,152 +68,102 @@
<TextView
android:id="@+id/create_payment_fragment_keyboard_decimal"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:text="@string/CreatePaymentFragment__decimal"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_0"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_0"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:text="@string/CreatePaymentFragment__0"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_lt"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_decimal" />
<ImageView
android:id="@+id/create_payment_fragment_keyboard_lt"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/CreatePaymentFragment__backspace"
android:gravity="center"
android:padding="14dp"
android:scaleType="centerInside"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_0"
app:srcCompat="@drawable/ic_arrow_left_20" />
app:srcCompat="@drawable/ic_delete_button" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_7"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__7"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_8"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_8"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__8"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_9"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_7" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_9"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__9"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_8" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_4"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__4"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_5"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_5"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__5"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
app:layout_constraintBottom_toTopOf="@+id/create_payment_fragment_keyboard_8"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_6"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_4" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_6"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__6"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_5" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_1"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
android:background="?attr/selectableItemBackground"
android:gravity="center"
style="@style/NumPadKeyTextView"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__1"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_bias="1" />
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/create_payment_fragment_keyboard_2"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
style="@style/NumPadKeyTextView"
android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__2"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_3"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_1"
@ -222,14 +172,10 @@
<TextView
android:id="@+id/create_payment_fragment_keyboard_3"
android:layout_width="@dimen/create_payment_key_size"
android:layout_height="@dimen/create_payment_key_size"
style="@style/NumPadKeyTextView"
android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
android:text="@string/CreatePaymentFragment__3"
android:textColor="@color/signal_text_primary"
android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_2"

3
app/src/main/res/values-night/dark_colors.xml
View file

@ -202,4 +202,7 @@
<color name="message_request_bar_background_wallpaper">@color/signal_light_colorTransparent2</color>
<color name="message_request_bar_denyForeground_wallpaper">@color/signal_colorError</color>
<color name="message_request_bar_acceptForeground_wallpaper">@color/signal_colorNeutralInverse</color>
<color name="num_pad_key_background">@color/transparent_white_20</color>
</resources>

4
app/src/main/res/values/dimens.xml
View file

@ -191,7 +191,9 @@
<dimen name="transfer_split_top_padding">32dp</dimen>
<dimen name="transfer_item_spacing">24dp</dimen>
<dimen name="create_payment_key_size">70dp</dimen>
<dimen name="create_payment_key_width">80dp</dimen>
<dimen name="create_payment_key_height">70dp</dimen>
<dimen name="create_payment_key_bottom_padding">16dp</dimen>
<dimen name="create_payment_key_bottom_row_margin_bottom">33dp</dimen>
<dimen name="create_payment_key_top_row_margin_top">11dp</dimen>

2
app/src/main/res/values/light_colors.xml
View file

@ -199,6 +199,8 @@
<color name="notification_profile_moon_tint">#5151F6</color>
<color name="num_pad_key_background">#dce5f9</color>
<color name="top_toast_background_color">@color/core_white</color>
<color name="sent_gift_button_tint">@color/transparent_white_70</color>

10
app/src/main/res/values/styles.xml
View file

@ -505,4 +505,14 @@
<item name="android:layout_gravity">end</item>
<item name="android:gravity">end|center_vertical</item>
</style>
<style name="NumPadKeyTextView" parent="@android:style/TextAppearance.Widget.TextView">
<item name="android:layout_width">@dimen/create_payment_key_width</item>
<item name="android:layout_height">@dimen/create_payment_key_height</item>
<item name="android:background">@drawable/rounded_rectangle_num_pad_key</item>
<item name="android:textColor">@color/signal_text_primary</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">24sp</item>
<item name="android:gravity">center</item>
</style>
</resources>