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

Removed hardcoded text and tiny xml fixes

Browse source
This commit is contained in:
GaidamakUA 2015-12-01 11:20:21 +02:00
parent 4183672da4
commit 5b8e075f61
11 changed files with 222 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/no_translate.xml
View file

@ -23,5 +23,7 @@
<string name="osmo">OsMo</string>
<string name="tag_poi_amenity">amenity</string>
<string name="tag_poi_name">name</string>
<string name="hint_tag">Tag</string>
<string name="hint_value">Value</string>
</resources>

116
OsmAnd/res/layout-land/map_hud_top.xml
View file

@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="1">
<View android:layout_width="@dimen/map_route_planning_land_width"
android:layout_height="0dp"
<View
android:id="@+id/map_route_land_left_margin"
android:layout_width="@dimen/map_route_planning_land_width"
android:layout_height="0dp"
android:layout_gravity="top|left"
android:visibility="gone" />
android:visibility="gone"/>
<!-- LEFT widgets colon -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_left_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<include
layout="@layout/map_hud_widget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/map_hud_widget" />
android:layout_height="wrap_content"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
</LinearLayout>
@ -39,23 +41,23 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical">
<FrameLayout
android:id="@+id/map_top_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/btn_round"
android:minHeight="@dimen/map_address_height" >
android:minHeight="@dimen/map_address_height">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center"
>
>
<TextView
android:id="@+id/map_address_text_shadow"
android:layout_width="wrap_content"
@ -64,9 +66,9 @@
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
<TextView
@ -77,19 +79,19 @@
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
</FrameLayout>
<LinearLayout
android:id="@+id/waypoint_info_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageView
android:id="@+id/waypoint_icon"
@ -98,7 +100,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/waypoint_dist"
@ -109,36 +111,36 @@
android:maxLines="2"
android:textColor="@color/wpt_distance_color"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold" />
android:textStyle="bold"/>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
android:id="@+id/waypoint_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
<TextView
android:id="@+id/waypoint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
</FrameLayout>
<ImageButton
@ -146,14 +148,14 @@
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_overflow_menu_white" />
android:src="@drawable/ic_overflow_menu_white"/>
<ImageButton
android:id="@+id/waypoint_close"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
@ -161,7 +163,7 @@
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
@ -169,14 +171,14 @@
android:layout_gravity="top|left"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageButton
android:id="@+id/map_layers_button"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_compass_button"
@ -184,7 +186,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_marginLeft="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
<LinearLayout
@ -194,19 +196,19 @@
android:layout_gravity="top|center"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:visibility="gone"
android:orientation="vertical" >
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/map_lanes"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
@ -214,21 +216,21 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
<TextView
android:id="@+id/map_lanes_dist_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
</FrameLayout>
<ProgressBar
@ -240,7 +242,7 @@
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
@ -250,24 +252,24 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right" >
android:layout_gravity="top|right">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_right_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
<ImageButton
@ -276,7 +278,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>

4
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/point_edit_layout"
android:layout_width="366dp"
android:layout_height="match_parent"
@ -77,8 +78,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:text="Point info"
tools:text="Point info"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>

4
OsmAnd/res/layout/dash_storage_type_fragment.xml
View file

@ -44,7 +44,7 @@
android:id="@+id/location_path"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location path"
tools:text="Location path"
android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" />
@ -52,7 +52,7 @@
android:id="@+id/location_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location path \u2022 300 MB"
tools:text="Location path \u2022 300 MB"
android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size" />
</LinearLayout>

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

@ -44,9 +44,9 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:scaleType="center"
android:text="Toolbar"
android:textColor="@color/abc_primary_text_material_dark"
android:textSize="@dimen/abc_text_size_headline_material"
tools:text="Toolbar"
tools:visibility="gone"/>
<ImageView

25
OsmAnd/res/layout/list_item_bidforfix.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bidforfixitemlayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/white">
<RelativeLayout android:id="@+id/bidforfixitemlayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/white">
<TextView
android:id="@+id/bffiText"
@ -15,7 +16,7 @@
android:layout_marginTop="8dp"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#72B123" />
android:textColor="#72B123"/>
<View
android:id="@+id/ruler"
@ -26,7 +27,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="6dp"
android:background="#B0B0B0" />
android:background="#B0B0B0"/>
<TextView
android:id="@+id/bffiSupport"
@ -35,8 +36,8 @@
android:layout_alignLeft="@+id/bffiText"
android:layout_below="@+id/bffiText"
android:layout_marginTop="16dp"
android:text="18 supporters"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="18 supporters"/>
<TextView
android:id="@+id/bffiFunded"
@ -44,8 +45,8 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/bffiSupport"
android:layout_below="@+id/bffiSupport"
android:text="Funded: 65%"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="Funded: 65%"/>
<ImageView
android:id="@+id/bffiGraph"
@ -54,6 +55,6 @@
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/bffiSupport"
android:layout_marginRight="20dp"
android:src="@android:drawable/alert_dark_frame" />
android:src="@android:drawable/alert_dark_frame"/>
</RelativeLayout>

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

