demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix nautical units

Browse Source
This commit is contained in:
José Rebelo
2026-03-25 17:29:44 +00:00
parent 5b161d7e5e
commit b3ae7607fc
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutDetailsFragment.kt
+2
View File
@@ -211,6 +211,8 @@ class WorkoutDetailsFragment : Fragment(), MenuProvider {
) )
currentWorkout?.let { workout -> currentWorkout?.let { workout ->
workoutValueFormatter.setActivityKind(ActivityKind.fromCode(workout.summary.activityKind))
updateWorkoutHeader(workout.summary) updateWorkoutHeader(workout.summary)
updateWorkoutDetails(workout) updateWorkoutDetails(workout)
updateFragments(workout) updateFragments(workout)
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutValueFormatter.java
+8 -5
View File
@@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit;
import nodomain.freeyourgadget.gadgetbridge.BuildConfig; import nodomain.freeyourgadget.gadgetbridge.BuildConfig;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.SettingsActivity;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind; import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries; import nodomain.freeyourgadget.gadgetbridge.model.ActivitySummaryEntries;
import nodomain.freeyourgadget.gadgetbridge.model.DistanceUnit; import nodomain.freeyourgadget.gadgetbridge.model.DistanceUnit;
@@ -42,7 +41,7 @@ public class WorkoutValueFormatter {
private boolean show_raw_data = false; private boolean show_raw_data = false;
private final ActivityKind activityKind; private ActivityKind activityKind;
private final DistanceUnit distanceUnit; private final DistanceUnit distanceUnit;
private final WeightUnit weightUnit; private final WeightUnit weightUnit;
private final boolean useNauticalUnits; private final boolean useNauticalUnits;
@@ -56,7 +55,11 @@ public class WorkoutValueFormatter {
this.activityKind = activityKind; this.activityKind = activityKind;
this.distanceUnit = GBApplication.getPrefs().getDistanceUnit(); this.distanceUnit = GBApplication.getPrefs().getDistanceUnit();
this.weightUnit = GBApplication.getPrefs().getWeightUnit(); this.weightUnit = GBApplication.getPrefs().getWeightUnit();
this.useNauticalUnits = ActivityKind.isNauticalActivity(activityKind) && GBApplication.getPrefs().getBoolean("units_nautical", true); this.useNauticalUnits = GBApplication.getPrefs().getBoolean("units_nautical", true);
}
public void setActivityKind(final ActivityKind activityKind) {
this.activityKind = activityKind;
} }
public void toggleRawData() { public void toggleRawData() {
@@ -152,7 +155,7 @@ public class WorkoutValueFormatter {
} }
break; break;
case UNIT_METERS: case UNIT_METERS:
if (useNauticalUnits) { if (useNauticalUnits && ActivityKind.isNauticalActivity(activityKind)) {
value = value / 1852D; value = value / 1852D;
unit = UNIT_NAUTICAL_MILES; unit = UNIT_NAUTICAL_MILES;
} else if (distanceUnit == DistanceUnit.IMPERIAL) { } else if (distanceUnit == DistanceUnit.IMPERIAL) {
@@ -170,7 +173,7 @@ public class WorkoutValueFormatter {
} }
break; break;
case UNIT_KMPH: case UNIT_KMPH:
if (useNauticalUnits) { if (useNauticalUnits && ActivityKind.isNauticalActivity(activityKind)) {
value = value / 1.852D; value = value / 1.852D;
unit = UNIT_KNOTS; unit = UNIT_KNOTS;
} else if (distanceUnit == DistanceUnit.IMPERIAL) { } else if (distanceUnit == DistanceUnit.IMPERIAL) {