Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Length limit on the "Vehicle parameters" review

Browse source
This commit is contained in:
sergosm 2020-09-22 11:11:37 +03:00
parent 1cc690ecf5
commit 6d8b485c56
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/settings/preferences/SizePreference.java
View file

@ -7,6 +7,9 @@ import androidx.preference.DialogPreference;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.settings.bottomsheets.VehicleSizeAssets; import net.osmand.plus.settings.bottomsheets.VehicleSizeAssets;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.Locale; import java.util.Locale;
@ -87,10 +90,13 @@ public class SizePreference extends DialogPreference {
public CharSequence getSummary() { public CharSequence getSummary() {
String summary = entries[0]; String summary = entries[0];
String persistedString = getValue(); String persistedString = getValue();
if (!persistedString.equals(defaultValue)) { if (StringUtils.isBlank(persistedString)) {
return summary;
}
if (!isPersistedStringEqualsZero(persistedString)) {
try { try {
final DecimalFormat df = new DecimalFormat("#.####", new DecimalFormatSymbols(Locale.US)); final DecimalFormat df = new DecimalFormat("#.####", new DecimalFormatSymbols(Locale.US));
persistedString = df.format(Float.parseFloat(persistedString) + 0.01f); persistedString = df.format(Double.parseDouble(persistedString) + 0.01d);
summary = String.format(getContext().getString(R.string.ltr_or_rtl_combine_via_space), summary = String.format(getContext().getString(R.string.ltr_or_rtl_combine_via_space),
persistedString, getContext().getString(assets.getMetricShortRes())); persistedString, getContext().getString(assets.getMetricShortRes()));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -100,7 +106,11 @@ public class SizePreference extends DialogPreference {
return summary; return summary;
} }
public String getValue() { private boolean isPersistedStringEqualsZero(String persistedString) {
return BigDecimal.ZERO.compareTo(new BigDecimal(persistedString)) == 0;
}
public String getValue () {
return getPersistedString(defaultValue); return getPersistedString(defaultValue);
} }
} }