Skip to content

Task/dtserwfour 189 labels should wrap to next line #217

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

Merged
merged 8 commits into from
Dec 5, 2020
Merged

Task/dtserwfour 189 labels should wrap to next line #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
74fb194
DTSERWFOUR -189 wrap labels.
shanavas123 Nov 25, 2020
777923c
Merge branch 'development' of https://github.com/hyperwallet/hyperwal…
shanavas123 Nov 27, 2020
3d2ed9c
DTSERWFOUR -189 wrap labels.
shanavas123 Nov 27, 2020
e074fde
DTSERWFOUR -189 wrap labels.
shanavas123 Nov 27, 2020
f222863
DTSERWFOUR -189 wrap labels to next line.
shanavas123 Nov 30, 2020
64db752
DTSERWFOUR -189 address review comments.
shanavas123 Nov 30, 2020
f01677c
Merge branch 'development' into task/DTSERWFOUR-189-labels-should-wra…
malaw-hw Dec 4, 2020
3741a4b
Merge branch 'development' into task/DTSERWFOUR-189-labels-should-wra…
malaw-hw Dec 4, 2020
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
20 changes: 1 addition & 19 deletions receiptui/src/main/res/layout/fragment_receipt_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_marginEnd="@dimen/grid_margin_right"
android:layout_width="match_parent"
android:layout_height="@dimen/item_receipt_information_height">
android:layout_height="wrap_content">

<include layout="@layout/receipt" />

Expand Down Expand Up @@ -103,8 +103,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:gravity="end"
android:ellipsize="end"
android:maxLines="1"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_toEndOf="@+id/receipt_id_label"
android:layout_marginTop="@dimen/grid_margin_top"
Expand Down Expand Up @@ -138,8 +136,6 @@
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/grid_margin_left"
android:gravity="end"
android:ellipsize="end"
android:maxLines="1"
android:paddingTop="@dimen/item_text_top_bottom_margin"
tools:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption" />
Expand Down Expand Up @@ -176,8 +172,6 @@
android:paddingEnd="@dimen/item_text_top_bottom_margin"
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
android:layout_toEndOf="@+id/client_id_label"
android:ellipsize="end"
android:maxLines="1"
android:gravity="end"
tools:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
Expand Down Expand Up @@ -213,8 +207,6 @@
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
android:layout_toEndOf="@+id/charity_label"
android:ellipsize="end"
android:maxLines="1"
android:gravity="end"
tools:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
Expand Down Expand Up @@ -251,8 +243,6 @@
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
android:layout_toEndOf="@+id/check_number_label"
android:ellipsize="end"
android:maxLines="1"
android:gravity="end"
tools:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
Expand Down Expand Up @@ -289,8 +279,6 @@
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
android:layout_toEndOf="@+id/website_label"
android:ellipsize="end"
android:maxLines="1"
android:gravity="end"
tools:text="@string/text_placeholder"
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
Expand Down Expand Up @@ -397,8 +385,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:gravity="end"
android:ellipsize="end"
android:maxLines="1"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_toEndOf="@+id/details_amount_label"
android:layout_marginTop="@dimen/grid_margin_top"
Expand Down Expand Up @@ -437,8 +423,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:gravity="end"
android:ellipsize="end"
android:maxLines="1"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_toEndOf="@+id/details_fee_label"
android:layout_marginTop="@dimen/grid_margin_top"
Expand Down Expand Up @@ -477,8 +461,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:gravity="end"
android:ellipsize="end"
android:maxLines="1"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_toEndOf="@+id/details_transfer_amount_label"
android:layout_marginTop="@dimen/grid_margin_top"
Expand Down
5 changes: 3 additions & 2 deletions receiptui/src/main/res/layout/item_receipt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
android:id="@+id/receipt_item"
style="@style/ReceiptItem"
android:layout_marginStart="@dimen/grid_margin_left"
android:orientation="vertical"
android:layout_marginEnd="@dimen/grid_margin_right"
android:layout_width="match_parent"
android:layout_height="@dimen/item_receipt_information_height">
android:layout_height="wrap_content">

<include layout="@layout/receipt" />
<include layout="@layout/receipt"/>

<View
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion receiptui/src/main/res/layout/item_receipt_with_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
android:layout_width="match_parent"
android:layout_marginStart="@dimen/grid_margin_left"
android:layout_marginEnd="@dimen/grid_margin_right"
android:layout_height="@dimen/item_receipt_information_height">
android:layout_height="wrap_content">

<include layout="@layout/receipt" />

Expand Down
10 changes: 5 additions & 5 deletions receiptui/src/main/res/layout/receipt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/text_placeholder"
android:ellipsize="end"
android:maxLines="1"
style="@style/ReceiptTitle"
app:layout_constraintEnd_toStartOf="@+id/transaction_amount"
app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
app:layout_constraintTop_toTopOf="parent" />

<TextView android:id="@+id/transaction_date"
android:layout_width="wrap_content"
<TextView
android:id="@+id/transaction_date"
style="@style/ReceiptDate"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/text_placeholder"
style="@style/ReceiptDate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/transaction_currency"
app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
app:layout_constraintTop_toBottomOf="@+id/transaction_title" />

Expand Down