From b364029f828fc450f9b9f2e287cf3fadcbe4bbc5 Mon Sep 17 00:00:00 2001 From: vanous Date: Tue, 27 Oct 2020 09:00:42 +0100 Subject: [PATCH] Level up icons in Activity List. Improve empty record. --- app/src/main/assets/ic_distance.svg | 51 ++++---- app/src/main/assets/ic_intensity.svg | 110 +++--------------- app/src/main/assets/ic_shoe.svg | 90 +++----------- .../charts/ActivityListingChartFragment.java | 6 + app/src/main/res/drawable/ic_distance.xml | 23 +++- app/src/main/res/drawable/ic_intensity.xml | 17 ++- app/src/main/res/drawable/ic_shoe.xml | 12 +- .../main/res/layout/activity_list_item.xml | 45 ++++--- 8 files changed, 137 insertions(+), 217 deletions(-) diff --git a/app/src/main/assets/ic_distance.svg b/app/src/main/assets/ic_distance.svg index b95d0c897..64b6a4094 100644 --- a/app/src/main/assets/ic_distance.svg +++ b/app/src/main/assets/ic_distance.svg @@ -7,9 +7,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="19.146656" - viewBox="0 0 19.380181 19.146656" - width="19.38018" + height="24" + viewBox="0 0 24.170443 24" + width="24.170443" version="1.1" id="svg6" sodipodi:docname="ic_distance.svg" @@ -44,27 +44,38 @@ inkscape:snap-others="false" inkscape:object-nodes="false" inkscape:zoom="26.103965" - inkscape:cx="19.880713" - inkscape:cy="4.8398397" + inkscape:cx="22.380713" + inkscape:cy="6.9428897" inkscape:window-x="0" inkscape:window-y="38" inkscape:window-maximized="1" - inkscape:current-layer="svg6" /> + inkscape:current-layer="svg6" + inkscape:document-rotation="0" + lock-margins="true" + fit-margin-top="2.5" + fit-margin-left="2.5" + fit-margin-right="2.5" + fit-margin-bottom="2.5" /> - - - + + + + + diff --git a/app/src/main/assets/ic_intensity.svg b/app/src/main/assets/ic_intensity.svg index 4ea16fff8..c5ab1b9e5 100644 --- a/app/src/main/assets/ic_intensity.svg +++ b/app/src/main/assets/ic_intensity.svg @@ -1,94 +1,20 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/ic_shoe.svg b/app/src/main/assets/ic_shoe.svg index 0a2397a09..000a501a2 100644 --- a/app/src/main/assets/ic_shoe.svg +++ b/app/src/main/assets/ic_shoe.svg @@ -1,74 +1,20 @@ - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java index b4ab4aef8..87ece74df 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java @@ -20,6 +20,7 @@ package nodomain.freeyourgadget.gadgetbridge.activities.charts; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.text.format.DateUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -136,6 +137,11 @@ public class ActivityListingChartFragment extends AbstractChartFragment { //have an "Unknown Activity" in the list in case there are no active sessions List result = new ArrayList<>(); int tsTo = tsDateFrom + 24 * 60 * 60 - 1; + if (DateUtils.isToday(tsDateFrom * 1000L)) { + Calendar day = Calendar.getInstance(); + day.set(Calendar.SECOND, 0); + tsTo = (int) (day.getTimeInMillis() / 1000); + } result.add(new StepAnalysis.StepSession(new Date(tsDateFrom * 1000L), new Date(tsTo * 1000L), 0, 0, 0, 0, ActivityKind.TYPE_UNKNOWN)); return result; } diff --git a/app/src/main/res/drawable/ic_distance.xml b/app/src/main/res/drawable/ic_distance.xml index 38a179ace..ae3406c6e 100644 --- a/app/src/main/res/drawable/ic_distance.xml +++ b/app/src/main/res/drawable/ic_distance.xml @@ -1,5 +1,20 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/ic_intensity.xml b/app/src/main/res/drawable/ic_intensity.xml index d704ad81c..7063d2bc0 100644 --- a/app/src/main/res/drawable/ic_intensity.xml +++ b/app/src/main/res/drawable/ic_intensity.xml @@ -1,4 +1,15 @@ - - - + + + diff --git a/app/src/main/res/drawable/ic_shoe.xml b/app/src/main/res/drawable/ic_shoe.xml index 687dd8104..d0a11e64c 100644 --- a/app/src/main/res/drawable/ic_shoe.xml +++ b/app/src/main/res/drawable/ic_shoe.xml @@ -1,3 +1,11 @@ - - + + diff --git a/app/src/main/res/layout/activity_list_item.xml b/app/src/main/res/layout/activity_list_item.xml index e71dc4ee0..71c21b1f5 100644 --- a/app/src/main/res/layout/activity_list_item.xml +++ b/app/src/main/res/layout/activity_list_item.xml @@ -106,7 +106,7 @@ @@ -116,22 +116,23 @@ @@ -140,13 +141,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="start" - android:layout_marginStart="2dp" - android:layout_marginEnd="2dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:gravity="start" android:maxLines="1" android:scrollHorizontally="false" - android:text="2000" /> + android:text="15000" /> @@ -160,8 +160,8 @@ @@ -171,13 +171,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="start" - android:layout_marginStart="2dp" - android:layout_marginEnd="2dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:gravity="start" android:maxLines="1" android:scrollHorizontally="false" - android:text="200" /> + android:text="101" /> @@ -191,8 +190,8 @@ @@ -202,13 +201,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="start" - android:layout_marginStart="2dp" - android:layout_marginEnd="2dp" + android:layout_marginEnd="4dp" android:layout_weight="1" android:gravity="start" android:maxLines="1" android:scrollHorizontally="false" - android:text="2.5km" /> + android:text="15.1km" /> @@ -222,8 +220,8 @@ @@ -233,13 +231,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="start" - android:layout_marginStart="2dp" android:layout_marginEnd="2dp" android:layout_weight="1" android:gravity="start" android:maxLines="1" android:scrollHorizontally="false" - android:text="2.5km" /> + android:text="122" />