@ -198,7 +198,7 @@
android:layout_marginLeft="-4dp"
android:clickable="true"
android:gravity="center_vertical"
android:text="— 00:26"
tools:text="— 00:26"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"/>

77
OsmAnd/res/layout/map_hud_bottom.xml
View file

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/map_alarm_warning"
@ -15,24 +16,24 @@
android:layout_height="@dimen/map_alarm_size"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_alarm_bottom_margin"
android:layout_marginLeft="@dimen/map_button_shadow_margin" >
android:layout_marginLeft="@dimen/map_button_shadow_margin">
<ImageView
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/warnings_limit" />
android:src="@drawable/warnings_limit"/>
<TextView
android:id="@+id/map_alarm_warning_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="60"
android:textColor="@color/color_black"
android:textSize="@dimen/map_alarm_text_size"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="60"/>
</FrameLayout>
<FrameLayout
@ -42,7 +43,7 @@
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_shadow_margin"
android:layout_marginLeft="@dimen/map_button_shadow_margin"
android:background="@drawable/btn_round_trans" >
android:background="@drawable/btn_round_trans">
<ImageView
android:id="@+id/map_app_mode_icon"
@ -50,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_marginTop="3dp"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/map_app_mode_text"
@ -58,7 +59,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size" />
android:textSize="@dimen/map_button_text_size"/>
</FrameLayout>
<LinearLayout
@ -67,13 +68,13 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_marginBottom="@dimen/map_button_size"
android:orientation="horizontal" >
android:orientation="horizontal">
<SeekBar
android:id="@+id/map_transparency_seekbar"
android:layout_width="@dimen/map_trans_seek_size"
android:layout_height="wrap_content"
android:layout_gravity="center" />
android:layout_gravity="center"/>
<ImageButton
android:id="@+id/map_transparency_hide"
@ -81,7 +82,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/headliner_close" />
android:src="@drawable/headliner_close"/>
</LinearLayout>
<LinearLayout
@ -89,14 +90,14 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin" >
android:layout_marginLeft="@dimen/map_button_margin">
<ImageButton
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_route_info_button"
@ -104,21 +105,21 @@
android:layout_height="@dimen/map_button_size"
android:layout_marginLeft="@dimen/map_button_spacing"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<FrameLayout
android:id="@+id/map_ruler_layout"
android:layout_width="@dimen/map_ruler_width"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_margin" >
android:layout_marginLeft="@dimen/map_button_margin">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="@dimen/map_ruler_bottom_margin" >
android:layout_marginBottom="@dimen/map_ruler_bottom_margin">
<TextView
android:id="@+id/map_ruler_text_shadow"
android:layout_width="fill_parent"
@ -126,9 +127,9 @@
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
<TextView
android:id="@+id/map_ruler_text"
android:layout_width="fill_parent"
@ -136,8 +137,8 @@
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
</FrameLayout>
@ -146,7 +147,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/ruler" />
android:background="@drawable/ruler"/>
</FrameLayout>
</LinearLayout>
@ -155,7 +156,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin" >
android:layout_marginRight="@dimen/map_button_margin">
<ImageButton
android:id="@+id/map_my_location_button"
@ -163,21 +164,21 @@
android:layout_height="@dimen/map_button_size"
android:layout_gravity="bottom"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_spacing"
android:orientation="vertical" >
android:orientation="vertical">
<ImageButton
android:id="@+id/map_zoom_in_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_zoom_out_button"
@ -185,29 +186,31 @@
android:layout_height="@dimen/map_button_size"
android:layout_marginTop="@dimen/map_button_spacing"
android:background="@drawable/btn_circle"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<include layout="@layout/map_route_prepare_bottom"/>
<LinearLayout
android:id="@+id/map_context_menu_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/btn_flat"
android:visibility="gone" >
android:visibility="gone">
<TextView
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center" >
android:gravity="center">
</TextView>
<ImageButton
@ -215,14 +218,14 @@
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>

