Skip to content

Commit 15a9ccb

Browse files
committed
fix: solve various issues with task display
Fixes #10
1 parent 098a529 commit 15a9ccb

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

app/src/main/java/tech/akpmakes/android/taskkeeper/firebase/WhenEventViewHolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ private static String millisToShortDHMS(long duration, String extra) {
9090
res = String.format(Locale.ENGLISH, "%02d:%02d:%02d", hours, minutes, seconds);
9191
}
9292
else if (days == 1) {
93-
res = String.format(Locale.ENGLISH, "%d day \r\n%02d:%02d:%02d", days, hours, minutes, seconds);
93+
res = String.format(Locale.ENGLISH, "%d day\n%02d:%02d:%02d", days, hours, minutes, seconds);
9494
}
9595
else {
96-
res = String.format(Locale.ENGLISH, "%d days \r\n%02d:%02d:%02d", days, hours, minutes, seconds);
96+
res = String.format(Locale.ENGLISH, "%d days\n%02d:%02d:%02d", days, hours, minutes, seconds);
9797
}
9898
return extra + res;
9999
}

app/src/main/res/layout/item_whenevent.xml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,47 @@
66
android:layout_height="wrap_content"
77
android:clickable="true"
88
android:focusable="true"
9-
android:foreground="?android:attr/selectableItemBackground">
9+
android:foreground="?android:attr/selectableItemBackground"
10+
android:minHeight="60dp">
1011

1112
<TextView
1213
android:id="@+id/event_name"
1314
android:layout_width="wrap_content"
1415
android:layout_height="wrap_content"
1516
android:gravity="start|center_vertical"
17+
android:layout_centerVertical="true"
1618
android:textAlignment="textStart"
1719
android:textAppearance="@style/TextAppearance.AppCompat.Large"
1820
android:minHeight="?android:attr/listPreferredItemHeightSmall"
19-
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
20-
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
21-
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
22-
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
21+
android:paddingEnd="@dimen/item_padding"
22+
android:paddingLeft="@dimen/item_padding"
23+
android:paddingRight="@dimen/item_padding"
24+
android:paddingStart="@dimen/item_padding"
25+
android:paddingTop="@dimen/item_padding"
26+
android:paddingBottom="@dimen/item_padding"
2327
android:layout_alignParentLeft="true"
2428
android:layout_alignParentStart="true"
2529
android:layout_toStartOf="@+id/event_time"
2630
android:layout_toLeftOf="@+id/event_time"
27-
tools:text="An Event" />
31+
tools:text="An Event \ntwo lines\nthree lines" />
2832

2933
<TextView
3034
android:id="@+id/event_time"
3135
android:layout_width="wrap_content"
3236
android:layout_height="wrap_content"
3337
android:gravity="end|center_vertical"
34-
android:textAlignment="textEnd"
38+
android:layout_centerVertical="true"
39+
android:textAlignment="viewEnd"
3540
android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
3641
android:minHeight="?android:attr/listPreferredItemHeightSmall"
37-
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
38-
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
39-
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
40-
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
42+
android:paddingEnd="@dimen/item_padding"
43+
android:paddingRight="@dimen/item_padding"
44+
android:paddingStart="@dimen/item_padding"
45+
android:paddingLeft="@dimen/item_padding"
46+
android:paddingTop="@dimen/item_padding"
47+
android:paddingBottom="@dimen/item_padding"
4148
android:layout_alignParentRight="true"
42-
android:layout_alignParentEnd="true" />
49+
android:layout_alignParentEnd="true"
50+
tools:text="15 days\n00:00:00"/>
4351

4452
</RelativeLayout>

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
<dimen name="desc_padding">40dp</dimen>
1212
<dimen name="fab_margin">16dp</dimen>
1313
<dimen name="appbar_padding_top">8dp</dimen>
14+
<dimen name="item_padding">8dp</dimen>
1415
</resources>

0 commit comments

Comments
 (0)