Skip to content

Commit 5209587

Browse files
Task/dtserwfour 189 labels should wrap to next line (#217)
* DTSERWFOUR -189 wrap labels. * DTSERWFOUR -189 wrap labels. * DTSERWFOUR -189 wrap labels. * DTSERWFOUR -189 wrap labels to next line. * DTSERWFOUR -189 address review comments. Co-authored-by: Rita Law <51347548+malaw-hw@users.noreply.github.com>
1 parent d71521c commit 5209587

File tree

4 files changed

+10
-27
lines changed

4 files changed

+10
-27
lines changed

receiptui/src/main/res/layout/fragment_receipt_detail.xml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
android:layout_marginStart="@dimen/grid_margin_left"
4141
android:layout_marginEnd="@dimen/grid_margin_right"
4242
android:layout_width="match_parent"
43-
android:layout_height="@dimen/item_receipt_information_height">
43+
android:layout_height="wrap_content">
4444

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

@@ -103,8 +103,6 @@
103103
android:layout_alignParentTop="true"
104104
android:layout_alignParentEnd="true"
105105
android:gravity="end"
106-
android:ellipsize="end"
107-
android:maxLines="1"
108106
android:layout_marginStart="@dimen/grid_margin_left"
109107
android:layout_toEndOf="@+id/receipt_id_label"
110108
android:layout_marginTop="@dimen/grid_margin_top"
@@ -138,8 +136,6 @@
138136
android:layout_alignParentEnd="true"
139137
android:layout_marginStart="@dimen/grid_margin_left"
140138
android:gravity="end"
141-
android:ellipsize="end"
142-
android:maxLines="1"
143139
android:paddingTop="@dimen/item_text_top_bottom_margin"
144140
tools:text="@string/text_placeholder"
145141
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption" />
@@ -176,8 +172,6 @@
176172
android:paddingEnd="@dimen/item_text_top_bottom_margin"
177173
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
178174
android:layout_toEndOf="@+id/client_id_label"
179-
android:ellipsize="end"
180-
android:maxLines="1"
181175
android:gravity="end"
182176
tools:text="@string/text_placeholder"
183177
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -213,8 +207,6 @@
213207
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
214208
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
215209
android:layout_toEndOf="@+id/charity_label"
216-
android:ellipsize="end"
217-
android:maxLines="1"
218210
android:gravity="end"
219211
tools:text="@string/text_placeholder"
220212
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -251,8 +243,6 @@
251243
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
252244
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
253245
android:layout_toEndOf="@+id/check_number_label"
254-
android:ellipsize="end"
255-
android:maxLines="1"
256246
android:gravity="end"
257247
tools:text="@string/text_placeholder"
258248
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -289,8 +279,6 @@
289279
android:layout_marginStart="@dimen/item_text_top_bottom_margin"
290280
android:layout_marginTop="@dimen/item_text_top_bottom_margin"
291281
android:layout_toEndOf="@+id/website_label"
292-
android:ellipsize="end"
293-
android:maxLines="1"
294282
android:gravity="end"
295283
tools:text="@string/text_placeholder"
296284
android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -397,8 +385,6 @@
397385
android:layout_alignParentTop="true"
398386
android:layout_alignParentEnd="true"
399387
android:gravity="end"
400-
android:ellipsize="end"
401-
android:maxLines="1"
402388
android:layout_marginStart="@dimen/grid_margin_left"
403389
android:layout_toEndOf="@+id/details_amount_label"
404390
android:layout_marginTop="@dimen/grid_margin_top"
@@ -437,8 +423,6 @@
437423
android:layout_alignParentTop="true"
438424
android:layout_alignParentEnd="true"
439425
android:gravity="end"
440-
android:ellipsize="end"
441-
android:maxLines="1"
442426
android:layout_marginStart="@dimen/grid_margin_left"
443427
android:layout_toEndOf="@+id/details_fee_label"
444428
android:layout_marginTop="@dimen/grid_margin_top"
@@ -477,8 +461,6 @@
477461
android:layout_alignParentTop="true"
478462
android:layout_alignParentEnd="true"
479463
android:gravity="end"
480-
android:ellipsize="end"
481-
android:maxLines="1"
482464
android:layout_marginStart="@dimen/grid_margin_left"
483465
android:layout_toEndOf="@+id/details_transfer_amount_label"
484466
android:layout_marginTop="@dimen/grid_margin_top"

receiptui/src/main/res/layout/item_receipt.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
android:id="@+id/receipt_item"
44
style="@style/ReceiptItem"
55
android:layout_marginStart="@dimen/grid_margin_left"
6+
android:orientation="vertical"
67
android:layout_marginEnd="@dimen/grid_margin_right"
78
android:layout_width="match_parent"
8-
android:layout_height="@dimen/item_receipt_information_height">
9+
android:layout_height="wrap_content">
910

10-
<include layout="@layout/receipt" />
11+
<include layout="@layout/receipt"/>
1112

1213
<View
1314
android:layout_width="match_parent"

receiptui/src/main/res/layout/item_receipt_with_header.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
android:layout_width="match_parent"
2929
android:layout_marginStart="@dimen/grid_margin_left"
3030
android:layout_marginEnd="@dimen/grid_margin_right"
31-
android:layout_height="@dimen/item_receipt_information_height">
31+
android:layout_height="wrap_content">
3232

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

receiptui/src/main/res/layout/receipt.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
android:layout_width="0dp"
1515
android:layout_height="wrap_content"
1616
android:text="@string/text_placeholder"
17-
android:ellipsize="end"
18-
android:maxLines="1"
1917
style="@style/ReceiptTitle"
2018
app:layout_constraintEnd_toStartOf="@+id/transaction_amount"
2119
app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
2220
app:layout_constraintTop_toTopOf="parent" />
2321

24-
<TextView android:id="@+id/transaction_date"
25-
android:layout_width="wrap_content"
22+
<TextView
23+
android:id="@+id/transaction_date"
24+
style="@style/ReceiptDate"
25+
android:layout_width="0dp"
2626
android:layout_height="wrap_content"
2727
android:text="@string/text_placeholder"
28-
style="@style/ReceiptDate"
2928
app:layout_constraintBottom_toBottomOf="parent"
29+
app:layout_constraintEnd_toStartOf="@+id/transaction_currency"
3030
app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
3131
app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
3232

0 commit comments

Comments
 (0)