Skip to content

HW-53770 list receipts and transaction details ui changes #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

HW-53770 list receipts and transaction details ui changes #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1da967
HW-53770: List Receipts and Transaction Details UI Changes
vshcherbyna-epam Jun 25, 2019
446f65c
Merge branch 'development' into bugfix/HW-53770-List-Receipts-and-Tra…
fmattos-hw Jul 2, 2019
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
8 changes: 6 additions & 2 deletions receipt/src/main/res/layout/fragment_list_receipt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_receipts"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
tools:itemCount="5"
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_receipt"
tools:orientation="horizontal"/>

<ProgressBar
android:id="@+id/list_receipt_progress_bar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:indeterminate="true"
android:theme="@style/Widget.Hyperwallet.ProgressBar.Receipts"/>

Expand Down
9 changes: 7 additions & 2 deletions receipt/src/main/res/layout/receipt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:layout_height="wrap_content"
tools:layout_width="match_parent"
tools:showIn="@layout/fragment_receipt_detail">

<TextView android:id="@+id/transaction_type_icon"
android:layout_width="wrap_content"
Expand All @@ -24,10 +28,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_marginTop="@dimen/grid_margin_top"
android:text="@string/text_placeholder"
android:layout_marginEnd="@dimen/ellipsis_spacing"
android:ellipsize="end"
android:fontFamily="sans-serif-thin"
android:maxLines="1"
android:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Subtitle1"
app:layout_constraintEnd_toStartOf="@+id/transaction_amount"
app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
Expand Down
17 changes: 10 additions & 7 deletions ui/src/main/res/layout/item_transfer_method_type.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/regularColorPrimary"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/regularColorPrimary">

<TextView
android:id="@+id/transfer_method_type_icon"
Expand All @@ -20,18 +21,20 @@
android:textSize="@dimen/font_default_icon_size"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/bank_account_font_icon"/>

<TextView
android:id="@+id/transfer_method_type_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_marginTop="@dimen/grid_margin_top"
android:layout_marginStart="@dimen/grid_margin_left"
android:fontFamily="sans-serif-thin"
android:text="@string/not_available"
android:textAppearance="@style/TextAppearance.Hyperwallet.Subtitle1"
app:layout_constraintLeft_toRightOf="@+id/transfer_method_type_icon"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>

<TextView
android:id="@+id/transfer_method_type_description_1"
Expand All @@ -40,7 +43,7 @@
android:text="@string/not_available"
android:textAppearance="@style/TextAppearance.Hyperwallet.Body2"
app:layout_constraintLeft_toLeftOf="@+id/transfer_method_type_title"
app:layout_constraintTop_toBottomOf="@+id/transfer_method_type_title" />
app:layout_constraintTop_toBottomOf="@+id/transfer_method_type_title"/>

<TextView
android:id="@+id/transfer_method_type_description_2"
Expand All @@ -63,7 +66,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_three_dots_16dp" />
app:srcCompat="@drawable/ic_three_dots_16dp"/>

<View
android:id="@+id/divider"
Expand Down