From 2bd90a0d5aaafdb1d37c6efe9c95af2b6b36014f Mon Sep 17 00:00:00 2001 From: vanous Date: Sun, 26 Sep 2021 20:29:54 +0200 Subject: [PATCH] use native isToday method --- .../charts/ActivityListingChartFragment.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) 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 618c94921..386c9a0d5 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 @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; +import android.text.format.DateUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -157,30 +158,13 @@ public class ActivityListingChartFragment extends AbstractChartFragment { stepsDateView.setText(DateTimeUtils.formatDate(activityDate)); if (GBApplication.getPrefs().getBoolean("charts_show_ongoing_activity", true)) { - if (mcd.getOngoingSession() != null && isActivityToday(activityDate)) { + if (mcd.getOngoingSession() != null && DateUtils.isToday(activityDate.getTime())) { showOngoingActivitySnackbar(mcd.getOngoingSession()); } } stepListAdapter.setItems(mcd.getStepSessions(), true); } - private boolean isActivityToday(Date activityDate) { - Calendar calendarActivity = GregorianCalendar.getInstance(); - calendarActivity.setTime(activityDate); - calendarActivity.set(Calendar.HOUR_OF_DAY, 0); - calendarActivity.set(Calendar.MINUTE, 0); - calendarActivity.set(Calendar.SECOND, 0); - calendarActivity.set(Calendar.MILLISECOND, 0); - - Calendar calendarToday = GregorianCalendar.getInstance(); - calendarToday.set(Calendar.HOUR_OF_DAY, 0); - calendarToday.set(Calendar.MINUTE, 0); - calendarToday.set(Calendar.SECOND, 0); - calendarToday.set(Calendar.MILLISECOND, 0); - - return calendarToday.equals(calendarActivity); - } - @Override protected void renderCharts() { }