From 08fec63892a6a3170a2b917a676aaa0a7e98510a Mon Sep 17 00:00:00 2001
From: Simon Brand <simon.brand@postadigitale.de>
Date: Thu, 2 Jan 2025 05:40:10 +0000
Subject: [PATCH] Move formatting of date periods to a shared file

---
 .../activities/charts/RespiratoryRatePeriodFragment.java | 7 +++----
 .../activities/charts/StepsPeriodFragment.java           | 9 ++-------
 .../activities/charts/WeekSleepChartFragment.java        | 7 +------
 .../activities/charts/WeightChartFragment.java           | 7 +------
 .../freeyourgadget/gadgetbridge/util/DateTimeUtils.java  | 8 ++++++++
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/RespiratoryRatePeriodFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/RespiratoryRatePeriodFragment.java
index 80b9cf3ce..5639d7a90 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/RespiratoryRatePeriodFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/RespiratoryRatePeriodFragment.java
@@ -33,6 +33,7 @@ import java.util.Locale;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public class RespiratoryRatePeriodFragment extends RespiratoryRateFragment<RespiratoryRatePeriodFragment.RespiratoryRateData> {
     protected static final Logger LOG = LoggerFactory.getLogger(BodyEnergyFragment.class);
@@ -121,10 +122,8 @@ public class RespiratoryRatePeriodFragment extends RespiratoryRateFragment<Respi
     protected RespiratoryRateData refreshInBackground(ChartsHost chartsHost, DBHandler db, GBDevice device) {
         Calendar day = Calendar.getInstance();
         Date to = new Date((long) this.getTSEnd() * 1000);
-        Date from = DateUtils.addDays(to,-(TOTAL_DAYS - 1));
-        String toFormattedDate = new SimpleDateFormat("E, MMM dd").format(to);
-        String fromFormattedDate = new SimpleDateFormat("E, MMM dd").format(from);
-        mDateView.setText(fromFormattedDate + " - " + toFormattedDate);
+        mDateView.setText(DateTimeUtils.formatDaysUntil(TOTAL_DAYS, getTSEnd()));
+
         day.setTime(to);
         List<RespiratoryRateDay> respiratoryRateDaysData = getMyRespiratoryRateDaysData(db, day, device);
         return new RespiratoryRateData(respiratoryRateDaysData);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
index 9eddb3443..1f2ddc56e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
@@ -19,7 +19,6 @@ import com.github.mikephil.charting.data.BarDataSet;
 import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.formatter.ValueFormatter;
 
-import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +35,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.workouts.WorkoutValueForm
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
+import nodomain.freeyourgadget.gadgetbridge.util.DateTimeUtils;
 
 public class StepsPeriodFragment extends StepsFragment<StepsPeriodFragment.StepsData> {
     protected static final Logger LOG = LoggerFactory.getLogger(BodyEnergyFragment.class);
@@ -164,12 +164,7 @@ public class StepsPeriodFragment extends StepsFragment<StepsPeriodFragment.Steps
 
     @Override
     protected void updateChartsnUIThread(StepsData stepsData) {
-        Date to = new Date((long) getTSEnd() * 1000);
-        Date from = DateUtils.addDays(to, -(TOTAL_DAYS - 1));
-        String toFormattedDate = new SimpleDateFormat("E, MMM dd").format(to);
-        String fromFormattedDate = new SimpleDateFormat("E, MMM dd").format(from);
-        mDateView.setText(fromFormattedDate + " - " + toFormattedDate);
-
+        mDateView.setText(DateTimeUtils.formatDaysUntil(TOTAL_DAYS, getTSEnd()));
         stepsChart.setData(null);
 
         List<BarEntry> entries = new ArrayList<>();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
index 655920fc6..c5e32f447 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekSleepChartFragment.java
@@ -37,7 +37,6 @@ import com.github.mikephil.charting.formatter.ValueFormatter;
 import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.time.DateUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -221,11 +220,7 @@ public class WeekSleepChartFragment extends AbstractWeekChartFragment {
             awakeSleepTimeTextWrapper.setVisibility(View.GONE);
         }
 
-        Date to = new Date((long) this.getTSEnd() * 1000);
-        Date from = DateUtils.addDays(to,-(TOTAL_DAYS - 1));
-        String toFormattedDate = new SimpleDateFormat("E, MMM dd").format(to);
-        String fromFormattedDate = new SimpleDateFormat("E, MMM dd").format(from);
-        sleepDatesText.setText(fromFormattedDate + " - " + toFormattedDate);
+        sleepDatesText.setText(DateTimeUtils.formatDaysUntil(TOTAL_DAYS, getTSEnd()));
 
         mBalanceView.setText(mcd.getWeekBeforeData().getBalanceMessage());
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeightChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeightChartFragment.java
index 265318113..636fd0072 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeightChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeightChartFragment.java
@@ -126,14 +126,9 @@ public class WeightChartFragment extends AbstractChartFragment<WeightChartFragme
         chart.getXAxis().setValueFormatter(chartsData.getXValueFormatter());
         chart.getXAxis().setAvoidFirstLastClipping(true);
         chart.setData(chartsData.getData());
+        textTimeSpan.setText(DateTimeUtils.formatDaysUntil(totalDays, getTSEnd()));
 
-        Date dateStart = DateTimeUtils.parseTimeStamp(getTSStart());
-        Date dateEnd = DateTimeUtils.parseTimeStamp(getTSEnd());
-        SimpleDateFormat format = new SimpleDateFormat("E, MMM dd");
         WeightSample latestSample = chartsData.getLatestSample();
-
-        textTimeSpan.setText(format.format(dateStart) + " - " + format.format(dateEnd));
-
         if (latestSample != null)
             textWeightLatest.setText(formatWeight(weightFromKg(latestSample.getWeightKg())));
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
index e8f2dd58d..e28dfc06c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java
@@ -319,4 +319,12 @@ public class DateTimeUtils {
 
         return context.getString(R.string.unknown);
     }
+
+    public static String formatDaysUntil(int days, int endTs) {
+        Date to = new Date((long) endTs * 1000);
+        Date from = org.apache.commons.lang3.time.DateUtils.addDays(to, - (days - 1));
+        String toFormattedDate = new SimpleDateFormat("E, MMM dd").format(to);
+        String fromFormattedDate = new SimpleDateFormat("E, MMM dd").format(from);
+        return fromFormattedDate + " - " + toFormattedDate;
+    }
 }