185
OsmAnd/res/layout/map_hud_top.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- TOP ROW -->
@ -11,51 +12,51 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/btn_flat"
android:minHeight="@dimen/map_address_height" >
android:minHeight="@dimen/map_address_height">
<!-- android:layout_weight="1" to show properly next turn -->
<FrameLayout
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp">
<TextView
android:id="@+id/map_address_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_gravity="center" >
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
<TextView
android:id="@+id/map_address_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
</TextView>
<TextView
android:id="@+id/map_address_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:text="Long Street Name"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size" >
</TextView>
</FrameLayout>
<TextView
android:id="@+id/map_address_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size"
tools:text="Long Street Name">
</TextView>
</FrameLayout>
<LinearLayout
android:id="@+id/waypoint_info_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal" >
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/waypoint_icon"
@ -64,7 +65,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<TextView
android:id="@+id/waypoint_dist"
@ -75,57 +76,57 @@
android:maxLines="2"
android:textColor="@color/wpt_distance_color"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold" />
android:textStyle="bold"/>
<FrameLayout
android:layout_width="0dp"
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/waypoint_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_weight="1" >
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
<TextView
android:id="@+id/waypoint_text_shadow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
<TextView
android:id="@+id/waypoint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="Waypoint"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size" />
</FrameLayout>
<TextView
android:id="@+id/waypoint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/color_black"
android:textSize="@dimen/map_button_text_size"
tools:text="Waypoint"/>
</FrameLayout>
<ImageButton
android:id="@+id/waypoint_more"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/waypoint_close"
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
<!-- Widgets -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<!-- LEFT widgets colon -->
@ -133,21 +134,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1" >
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:layout_weight="0.45"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_left_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left"
android:orientation="vertical" >
android:orientation="vertical">
<!--
<include layout="@layout/map_hud_widget" />
@ -162,14 +163,14 @@
android:layout_gravity="top|left"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageButton
android:id="@+id/map_layers_button"
android:layout_width="@dimen/map_small_button_size"
android:layout_height="@dimen/map_small_button_size"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_compass_button"
@ -177,7 +178,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_marginLeft="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
<!-- empty block to not let widgets grow more than 45% -->
@ -185,7 +186,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0.55" >
android:layout_weight="0.55">
</LinearLayout>
</LinearLayout>
@ -195,38 +196,38 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1" >
android:weightSum="1">
<!-- empty block to not let widgets grow more than 45% -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="0.55" >
android:layout_weight="0.55">
</LinearLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:layout_weight="0.45" >
android:layout_weight="0.45">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<LinearLayout
android:id="@+id/map_right_widgets_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:orientation="vertical" >
android:orientation="vertical">
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
<include layout="@layout/map_hud_widget" />
<include layout="@layout/map_hud_widget"/>
</LinearLayout>
<ImageButton
@ -235,7 +236,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
android:src="@drawable/ic_action_test_light" />
android:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
</LinearLayout>
@ -249,18 +250,18 @@
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_round"
android:orientation="vertical"
android:visibility="gone" >
android:visibility="gone">
<ImageView
android:id="@+id/map_lanes"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1" >
android:layout_weight="1">
<TextView
android:id="@+id/map_lanes_dist_text_shadow"
@ -268,19 +269,19 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
<TextView
android:id="@+id/map_lanes_dist_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxLines="1"
android:text="1048 km"
android:textColor="@color/color_black"
android:textSize="@dimen/map_widget_text_size_small" />
android:textSize="@dimen/map_widget_text_size_small"
tools:text="1048 km"/>
</FrameLayout>
@ -293,7 +294,7 @@
android:layout_marginRight="@dimen/map_button_margin"
android:max="100"
android:progress="60"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>
</FrameLayout>

7
OsmAnd/res/layout/poi_tag_list_item.xml
View file

@ -2,9 +2,9 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:paddingTop="16dp">
@ -19,7 +19,7 @@
android:id="@+id/tagEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Tag"
android:hint="@string/hint_tag"
tools:text="Tag text"/>
</android.support.design.widget.TextInputLayout>
@ -33,7 +33,7 @@
android:id="@+id/valueEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Value"/>
android:hint="@string/hint_value"/>
</android.support.design.widget.TextInputLayout>
@ -43,5 +43,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="bottom"
android:contentDescription="@string/shared_string_delete"
tools:src="@drawable/ic_action_close_dark"/>
</LinearLayout>

6
OsmAnd/res/layout/point_editor_fragment.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/point_edit_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -71,8 +72,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_gravity="center_vertical"
android:text="Point info"
tools:text="Point info"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
@ -136,7 +138,7 @@
android:layout_marginLeft="8dp"
android:textColor="?android:textColorPrimary"
android:textColorHint="?android:textColorSecondary"
android:text="Name"
tools:text="Name"
android:imeOptions="actionDone"
android:inputType="text"/>