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

Fix UI for 12

Browse source
This commit is contained in:
Victor Shcherb 2015-05-06 23:51:00 +02:00
parent ef643006b9
commit f40cc08002
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -90,9 +90,9 @@ public class OsmAndFormatter {
if (meters >= 100 * mainUnitInMeters) { if (meters >= 100 * mainUnitInMeters) {
return (int) (meters / mainUnitInMeters + 0.5) + " " + ctx.getString(mainUnitStr); //$NON-NLS-1$ return (int) (meters / mainUnitInMeters + 0.5) + " " + ctx.getString(mainUnitStr); //$NON-NLS-1$
} else if (meters > 9.99f * mainUnitInMeters) { } else if (meters > 9.99f * mainUnitInMeters) {
return MessageFormat.format("{0,number,#.#} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters); //$NON-NLS-1$ return MessageFormat.format("{0,number,#.#} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
} else if (meters > 0.999f * mainUnitInMeters) { } else if (meters > 0.999f * mainUnitInMeters) {
return MessageFormat.format("{0,number,#.##} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters); //$NON-NLS-1$ return MessageFormat.format("{0,number,#.##} " + ctx.getString(mainUnitStr), ((float) meters) / mainUnitInMeters).replace('\n', ' '); //$NON-NLS-1$
} else { } else {
if (mc == MetricsConstants.KILOMETERS_AND_METERS) { if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
return ((int) (meters + 0.5)) + " " + ctx.getString(R.string.m); //$NON-NLS-1$ return ((int) (meters + 0.5)) + " " + ctx.getString(R.string.m); //$NON-NLS-1$

2
eclipse-compile/appcompat/res/drawable/abc_btn_default_mtrl_shape.xml
View file

@ -23,7 +23,7 @@
android:insetBottom="@dimen/abc_button_inset_vertical_material"> android:insetBottom="@dimen/abc_button_inset_vertical_material">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="@dimen/abc_control_corner_material" /> <corners android:radius="@dimen/abc_control_corner_material" />
<solid android:color="@android:color/white" /> <solid android:color="@android:color/darker_gray" />
<padding android:left="@dimen/abc_button_padding_horizontal_material" <padding android:left="@dimen/abc_button_padding_horizontal_material"
android:top="@dimen/abc_button_padding_vertical_material" android:top="@dimen/abc_button_padding_vertical_material"
android:right="@dimen/abc_button_padding_horizontal_material" android:right="@dimen/abc_button_padding_horizontal_material"

1
eclipse-compile/appcompat/res/values-v17/dimens.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="checkbox_padding">0dp</dimen> <dimen name="checkbox_padding">0dp</dimen>
<dimen name="radio_padding">0dp</dimen>
</resources> </resources>

1
eclipse-compile/appcompat/res/values/dimens.xml
View file

@ -84,4 +84,5 @@
<!-- Dialog button bar height --> <!-- Dialog button bar height -->
<dimen name="abc_alert_dialog_button_bar_height">48dp</dimen> <dimen name="abc_alert_dialog_button_bar_height">48dp</dimen>
<dimen name="checkbox_padding">12dp</dimen> <dimen name="checkbox_padding">12dp</dimen>
<dimen name="radio_padding">30dp</dimen>
</resources> </resources>

1
eclipse-compile/appcompat/res/values/styles_base.xml
View file

@ -379,6 +379,7 @@
<style name="Base.Widget.AppCompat.CompoundButton.RadioButton" parent="android:Widget.CompoundButton.RadioButton"> <style name="Base.Widget.AppCompat.CompoundButton.RadioButton" parent="android:Widget.CompoundButton.RadioButton">
<item name="android:button">?android:attr/listChoiceIndicatorSingle</item> <item name="android:button">?android:attr/listChoiceIndicatorSingle</item>
<item name="android:background">?attr/selectableItemBackgroundBorderless</item> <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
<item name="android:paddingLeft">@dimen/radio_padding</item>
</style> </style>
<style name="Base.Widget.AppCompat.CompoundButton.Switch" parent="android:Widget.CompoundButton"> <style name="Base.Widget.AppCompat.CompoundButton.Switch" parent="android:Widget.CompoundButton">