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

Fix issues

Browse source
This commit is contained in:
Victor Shcherb 2014-10-25 20:17:51 +02:00
parent 4251473e74
commit e7f5e9616c
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/res/layout/drawer_list_doubleitem.xml
View file

@ -3,24 +3,28 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="match_parent"
android:paddingLeft="24dp"
android:paddingRight="16dp">
<LinearLayout android:layout_width="0dp"
android:layout_weight="1"
android:orientation="horizontal"
android:layout_height="wrap_content">
android:layout_height="64dp"
android:paddingBottom="8dp"
android:paddingTop="8dp">
<TextView android:id="@+id/title"
android:textSize="18sp"
android:layout_width="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/descr"
android:textSize="14sp"
android:textColor="#bebebe"
android:layout_width="wrap_content"
android:layout_gravity="right"
android:layout_width="20dp"
android:ellipsize="end"
android:layout_gravity="center|right"
android:layout_height="wrap_content"/>
</LinearLayout>
<CheckBox

2
OsmAnd/res/layout/drawer_list_item.xml
View file

@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:layout_weight="1"
android:layout_gravity="center_vertical" >
android:layout_gravity="bottom" >
<TextView
android:id="@+id/title"

12
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,11 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="map_widget_appearance_rem">Remaining elements</string>
<string name="map_widget_vector_attributes">Rendering attributes</string>
<string name="map_widget_top">Status bar</string>
<string name="map_widget_right">Right panel</string>
<string name="map_widget_left">Left panel</string>
<string name="layers_category_show">Show</string>
<string name="configure_map">Configure map</string>
<string name="search_radius_proximity">In proximity of</string>
@ -408,8 +413,7 @@
<string name="amenity_type_seamark">Seamark</string>
<string name="app_modes_choose_descr">Choose use profiles visible in application</string>
<string name="app_modes_choose">Application Profiles</string>
<string name="map_widget_appearance">Remaining elements:</string>
<string name="map_widget_map_rendering">Map rendering:</string>
<string name="map_widget_map_rendering">Map rendering</string>
<string name="app_mode_hiking">Hiking</string>
<string name="app_mode_motorcycle">Motorcycle</string>
<string name="app_mode_boat">Boat</string>
@ -1002,7 +1006,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="day_night_info_description">Sunrise: %1$s \nSunset: %2$s</string>
<string name="day_night_info">Day/night info</string>
<string name="map_widget_day_night">Day/night map</string>
<string name="map_widget_vector_attributes">Rendering attributes:</string>
<string name="map_widget_renderer">Map style</string>
<string name="layer_map_appearance">Configure screen</string>
<string name="show_lanes">Show lanes</string>
@ -1024,10 +1027,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="map_widget_back_to_loc">Where am I</string>
<string name="map_widget_lock_screen">Lock screen</string>
<string name="map_widget_compass">Compass</string>
<string name="map_widget_top_stack">Status bar:</string>
<string name="map_widget_reset">Reset to default</string>
<string name="map_widget_right_stack">Right panel:</string>
<string name="map_widget_left_stack">Left panel:</string>
<string name="map_widget_parking">Parking</string>
<string name="map_widget_monitoring">GPX recording</string>
<string name="map_widget_speed">Speed</string>

8
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -327,16 +327,16 @@ public class MapInfoLayer extends OsmandMapLayer {
final ArrayList<Object> list = new ArrayList<Object>();
list.add(map.getString(R.string.layer_map_appearance));
list.add(map.getString(R.string.map_widget_reset));
list.add(map.getString(R.string.map_widget_top_stack));
list.add(map.getString(R.string.map_widget_top));
list.addAll(mapInfoControls.getTop());
list.add(map.getString(R.string.map_widget_right_stack));
list.add(map.getString(R.string.map_widget_right));
list.addAll(mapInfoControls.getRight());
list.add(map.getString(R.string.map_widget_left_stack));
list.add(map.getString(R.string.map_widget_left));
list.addAll(mapInfoControls.getLeft());
Set<MapWidgetRegInfo> widgets = mapInfoControls.getAppearanceWidgets();
Set<String> cats = getSpecificVisibleCategories(widgets);
list.add(map.getString(R.string.map_widget_appearance));
list.add(map.getString(R.string.map_widget_appearance_rem));
fillAppearanceWidgets(widgets, null, list);
for(String cat : cats) {
list.add(cat);