MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-19 13:22:06 +02:00
Code Releases Wiki Activity

use native isToday method

Browse Source
This commit is contained in:
vanous 2021-09-26 20:29:54 +02:00
parent dc42faa6fb
commit 2bd90a0d5a
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
View File

@ -21,6 +21,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.text.format.DateUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -157,30 +158,13 @@ public class ActivityListingChartFragment extends AbstractChartFragment {
stepsDateView.setText(DateTimeUtils.formatDate(activityDate)); stepsDateView.setText(DateTimeUtils.formatDate(activityDate));
if (GBApplication.getPrefs().getBoolean("charts_show_ongoing_activity", true)) { 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()); showOngoingActivitySnackbar(mcd.getOngoingSession());
} }
} }
stepListAdapter.setItems(mcd.getStepSessions(), true); 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 @Override
protected void renderCharts() { protected void renderCharts() {
} }