upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-07 11:53:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert metricUnits boolean into an enum.

Browse Source 
Fixes #1199.
This commit is contained in:
Dennis Guse
2022-04-26 22:00:53 +02:00
parent db5c9479df
commit a5b44175a3
34 changed files with 464 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/data/models/Distance.java
+28 -9
View File
@@ -5,6 +5,8 @@ import androidx.annotation.Nullable;
import java.util.Objects;
import de.dennisguse.opentracks.settings.UnitSystem;
public class Distance {
public static Distance of(double distance_m) {
@@ -43,11 +45,14 @@ public class Distance {
return of(0.1 * distance_dm);
}
public static Distance one(boolean metricUnit) {
if (metricUnit) {
return Distance.ofKilometer(1);
} else {
return Distance.ofMile(1);
public static Distance one(UnitSystem unitSystem) {
switch (unitSystem) {
case METRIC:
return Distance.ofKilometer(1);
case IMPERIAL:
return Distance.ofMile(1);
default:
throw new RuntimeException("Not implemented");
}
}
@@ -109,12 +114,26 @@ public class Distance {
return toKM() * UnitConversions.KM_TO_MI;
}
public double toKM_Miles(boolean metricUnit) {
return metricUnit ? toKM() : toMI();
public double toKM_Miles(UnitSystem unitSystem) {
switch (unitSystem) {
case METRIC:
return toKM();
case IMPERIAL:
return toMI();
default:
throw new RuntimeException("Not implemented");
}
}
public double toM_FT(boolean metricUnit) {
return metricUnit ? toM() : toFT();
public double toM_FT(UnitSystem unitSystem) {
switch (unitSystem) {
case METRIC:
return toM();
case IMPERIAL:
return toFT();
default:
throw new RuntimeException("Not implemented");
}
}
@Override
src/main/java/de/dennisguse/opentracks/data/models/DistanceFormatter.java
+34 -22
View File
@@ -4,7 +4,10 @@ import android.content.Context;
import android.content.res.Resources;
import android.util.Pair;
import androidx.annotation.Nullable;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.settings.UnitSystem;
import de.dennisguse.opentracks.util.StringUtils;
public class DistanceFormatter {
@@ -13,12 +16,13 @@ public class DistanceFormatter {
private final int decimalCount;
private final boolean metricUnits;
private final UnitSystem unitSystem;
private DistanceFormatter(Resources resources, int decimalCount, boolean metricUnits) {
private DistanceFormatter(Resources resources, int decimalCount, UnitSystem unitSystem) {
this.resources = resources;
this.decimalCount = decimalCount;
this.metricUnits = metricUnits;
this.unitSystem = unitSystem;
assert unitSystem != null;
}
public String formatDistance(Distance distance) {
@@ -34,26 +38,35 @@ public class DistanceFormatter {
/**
* Get the formatted distance with unit.
*
* @param metricUnits true to use metric unit
* @return the formatted distance (or null) and it's unit as {@link Pair}
*/
public Pair<String, String> getDistanceParts(Distance distance) {
if (distance.isInvalid()) {
return new Pair<>(null, resources.getString(metricUnits ? R.string.unit_meter : R.string.unit_feet));
switch (unitSystem) {
case METRIC:
return new Pair<>(null, resources.getString(R.string.unit_meter));
case IMPERIAL:
return new Pair<>(null, resources.getString(R.string.unit_feet));
default:
throw new RuntimeException("Not implemented");
}
}
if (metricUnits) {
if (distance.greaterThan(Distance.of(500))) {
return new Pair<>(StringUtils.formatDecimal(distance.toKM(), decimalCount), resources.getString(R.string.unit_kilometer));
} else {
return new Pair<>(StringUtils.formatDecimal(distance.toM(), decimalCount), resources.getString(R.string.unit_meter));
}
} else {
if (distance.greaterThan(Distance.ofMile(0.5))) {
return new Pair<>(StringUtils.formatDecimal(distance.toMI(), decimalCount), resources.getString(R.string.unit_mile));
} else {
return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
}
switch (unitSystem) {
case METRIC:
if (distance.greaterThan(Distance.of(500))) {
return new Pair<>(StringUtils.formatDecimal(distance.toKM(), decimalCount), resources.getString(R.string.unit_kilometer));
} else {
return new Pair<>(StringUtils.formatDecimal(distance.toM(), decimalCount), resources.getString(R.string.unit_meter));
}
case IMPERIAL:
if (distance.greaterThan(Distance.ofMile(0.5))) {
return new Pair<>(StringUtils.formatDecimal(distance.toMI(), decimalCount), resources.getString(R.string.unit_mile));
} else {
return new Pair<>(StringUtils.formatDecimal(distance.toFT(), decimalCount), resources.getString(R.string.unit_feet));
}
default:
throw new RuntimeException("Not implemented");
}
}
@@ -65,11 +78,10 @@ public class DistanceFormatter {
private int decimalCount;
private boolean metricUnits;
private UnitSystem unitSystem;
public Builder() {
decimalCount = 2;
metricUnits = true;
}
public Builder setDecimalCount(int decimalCount) {
@@ -77,13 +89,13 @@ public class DistanceFormatter {
return this;
}
public Builder setMetricUnits(boolean metricUnits) {
this.metricUnits = metricUnits;
public Builder setUnit(@Nullable UnitSystem unitSystem) {
this.unitSystem = unitSystem;
return this;
}
public DistanceFormatter build(Resources resource) {
return new DistanceFormatter(resource, decimalCount, metricUnits);
return new DistanceFormatter(resource, decimalCount, unitSystem);
}
public DistanceFormatter build(Context context) {
src/main/java/de/dennisguse/opentracks/data/models/Speed.java
+18 -15
View File
@@ -6,6 +6,7 @@ import java.time.Duration;
import java.util.Objects;
import de.dennisguse.opentracks.settings.PreferencesUtils;
import de.dennisguse.opentracks.settings.UnitSystem;
public class Speed {
@@ -92,35 +93,37 @@ public class Speed {
return toKMH() * UnitConversions.KM_TO_MI;
}
public Duration toPace(boolean metricUnit) {
public Duration toPace(UnitSystem unitSystem) {
if (isZero()) {
return Duration.ofSeconds(0);
}
double distance = speed_mps * (metricUnit ? UnitConversions.M_TO_KM : UnitConversions.M_TO_MI);
double distance = speed_mps;
switch (unitSystem) { //TODO Can we use to(UnitSystem)?
case METRIC:
distance *= UnitConversions.M_TO_KM;
break;
case IMPERIAL:
distance *= UnitConversions.M_TO_MI;
break;
default:
throw new RuntimeException("Not implemented");
}
return Duration.ofSeconds(Math.round(1 / distance));
}
public double to(boolean metricUnit) {
return to(metricUnit ? Unit.KMH : Unit.MPH);
}
public double to(Unit unit) {
switch (unit) {
case KMH:
public double to(UnitSystem unitSystem) {
switch (unitSystem) {
case METRIC:
return toKMH();
case MPH:
case IMPERIAL:
return toMPH();
default:
throw new RuntimeException("Not implemented");
}
}
public enum Unit {
KMH,
MPH,
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
src/main/java/de/dennisguse/opentracks/data/models/SpeedFormatter.java
+22 -14
View File
@@ -4,7 +4,10 @@ import android.content.Context;
import android.content.res.Resources;
import android.util.Pair;
import androidx.annotation.NonNull;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.settings.UnitSystem;
import de.dennisguse.opentracks.util.StringUtils;
public class SpeedFormatter {
@@ -13,14 +16,14 @@ public class SpeedFormatter {
private final int decimalCount;
private final boolean metricUnits;
private final UnitSystem unitSystem;
private final boolean reportSpeedOrPace;
private SpeedFormatter(Resources resources, int decimalCount, boolean metricUnits, boolean reportSpeedOrPace) {
private SpeedFormatter(Resources resources, int decimalCount, UnitSystem unitSystem, boolean reportSpeedOrPace) {
this.resources = resources;
this.decimalCount = decimalCount;
this.metricUnits = metricUnits;
this.unitSystem = unitSystem;
this.reportSpeedOrPace = reportSpeedOrPace;
}
@@ -37,11 +40,17 @@ public class SpeedFormatter {
*/
public Pair<String, String> getSpeedParts(Speed speed) {
int unitId;
if (metricUnits) {
unitId = reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
} else {
unitId = reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
switch (unitSystem) {
case METRIC:
unitId = reportSpeedOrPace ? R.string.unit_kilometer_per_hour : R.string.unit_minute_per_kilometer;
break;
case IMPERIAL:
unitId = reportSpeedOrPace ? R.string.unit_mile_per_hour : R.string.unit_minute_per_mile;
break;
default:
throw new RuntimeException("Not implemented");
}
String unitString = resources.getString(unitId);
if (speed == null) {
@@ -49,10 +58,10 @@ public class SpeedFormatter {
}
if (reportSpeedOrPace) {
return new Pair<>(StringUtils.formatDecimal(speed.to(metricUnits), 1), unitString);
return new Pair<>(StringUtils.formatDecimal(speed.to(unitSystem), 1), unitString);
}
int pace = (int) speed.toPace(metricUnits).getSeconds();
int pace = (int) speed.toPace(unitSystem).getSeconds();
int minutes = pace / 60;
int seconds = pace % 60;
@@ -67,13 +76,12 @@ public class SpeedFormatter {
private int decimalCount;
private boolean metricUnits;
private UnitSystem unitSystem;
private boolean reportSpeedOrPace;
public Builder() {
decimalCount = 2;
metricUnits = true;
reportSpeedOrPace = true;
}
@@ -82,8 +90,8 @@ public class SpeedFormatter {
return this;
}
public Builder setMetricUnits(boolean metricUnits) {
this.metricUnits = metricUnits;
public Builder setUnit(@NonNull UnitSystem unitSystem) {
this.unitSystem = unitSystem;
return this;
}
@@ -93,7 +101,7 @@ public class SpeedFormatter {
}
public SpeedFormatter build(Resources resource) {
return new SpeedFormatter(resource, decimalCount, metricUnits, reportSpeedOrPace);
return new SpeedFormatter(resource, decimalCount, unitSystem, reportSpeedOrPace);
}
public SpeedFormatter build(Context context) {