demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-25 08:05:55 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

display dates

Browse Source
This commit is contained in:
vanous 2022-07-28 22:45:24 +02:00
parent 8fb644dd00
commit c592597f84
4 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepStreaksDashboard.java
View File

@ -107,6 +107,7 @@ public class StepStreaksDashboard extends DialogFragment {
TextView days_current = current.findViewById(R.id.step_streak_days_value);
TextView average_current = current.findViewById(R.id.step_streak_average_value);
TextView total_current = current.findViewById(R.id.step_streak_total_value);
TextView date_current_value = current.findViewById(R.id.step_streak_current_date_value);
LinearLayout maximum = getView().findViewById(R.id.step_streak_maximum_layout);
TextView days_maximum = maximum.findViewById(R.id.step_streak_days_value);
@ -118,12 +119,15 @@ public class StepStreaksDashboard extends DialogFragment {
TextView days_total = total.findViewById(R.id.step_streak_days_value);
TextView days_total_label = total.findViewById(R.id.step_streak_days_label);
TextView total_total = total.findViewById(R.id.step_streak_total_value);
TextView date_total_value = total.findViewById(R.id.step_streak_total_date_value);
if (stepsStreaks.current.days > 0) {
current.setVisibility(View.VISIBLE);
days_current.setText(Integer.toString(stepsStreaks.current.days));
average_current.setText(Integer.toString(stepsStreaks.current.steps / stepsStreaks.current.days));
total_current.setText(Integer.toString(stepsStreaks.current.steps));
date_current_value.setText(String.format("From %s", DateTimeUtils.formatDate(new Date(stepsStreaks.current.timestamp * 1000l))));
}
if (stepsStreaks.maximum.days > 0) {
@ -131,8 +135,12 @@ public class StepStreaksDashboard extends DialogFragment {
days_maximum.setText(Integer.toString(stepsStreaks.maximum.days));
average_maximum.setText(Integer.toString(stepsStreaks.maximum.steps / stepsStreaks.maximum.days));
total_maximum.setText(Integer.toString(stepsStreaks.maximum.steps));
date_maximum_value.setText(DateTimeUtils.formatDate(new Date(stepsStreaks.maximum.timestamp * 1000l)));
LOG.debug("petr " + stepsStreaks.total.timestamp);
Date startDate = new Date(stepsStreaks.maximum.timestamp * 1000l);
Date endDate = DateTimeUtils.shiftByDays(startDate, stepsStreaks.maximum.days - 1); //first day is 1 not 0
//date_maximum_value.setText(DateTimeUtils.formatDate(new Date(stepsStreaks.maximum.timestamp * 1000l)));
date_maximum_value.setText(DateTimeUtils.formatDateRange(startDate, endDate));
}
if (stepsStreaks.total.steps > 0 || backgroundFinished) {
total.setVisibility(View.VISIBLE);
@ -141,6 +149,12 @@ public class StepStreaksDashboard extends DialogFragment {
if (stepsStreaks.total.total_days > 0) {
days_total.setText(String.format("%.1f%%", (float) stepsStreaks.total.days / stepsStreaks.total.total_days * 100));
}
if (stepsStreaks.total.timestamp > 0) {
date_total_value.setVisibility(View.VISIBLE);
date_total_value.setText(String.format("Since %s", DateTimeUtils.formatDate(new Date(stepsStreaks.total.timestamp * 1000l))));
} else {
date_total_value.setVisibility(View.GONE);
}
total_total.setText(Integer.toString(stepsStreaks.total.steps));
}
}
@ -195,18 +209,18 @@ public class StepStreaksDashboard extends DialogFragment {
Calendar day = Calendar.getInstance();
int streak_steps = 0;
int streak_days = 0;
int timestamp = (int) (day.getTimeInMillis() / 1000);
int timestamp = 0;
int all_step_days = 0;
int all_streak_days = 0;
int all_steps = 0;
int firstDataTimestamp = 0;
DailyTotals dailyTotals = new DailyTotals();
ActivitySample firstSample = dailyTotals.getFirstSample(db, device);
Calendar firstDate = Calendar.getInstance();
firstDate.setTime(DateTimeUtils.shiftByDays(new Date(firstSample.getTimestamp() * 1000l), -1));
//go one day back, to ensure we are before the first day, to calculate first day data as well
//NOTE: getting the first sample as a first day reference is not reliable
while (true) {
if (cancelTasks) {
@ -220,12 +234,14 @@ public class StepStreaksDashboard extends DialogFragment {
if (steps_this_day > 0) {
all_step_days++;
all_steps += steps_this_day;
firstDataTimestamp = (int) (day.getTimeInMillis() / 1000);
}
if (steps_this_day >= goal) {
streak_steps += steps_this_day;
streak_days++;
all_streak_days++;
timestamp = (int) (day.getTimeInMillis() / 1000);
Date newDate = DateTimeUtils.shiftByDays(new Date(day.getTimeInMillis()), -1);
day.setTime(newDate);
} else if (DateUtils.isToday(day.getTimeInMillis())) {
@ -237,6 +253,7 @@ public class StepStreaksDashboard extends DialogFragment {
if (period.equals("current")) {
stepsStreaks.current.days = streak_days;
stepsStreaks.current.steps = streak_steps;
stepsStreaks.current.timestamp = timestamp;
return;
} else if (period.equals("totals")) {
//reset max
@ -248,13 +265,13 @@ public class StepStreaksDashboard extends DialogFragment {
stepsStreaks.total.steps = all_steps;
stepsStreaks.total.days = all_streak_days;
stepsStreaks.total.total_days = all_step_days;
stepsStreaks.total.timestamp = firstDataTimestamp;
streak_days = 0;
streak_steps = 0;
Date newDate = DateTimeUtils.shiftByDays(new Date(day.getTimeInMillis()), -1);
day.setTime(newDate);
timestamp = (int) (day.getTimeInMillis() / 1000);
if (day.before(firstDate) || day.get(Calendar.YEAR) < 2015) { //avoid rolling back too far
if (day.before(firstDate) || day.get(Calendar.YEAR) < 2015) { //avoid rolling back too far, if the data has a timestamp 0 (Fossil...)
return;
}
}

15
app/src/main/res/layout/steps_streak_current_line_layout.xml
View File

@ -5,8 +5,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="20dp"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
@ -23,6 +22,18 @@
android:textSize="24sp"
android:textStyle="bold" />
<TextView
android:id="@+id/step_streak_current_date_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:layout_weight="1"
android:gravity="center"
android:maxLines="2"
android:scrollHorizontally="false"
android:text="date" />
<LinearLayout
android:layout_width="match_parent"

3
app/src/main/res/layout/steps_streak_maximum_line_layout.xml
View File

@ -33,8 +33,7 @@
android:gravity="center"
android:maxLines="2"
android:scrollHorizontally="false"
android:text="date"
/>
android:text="date" />
<LinearLayout

12
app/src/main/res/layout/steps_streak_total_line_layout.xml
View File

@ -23,6 +23,18 @@
android:textSize="24sp"
android:textStyle="bold" />
<TextView
android:id="@+id/step_streak_total_date_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:layout_weight="1"
android:gravity="center"
android:maxLines="2"
android:scrollHorizontally="false"
android:text="date" />
<LinearLayout
android:layout_width="match_parent"