MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-21 14:51:10 +01:00
Code Releases Wiki Activity

Activity list - move activity label below, revert background color set

Browse Source
This commit is contained in:
a0z 2024-10-08 19:17:37 +02:00 committed by José Rebelo
parent cdaf78cbbc
commit cac9b702a2
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityListItem.java
View File

@ -93,9 +93,10 @@ public class ActivityListItem {
final boolean selected) { final boolean selected) {
final String activityKindLabel = activityKind.getLabel(activityName.getContext()); final String activityKindLabel = activityKind.getLabel(activityName.getContext());
if (StringUtils.isNotBlank(activityLabel)) { if (StringUtils.isNotBlank(activityLabel)) {
activityLabelText.setText(String.format(" (%s)", activityKindLabel)); activityLabelText.setText(String.format("%s", activityKindLabel));
activityName.setText(String.format("%s", activityLabel)); activityName.setText(String.format("%s", activityLabel));
} else { } else {
activityLabelText.setVisibility(View.GONE);
activityName.setText(String.format("%s", activityKindLabel)); activityName.setText(String.format("%s", activityKindLabel));
} }
durationLabel.setText(DateTimeUtils.formatDurationHoursMinutes(duration, TimeUnit.MILLISECONDS)); durationLabel.setText(DateTimeUtils.formatDurationHoursMinutes(duration, TimeUnit.MILLISECONDS));
@ -155,6 +156,8 @@ public class ActivityListItem {
if (parentLayout != null) { if (parentLayout != null) {
if (selected) { if (selected) {
parentLayout.setBackgroundColor(selectedColor); parentLayout.setBackgroundColor(selectedColor);
} else {
parentLayout.setBackgroundColor(backgroundColor);
} }
} }
} }

73
app/src/main/res/layout/activity_list_item.xml
View File

@ -71,46 +71,49 @@
android:minHeight="50dp" android:minHeight="50dp"
> >
<LinearLayout <TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="top" android:gravity="top"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:shrinkColumns="0"
> >
<TextView <TableRow
android:id="@+id/line_layout_activity_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:gravity="center_vertical">
android:layout_weight="0" <TextView
android:scrollHorizontally="false" android:id="@+id/line_layout_activity_name"
android:text="@string/unknown" android:layout_width="wrap_content"
android:textStyle="bold" android:layout_height="wrap_content"
android:textSize="16sp" android:layout_weight="0"
/> android:scrollHorizontally="false"
<TextView android:text="@string/unknown"
android:id="@+id/line_layout_activity_label" android:textStyle="bold"
android:layout_width="wrap_content" android:textSize="16sp"
android:layout_height="wrap_content" android:singleLine="true"
android:maxLines="1" android:ellipsize="end"
android:layout_weight="0" />
android:scrollHorizontally="false" <TextView
/> android:gravity="end|top"
android:layout_gravity="top"
<TextView android:id="@+id/line_layout_date_label"
android:gravity="end" android:layout_width="wrap_content"
android:id="@+id/line_layout_date_label" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" android:scrollHorizontally="false"
android:layout_weight="1" android:text="@string/stats_empty_value"
android:maxLines="1" android:singleLine="true"
android:scrollHorizontally="false" android:ellipsize="none"
android:text="@string/stats_empty_value" />
/> </TableRow>
</TableLayout>
</LinearLayout> <TextView
android:id="@+id/line_layout_activity_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"