mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2025-01-26 01:27:33 +01:00
Sleep score: widget
This commit is contained in:
parent
4374a61c40
commit
d1e19df3fe
@ -71,6 +71,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardCalori
|
|||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardDistanceWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardDistanceWidget;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardGoalsWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardGoalsWidget;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardHrvWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardHrvWidget;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardSleepScoreWidget;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardSleepWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardSleepWidget;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardStepsWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardStepsWidget;
|
||||||
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardStressBreakdownWidget;
|
import nodomain.freeyourgadget.gadgetbridge.activities.dashboard.DashboardStressBreakdownWidget;
|
||||||
@ -318,6 +319,9 @@ public class DashboardFragment extends Fragment implements MenuProvider {
|
|||||||
case "calories_segmented":
|
case "calories_segmented":
|
||||||
widget = DashboardCaloriesTotalSegmentedWidget.newInstance(dashboardData);
|
widget = DashboardCaloriesTotalSegmentedWidget.newInstance(dashboardData);
|
||||||
break;
|
break;
|
||||||
|
case "sleepscore":
|
||||||
|
widget = DashboardSleepScoreWidget.newInstance(dashboardData);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
LOG.error("Unknown dashboard widget {}", widgetName);
|
LOG.error("Unknown dashboard widget {}", widgetName);
|
||||||
continue;
|
continue;
|
||||||
|
@ -0,0 +1,105 @@
|
|||||||
|
/* Copyright (C) 2023-2024 a0z
|
||||||
|
|
||||||
|
This file is part of Gadgetbridge.
|
||||||
|
|
||||||
|
Gadgetbridge is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
Gadgetbridge is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
package nodomain.freeyourgadget.gadgetbridge.activities.dashboard;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.R;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.activities.DashboardFragment;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.devices.TimeSampleProvider;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
|
||||||
|
import nodomain.freeyourgadget.gadgetbridge.model.SleepScoreSample;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple {@link AbstractDashboardWidget} subclass.
|
||||||
|
* Use the {@link DashboardSleepScoreWidget#newInstance} factory method to
|
||||||
|
* create an instance of this fragment.
|
||||||
|
*/
|
||||||
|
public class DashboardSleepScoreWidget extends AbstractGaugeWidget {
|
||||||
|
protected static final Logger LOG = LoggerFactory.getLogger(AbstractDashboardVO2MaxWidget.class);
|
||||||
|
public DashboardSleepScoreWidget() {
|
||||||
|
super(R.string.sleep_score, "sleep");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use this factory method to create a new instance of
|
||||||
|
* this fragment using the provided parameters.
|
||||||
|
*
|
||||||
|
* @param dashboardData An instance of DashboardFragment.DashboardData.
|
||||||
|
* @return A new instance of fragment DashboardSleepScoreWidget.
|
||||||
|
*/
|
||||||
|
public static DashboardSleepScoreWidget newInstance(final DashboardFragment.DashboardData dashboardData) {
|
||||||
|
final DashboardSleepScoreWidget fragment = new DashboardSleepScoreWidget();
|
||||||
|
final Bundle args = new Bundle();
|
||||||
|
args.putSerializable(ARG_DASHBOARD_DATA, dashboardData);
|
||||||
|
fragment.setArguments(args);
|
||||||
|
return fragment;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void populateData(final DashboardFragment.DashboardData dashboardData) {
|
||||||
|
final List<GBDevice> devices = getSupportedDevices(dashboardData);
|
||||||
|
final SleepScoreData data = new SleepScoreData();
|
||||||
|
|
||||||
|
SleepScoreSample sample = null;
|
||||||
|
try (DBHandler dbHandler = GBApplication.acquireDB()) {
|
||||||
|
for (GBDevice dev : devices) {
|
||||||
|
TimeSampleProvider<? extends SleepScoreSample> provider = dev.getDeviceCoordinator().getSleepScoreProvider(dev, dbHandler.getDaoSession());
|
||||||
|
final SleepScoreSample latestSample = provider.getLatestSample(dashboardData.timeTo * 1000L);
|
||||||
|
if (latestSample != null && (sample == null || latestSample.getTimestamp() > sample.getTimestamp())) {
|
||||||
|
sample = latestSample;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sample != null) {
|
||||||
|
data.value = sample.getSleepScore();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (final Exception e) {
|
||||||
|
LOG.error("Could not get vo2max for today", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
dashboardData.put("sleepscore", data);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void draw(final DashboardFragment.DashboardData dashboardData) {
|
||||||
|
final SleepScoreData data = (SleepScoreData) dashboardData.get("sleepscore");
|
||||||
|
setText(String.valueOf(data.value));
|
||||||
|
drawSimpleGauge(
|
||||||
|
color_light_sleep,
|
||||||
|
(float) data.value / 100
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isSupportedBy(final GBDevice device) {
|
||||||
|
return device.getDeviceCoordinator().supportsSleepScore();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class SleepScoreData implements Serializable {
|
||||||
|
public int value = -1;
|
||||||
|
}
|
||||||
|
}
|
@ -4428,6 +4428,7 @@
|
|||||||
<item>@string/distance</item>
|
<item>@string/distance</item>
|
||||||
<item>@string/active_time</item>
|
<item>@string/active_time</item>
|
||||||
<item>@string/menuitem_sleep</item>
|
<item>@string/menuitem_sleep</item>
|
||||||
|
<item>@string/sleep_score</item>
|
||||||
<item>@string/body_energy</item>
|
<item>@string/body_energy</item>
|
||||||
<item>@string/menuitem_stress_simple</item>
|
<item>@string/menuitem_stress_simple</item>
|
||||||
<item>@string/menuitem_stress_segmented</item>
|
<item>@string/menuitem_stress_segmented</item>
|
||||||
@ -4447,6 +4448,7 @@
|
|||||||
<item>distance</item>
|
<item>distance</item>
|
||||||
<item>activetime</item>
|
<item>activetime</item>
|
||||||
<item>sleep</item>
|
<item>sleep</item>
|
||||||
|
<item>sleepscore</item>
|
||||||
<item>bodyenergy</item>
|
<item>bodyenergy</item>
|
||||||
<item>stress_simple</item>
|
<item>stress_simple</item>
|
||||||
<item>stress_segmented</item>
|
<item>stress_segmented</item>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user