Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions commonui/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<dimen name="progress_bar_elevation">7dp</dimen>
<dimen name="dynamic_widget_margin">22dp</dimen>
<dimen name="icon_margin_top">1dp</dimen>
<dimen name="icon_default_width">24dp</dimen>
<dimen name="icon_default_height">24dp</dimen>
<dimen name="icon_default_width">32dp</dimen>
<dimen name="icon_default_height">32dp</dimen>
<dimen name="menu_icon_default_margin">4dp</dimen>
<dimen name="text_input_hint_text_padding">6dp</dimen>
<dimen name="widget_left_margin_offset">32dp</dimen>
Expand All @@ -93,4 +93,5 @@
<dimen name="image_offset">32dp</dimen>
<dimen name="divider_offset">58dp</dimen>
<dimen name="margin_top_header_value">10dp</dimen>
<dimen name="font_clickable_text_size">16sp</dimen>
</resources>
2 changes: 2 additions & 0 deletions commonui/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@
<string name="edit" translatable="false">Edit</string>
<string name="remove">Remove</string>
<string name="remove_transfer_method_title" translatable="false">Remove this transfer method?</string>
<string name="navigate_back_description" translatable="false">Navigate back</string>
<string name="transfer_method_add_transfer_button_description" translatable="false">Add a new transfer method</string>
</resources>
1 change: 1 addition & 0 deletions receiptui/src/main/res/layout/activity_receipt_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
android:layout_height="?attr/actionBarSize"
app:titleTextAppearance="@style/TextAppearance.Hyperwallet.Headline5"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay"/>

</com.google.android.material.appbar.AppBarLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.CollapsingToolbarLayout>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay">

<TextView
Expand Down Expand Up @@ -57,6 +58,7 @@
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_right_margin"
android:layout_marginBottom="@dimen/button_bottom_margin"
android:contentDescription="@string/transfer_method_add_transfer_button_description"
app:srcCompat="@mipmap/ic_launcher_foreground"/>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay" >

<TextView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.CollapsingToolbarLayout>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationContentDescription="@string/navigate_back_description"
app:theme="@style/ThemeOverlay.Hyperwallet.Searchable.Selector.ActionBar" />

<View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationContentDescription="@string/navigate_back_description"
app:theme="@style/ThemeOverlay.Hyperwallet.Searchable.Selector.ActionBar" />

<View
Expand Down
2 changes: 1 addition & 1 deletion transfermethodui/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<string name="select_transfer_method_country_button_description">Select country button</string>
<string name="selected_country_item_description">Selected country item</string>
<string name="selected_currency_item_description">Selected currency item</string>
<string name="transfer_method_context_button_description">Context menu button</string>
<string name="transfer_method_context_button_description">Context menu</string>
<string name="item_select_description">Selected item</string>

<string name="error_unmapped_field">Unmapped field, Please contact support.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_right_margin"
android:layout_marginBottom="@dimen/button_bottom_margin"
android:contentDescription="@string/transfer_method_add_transfer_button_description"
app:srcCompat="@mipmap/ic_launcher_foreground"/>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:navigationContentDescription="@string/navigate_back_description"
app:popupTheme="@style/AppTheme.PopupOverlay" />

</com.google.android.material.appbar.CollapsingToolbarLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationContentDescription="@string/navigate_back_description"
app:theme="@style/ThemeOverlay.Hyperwallet.Selector.ActionBar" />

<View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationContentDescription="@string/navigate_back_description"
app:theme="@style/ThemeOverlay.Hyperwallet.Selector.ActionBar" />

<View
Expand Down
2 changes: 2 additions & 0 deletions transferui/src/main/res/layout/fragment_create_transfer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:padding="@dimen/clickable_text_padding"
android:textAppearance="@style/TextAppearance.Hyperwallet.Clickable.Caption"
android:textSize="@dimen/font_clickable_text_size"
android:text="@string/mobileTransferMax" />
</LinearLayout>
</LinearLayout>
Expand Down
1 change: 1 addition & 0 deletions transferui/src/main/res/values/dimension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
<dimen name="currency_code_padding_2">18dp</dimen>
<dimen name="currency_code_padding_3">25dp</dimen>
<dimen name="amount_container_height">80dp</dimen>
<dimen name="clickable_text_padding">10dp</dimen>
</resources>