From 8f8c4b08741029d49ebcc1388fd53f5bc006eff7 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 11 Mar 2015 20:19:24 +0100
Subject: [PATCH 01/23] Map update

---
 OsmAnd/res/drawable/btn_circle.xml            |  13 ++
 .../res/drawable/btn_circle_transparent.xml   |   9 +
 OsmAnd/res/drawable/btn_flat.xml              |  14 ++
 OsmAnd/res/drawable/btn_inset_circle.xml      |  16 ++
 OsmAnd/res/drawable/btn_left_round.xml        |  15 ++
 OsmAnd/res/drawable/btn_right_round.xml       |  18 ++
 OsmAnd/res/drawable/btn_round.xml             |  15 ++
 OsmAnd/res/drawable/roundedbutton.xml         |  11 --
 OsmAnd/res/layout-land/dashboard_over_map.xml |   2 +-
 OsmAnd/res/layout/main.xml                    | 123 +++++++------
 OsmAnd/res/layout/map_hud_bottom.xml          | 127 ++++++++++++++
 OsmAnd/res/layout/map_hud_top.xml             | 162 ++++++++++++++++++
 OsmAnd/res/layout/map_hud_widget.xml          |  38 ++++
 OsmAnd/res/layout/map_view_on_dashboard.xml   |   3 +-
 OsmAnd/res/values/colors.xml                  |   4 +
 OsmAnd/res/values/sizes.xml                   |  14 +-
 .../osmand/plus/activities/MapActivity.java   |   2 +-
 .../osmand/plus/dashboard/DashboardOnMap.java |  16 +-
 .../plus/helpers/WaypointDialogHelper.java    |   2 +-
 .../osmand/plus/views/MapControlsLayer.java   |  45 ++++-
 20 files changed, 571 insertions(+), 78 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_circle.xml
 create mode 100644 OsmAnd/res/drawable/btn_circle_transparent.xml
 create mode 100644 OsmAnd/res/drawable/btn_flat.xml
 create mode 100644 OsmAnd/res/drawable/btn_inset_circle.xml
 create mode 100644 OsmAnd/res/drawable/btn_left_round.xml
 create mode 100644 OsmAnd/res/drawable/btn_right_round.xml
 create mode 100644 OsmAnd/res/drawable/btn_round.xml
 delete mode 100644 OsmAnd/res/drawable/roundedbutton.xml
 create mode 100644 OsmAnd/res/layout/map_hud_bottom.xml
 create mode 100644 OsmAnd/res/layout/map_hud_top.xml
 create mode 100644 OsmAnd/res/layout/map_hud_widget.xml

diff --git a/OsmAnd/res/drawable/btn_circle.xml b/OsmAnd/res/drawable/btn_circle.xml
new file mode 100644
index 0000000000..2090295c75
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_circle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="oval">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="oval">
+            <solid android:color="@color/map_widget_light" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_circle_transparent.xml b/OsmAnd/res/drawable/btn_circle_transparent.xml
new file mode 100644
index 0000000000..7fccfc9f24
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_circle_transparent.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_light_pressed" />
+            </shape>
+        </inset></item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_flat.xml b/OsmAnd/res/drawable/btn_flat.xml
new file mode 100644
index 0000000000..fa17c040e5
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_flat.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle.xml b/OsmAnd/res/drawable/btn_inset_circle.xml
new file mode 100644
index 0000000000..d08b764287
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_inset_circle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_light_pressed" />
+                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+            </shape>
+        </inset></item>
+    <item><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_light" />
+                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+            </shape>
+        </inset></item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round.xml b/OsmAnd/res/drawable/btn_left_round.xml
new file mode 100644
index 0000000000..be66a3477f
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_left_round.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light" />
+            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_right_round.xml b/OsmAnd/res/drawable/btn_right_round.xml
new file mode 100644
index 0000000000..843840c380
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_right_round.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light" />
+            <corners
+                android:topRightRadius="@dimen/map_button_rect_rad"
+                android:bottomRightRadius="@dimen/map_button_rect_rad" 
+                />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round.xml b/OsmAnd/res/drawable/btn_round.xml
new file mode 100644
index 0000000000..6b2158c0b7
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/roundedbutton.xml b/OsmAnd/res/drawable/roundedbutton.xml
deleted file mode 100644
index 326556d040..0000000000
--- a/OsmAnd/res/drawable/roundedbutton.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"><shape android:shape="oval">
-            <solid android:color="#eeaaaaaa" />
-        </shape></item>
-    <item><shape android:shape="oval">
-            <solid android:color="#eeffffff" />
-        </shape></item>
-
-</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/dashboard_over_map.xml b/OsmAnd/res/layout-land/dashboard_over_map.xml
index 22329472c6..70ebe50980 100644
--- a/OsmAnd/res/layout-land/dashboard_over_map.xml
+++ b/OsmAnd/res/layout-land/dashboard_over_map.xml
@@ -48,7 +48,7 @@
         <include
             android:id="@+id/map_part_dashboard"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dashboard_map_top_padding"
+            android:layout_height="match_parent"
             layout="@layout/map_view_on_dashboard" />
     </LinearLayout>
 
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 73eaf225bb..cd90ad0af8 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -1,64 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-	android:id="@+id/drawer_layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
-	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				 android:layout_width="fill_parent"
-				 android:layout_height="fill_parent"
-				 android:id="@+id/ParentLayout"
-				 android:clipChildren="false"
-				 android:keepScreenOn="true"
-				 android:orientation="vertical">
+    <FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/MapViewWithLayers"
+        android:clipChildren="false"
+        android:keepScreenOn="true"
+        android:orientation="vertical" >
 
-		<ViewStub
-			android:id="@+id/atlasMapRendererViewStub"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:inflatedId="@+id/atlasMapRendererView"
-			android:layout="@layout/atlas_map_renderer_view"/>
+        <ViewStub
+            android:id="@+id/atlasMapRendererViewStub"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inflatedId="@+id/atlasMapRendererView"
+            android:layout="@layout/atlas_map_renderer_view" />
 
-		<net.osmand.plus.views.OsmAndMapSurfaceView
-			android:id="@+id/MapView"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:contentDescription="@string/shared_string_map"
-			android:visibility="gone"/>
+        <net.osmand.plus.views.OsmAndMapSurfaceView
+            android:id="@+id/MapView"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:contentDescription="@string/shared_string_map"
+            android:visibility="gone" />
 
-		<net.osmand.plus.views.OsmAndMapLayersView
-			android:id="@+id/MapLayersView"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:contentDescription="@string/shared_string_map"
-			android:visibility="gone"/>
+        <net.osmand.plus.views.OsmAndMapLayersView
+            android:id="@+id/MapLayersView"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:contentDescription="@string/shared_string_map"
+            android:visibility="gone" />
+        
+        <!-- deprecated -->
 
-		<FrameLayout android:id="@+id/MapInfoControls"
-					 android:layout_width="match_parent"
-					 android:layout_height="match_parent"/>
+        <FrameLayout
+            android:id="@+id/MapInfoControls"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-		<LinearLayout
-			android:id="@+id/dialog_layout"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="bottom"
-			android:orientation="horizontal"/>
+        <LinearLayout
+            android:id="@+id/WaypointVisit"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="horizontal" />
+
+        <FrameLayout
+            android:id="@+id/MapButtons"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+    <FrameLayout
+        android:id="@+id/MapHudButtonsOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+        <include layout="@layout/map_hud_top" />
+        <include layout="@layout/map_hud_bottom" />
+    </FrameLayout>
+
+    <include
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        layout="@layout/dashboard_over_map" />
 
 
-		<FrameLayout android:id="@+id/MapButtons"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"/>
-	</FrameLayout>
-
-	<ListView
-		android:id="@+id/left_drawer"
-		android:layout_width="280dp"
-		android:layout_height="match_parent"
-		android:layout_gravity="start"
-		android:background="?attr/expandable_list_background"
-		android:choiceMode="singleChoice"
-		android:divider="@drawable/divider"
-		android:dividerHeight="1dp"/>
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="280dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="?attr/expandable_list_background"
+        android:choiceMode="singleChoice"
+        android:divider="@drawable/divider"
+        android:dividerHeight="1dp" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
new file mode 100644
index 0000000000..f51ef81fbc
--- /dev/null
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -0,0 +1,127 @@
+<?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">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|left"
+            android:layout_marginBottom="@dimen/map_button_margin"
+            android:layout_marginLeft="@dimen/map_button_margin" >
+
+            <ImageButton
+                android:layout_width="@dimen/map_button_size"
+                android:layout_height="@dimen/map_button_size"
+                android:background="@drawable/btn_round"
+                android:src="@drawable/ic_action_remove_light" />
+
+            <ImageButton
+                android:layout_width="@dimen/map_button_size"
+                android:layout_height="@dimen/map_button_size"
+                android:layout_marginLeft="@dimen/map_button_spacing"
+                android:background="@drawable/btn_round"
+                android:src="@drawable/ic_action_remove_light" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|right"
+            android:layout_marginBottom="@dimen/map_button_margin"
+            android:layout_marginRight="@dimen/map_button_margin" >
+
+            <ImageButton
+                android:layout_width="@dimen/map_button_size"
+                android:layout_height="@dimen/map_button_size"
+                android:layout_gravity="bottom"
+                android:background="@drawable/btn_circle"
+                android:src="@drawable/ic_action_remove_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" >
+
+                <ImageButton
+                    android:id="@+id/"
+                    android:layout_width="@dimen/map_button_size"
+                    android:layout_height="@dimen/map_button_size"
+                    android:background="@drawable/btn_circle"
+                    
+                    android:src="@drawable/ic_action_remove_light" />
+
+                <ImageButton
+                    android:layout_width="@dimen/map_button_size"
+                    android:layout_height="@dimen/map_button_size"
+                    android:layout_marginTop="@dimen/map_button_spacing"
+                    android:background="@drawable/btn_circle"
+                    android:src="@drawable/ic_action_remove_light" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:background="@drawable/btn_flat"
+            android:layout_gravity="bottom" >
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="Route preparation" >
+            </TextView>
+        </LinearLayout>
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/btn_flat" 
+            android:layout_gravity="bottom">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:textColor="@color/color_black"
+                android:textSize="24sp"
+                android:maxLines="1"
+                android:text="Context menu" >
+            </TextView>
+
+            <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_remove_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_remove_light" />
+        </LinearLayout>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
new file mode 100644
index 0000000000..44b6e44c68
--- /dev/null
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -0,0 +1,162 @@
+<?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" >
+
+    <!-- TOP ROW -->
+
+    <LinearLayout
+        android:id="@+id/WaypointVisit2"
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/map_address_height"
+        android:background="@drawable/btn_flat"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/map_address_text"
+            android:layout_width="0dp"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="TEST Street name"
+            android:textColor="@color/color_black"
+            android:textSize="24sp" >
+        </TextView>
+
+        <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_remove_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_remove_light" />
+    </LinearLayout>
+    <!-- Widgets -->
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <!-- LEFT widgets colon -->
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="1" >
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|left"
+                android:layout_weight="0.4"
+                android:orientation="vertical" >
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|left"
+                    android:orientation="vertical">
+
+                    <include layout="@layout/map_hud_widget" />
+                    <include layout="@layout/map_hud_widget" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|left"
+                    android:layout_marginLeft="@dimen/map_button_margin"
+                    android:layout_marginTop="@dimen/map_button_margin"
+                    android:orientation="horizontal" >
+
+                    <ImageButton
+                        android:id="@+id/map_layers_button"
+                        android:layout_width="@dimen/map_button_size"
+                        android:layout_height="@dimen/map_button_size"
+                        android:background="@drawable/btn_inset_circle"
+                        android:src="@drawable/ic_action_remove_light" />
+
+                    <ImageButton
+                        android:id="@+id/map_compass_button"
+                        android:layout_width="@dimen/map_button_size"
+                        android:layout_height="@dimen/map_button_size"
+                        android:background="@drawable/btn_inset_circle"
+                        android:src="@drawable/ic_action_remove_light" />
+                </LinearLayout>
+            </LinearLayout>
+            <!-- empty block to not let widgets grow more than 40% -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="0.6" >
+            </LinearLayout>
+        </LinearLayout>
+        <!-- CENTER TODO -->
+        <!-- RIGHT widgets colon -->
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="1" >
+
+            <!-- empty block to not let widgets grow more than 40% -->
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="0.6" >
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:layout_weight="0.4"
+                android:orientation="vertical" >
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|right"
+                    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>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|right"
+                    android:layout_marginRight="@dimen/map_button_margin"
+                    android:layout_marginTop="@dimen/map_button_margin"
+                    android:orientation="horizontal" >
+
+                    <ImageButton
+                        android:layout_width="@dimen/map_button_size"
+                        android:layout_height="@dimen/map_button_size"
+                        android:background="@drawable/btn_inset_circle"
+                        android:src="@drawable/ic_action_remove_light" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
new file mode 100644
index 0000000000..143aeeff4b
--- /dev/null
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:minWidth="100dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/btn_left_round"
+    android:orientation="vertical"
+   >
+
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/map_widget_image"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_action_close_light"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/map_widget_height"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:layout_width="@dimen/map_widget_icon"
+            android:layout_height="@dimen/map_widget_icon"
+            android:gravity="center"
+            android:layout_gravity="left|center_vertical"
+            android:src="@drawable/ic_action_remove_light" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:textColor="@color/color_black"
+            android:text="202 km" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_view_on_dashboard.xml b/OsmAnd/res/layout/map_view_on_dashboard.xml
index bf041c1e3e..34bca26f36 100644
--- a/OsmAnd/res/layout/map_view_on_dashboard.xml
+++ b/OsmAnd/res/layout/map_view_on_dashboard.xml
@@ -10,7 +10,7 @@
         android:layout_gravity="top|left"
         android:layout_marginLeft="@dimen/map_button_margin"
         android:layout_marginTop="@dimen/map_button_margin"
-        android:background="@drawable/roundedbutton"
+        android:background="@drawable/btn_inset_circle"
         android:src="@drawable/ic_action_layers_light" />
 
     <Button
@@ -18,6 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:visibility="gone"
         android:text="@string/shared_string_download" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index d4661f41de..84b8136b02 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -9,6 +9,10 @@
 	<color name="list_item_light_pressed">#8cd0d0d0</color>
 	<color name="list_item_background_dark">#333b40</color>
 	<color name="list_item_background_dark_pressed">#be39464d</color>
+	
+	<color name="map_widget_stroke">#333333</color>
+	<color name="map_widget_light">#eeffffff</color>
+	<color name="map_widget_light_pressed">#ddcccccc</color>
 
 
 	<color name="actionbar_dark_color">#39464d</color>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 8c9efe0702..4a3aa3edc3 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -47,8 +47,18 @@
 	<dimen name="dashboard_map_bottom_padding">90dp</dimen>
 	<dimen name="dashboard_parking_left_margin">16dp</dimen>
 	<dimen name="dashboard_parking_icon_size">48dp</dimen>
-	<dimen name="map_button_size">40dp</dimen>
-	<dimen name="map_button_margin">8dp</dimen>
+	<!--  map buttons -->
+	<dimen name="map_address_height">40dp</dimen>
+	<dimen name="map_button_size">48dp</dimen>
+	<dimen name="map_widget_icon">24dp</dimen>
+	<dimen name="map_widget_height">32dp</dimen>
+	<dimen name="map_widget_image">80dp</dimen>
+	<dimen name="map_button_spacing">20dp</dimen>
+	<dimen name="map_button_margin">4dp</dimen>
+	<dimen name="map_button_inset">4dp</dimen>
+	<dimen name="map_button_rect_rad">3dp</dimen>
+	<dimen name="map_button_stroke">1px</dimen>
+	
 
 
     <!-- TextSizes -->
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 7e06d9f8e0..56896d6c13 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -176,7 +176,7 @@ public class MapActivity extends AccessibleActivity {
 					}
 					mapView.refreshMap(true);
 					findViewById(R.id.init_progress).setVisibility(View.GONE);
-					findViewById(R.id.ParentLayout).invalidate();
+					findViewById(R.id.drawer_layout).invalidate();
 				}
 			};
 			getMyApplication().checkApplicationIsBeingInitialized(this, initListener);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 42cc7353df..7790e3c47c 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -75,9 +75,11 @@ public class DashboardOnMap {
 
 	public void createDashboardView() {
 		landscape = !ScreenOrientationHelper.isOrientationPortrait(mapActivity);
-		dashboardView = (FrameLayout) mapActivity.getLayoutInflater().inflate(R.layout.dashboard_over_map, null, false);
-		dashboardView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-				ViewGroup.LayoutParams.MATCH_PARENT));
+//		dashboardView = (FrameLayout) mapActivity.getLayoutInflater().inflate(R.layout.dashboard_over_map, null, false);
+//		dashboardView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+//				ViewGroup.LayoutParams.MATCH_PARENT));
+//		((FrameLayout) mapActivity.findViewById(R.id.MapHudButtonsOverlay)).addView(dashboardView);
+		dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
 		View.OnClickListener listener = new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -86,7 +88,7 @@ public class DashboardOnMap {
 		};
 		dashboardView.findViewById(R.id.animateContent).setOnClickListener(listener);
 		dashboardView.setOnClickListener(listener);
-		((FrameLayout) mapActivity.findViewById(R.id.ParentLayout)).addView(dashboardView);
+		
 		
 		dashboardView.findViewById(R.id.map_layers_button).setOnClickListener(new View.OnClickListener() {
 			
@@ -103,7 +105,7 @@ public class DashboardOnMap {
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
 			fabButton = new FloatingActionButton.Builder(mapActivity)
-					.withDrawable(mapActivity.getResources().getDrawable(R.drawable.ic_action_map))
+					.withDrawable(mapActivity.getResources().getDrawable(R.drawable.ic_action_get_my_location))
 					.withButtonColor(mapActivity.getResources().getColor(R.color.color_myloc_distance))
 					.withGravity(landscape ? Gravity.BOTTOM | Gravity.RIGHT : Gravity.TOP | Gravity.RIGHT)
 					.withMargins(0, landscape ? 0 : 160, 16, landscape ? 16 : 0).create();
@@ -294,7 +296,7 @@ public class DashboardOnMap {
 
 	// To animate view slide out from right to left
 	private void open(View view){
-		TranslateAnimation animate = new TranslateAnimation(-mapActivity.findViewById(R.id.ParentLayout).getWidth(),0,0,0);
+		TranslateAnimation animate = new TranslateAnimation(-mapActivity.findViewById(R.id.MapHudButtonsOverlay).getWidth(),0,0,0);
 		animate.setDuration(500);
 		animate.setFillAfter(true);
 		view.startAnimation(animate);
@@ -302,7 +304,7 @@ public class DashboardOnMap {
 	}
 
 	private void hide(View view) {
-		TranslateAnimation animate = new TranslateAnimation(0, -mapActivity.findViewById(R.id.ParentLayout).getWidth(), 0, 0);
+		TranslateAnimation animate = new TranslateAnimation(0, -mapActivity.findViewById(R.id.MapHudButtonsOverlay).getWidth(), 0, 0);
 		animate.setDuration(500);
 		animate.setFillAfter(true);
 		animate.setAnimationListener(new AnimationListener() {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 9a35874911..81fc5d1315 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -71,7 +71,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 		this.app = mapActivity.getMyApplication();
 		waypointHelper = this.app.getWaypointHelper();
 		this.mapActivity = mapActivity;
-		this.mainLayout = (LinearLayout) mapActivity.findViewById(R.id.dialog_layout);
+		this.mainLayout = (LinearLayout) mapActivity.findViewById(R.id.WaypointVisit);
 
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index b6538e49ed..fed0404d55 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.views;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 import android.content.pm.ActivityInfo;
@@ -88,6 +89,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 		int rightCenterGravity = Gravity.RIGHT | Gravity.CENTER;
 		int leftCenterGravity = Gravity.LEFT | Gravity.CENTER;
 		
+		
+		initNewControls();
 		// default buttons
 		zoomControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
 				rightGravity);
@@ -117,14 +120,50 @@ public class MapControlsLayer extends OsmandMapLayer {
 		
 		rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent, 
 				rightGravity);
+		initTransparencyBar(view, parent);
+		
 		mapRoutePlanControl.setMargin(mapMenuControls.getWidth());
 		mapCancelNavigationControl.setMargin(mapSmallMenuControls.getWidth());
 		mapInfoNavigationControl.setMargin(mapSmallMenuControls.getWidth() + mapCancelNavigationControl.getWidth());
 		mapAppModeControl.setMargin(mapNavigationControl.getWidth());
 
-		initTransparencyBar(view, parent);
+		;
 	}
 
+	private void initNewControls() {
+		initZooms();
+		
+	}
+
+
+	private void initZooms() {
+		final OsmandMapTileView view = mapActivity.getMapView();
+		mapActivity.findViewById(id)
+		zoomInButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				if (view.isZooming()) {
+					mapActivity.changeZoom(2, System.currentTimeMillis());
+				} else {
+					mapActivity.changeZoom(1, System.currentTimeMillis());
+				}
+
+			}
+		});
+		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
+		zoomInButton.setOnLongClickListener(listener);
+		zoomOutButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				mapActivity.changeZoom(-1, System.currentTimeMillis());
+			}
+		});
+		zoomOutButton.setOnLongClickListener(listener);		
+	}
+
+
 	public void startNavigation() {
 		if (mapNavigationControl == null) {
 			return;
@@ -148,6 +187,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	protected void notifyClicked(MapControls m) {
+		notifyClicked();
+	}
+	
+	protected void notifyClicked() {
 		if(mapNavigationControl != null) {
 			mapNavigationControl.stopCounter();
 		}

From dcb3996a5ba783928065f9d14db7b828b1d124e5 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 11 Mar 2015 23:44:55 +0100
Subject: [PATCH 02/23] update map buttons

---
 OsmAnd/res/drawable/btn_circle_blue.xml       |  13 ++
 OsmAnd/res/drawable/btn_circle_trans.xml      |  13 ++
 OsmAnd/res/drawable/btn_round_night.xml       |  15 ++
 OsmAnd/res/layout/map_hud_bottom.xml          |  67 +++++--
 OsmAnd/res/values/colors.xml                  |   5 +-
 OsmAnd/res/values/sizes.xml                   |   2 +
 .../osmand/plus/views/MapControlsLayer.java   | 173 +++++++++++++++++-
 7 files changed, 264 insertions(+), 24 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_circle_blue.xml
 create mode 100644 OsmAnd/res/drawable/btn_circle_trans.xml
 create mode 100644 OsmAnd/res/drawable/btn_round_night.xml

diff --git a/OsmAnd/res/drawable/btn_circle_blue.xml b/OsmAnd/res/drawable/btn_circle_blue.xml
new file mode 100644
index 0000000000..12d1edcf49
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_circle_blue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="oval">
+            <solid android:color="@color/color_myloc_distance" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="oval">
+            <solid android:color="@color/map_widget_blue" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_circle_trans.xml b/OsmAnd/res/drawable/btn_circle_trans.xml
new file mode 100644
index 0000000000..e7018e90b8
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_circle_trans.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="oval">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="oval">
+            <solid android:color="@color/map_widget_light_trans" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_night.xml b/OsmAnd/res/drawable/btn_round_night.xml
new file mode 100644
index 0000000000..97904f75ea
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index f51ef81fbc..a691e26910 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -20,6 +20,7 @@
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_round"
+                android:id="@+id/map_menu_button"
                 android:src="@drawable/ic_action_remove_light" />
 
             <ImageButton
@@ -27,6 +28,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:layout_marginLeft="@dimen/map_button_spacing"
                 android:background="@drawable/btn_round"
+                android:id="@+id/map_route_info_button"
                 android:src="@drawable/ic_action_remove_light" />
         </LinearLayout>
 
@@ -38,6 +40,7 @@
             android:layout_marginRight="@dimen/map_button_margin" >
 
             <ImageButton
+                android:id="@+id/map_my_location_button"
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:layout_gravity="bottom"
@@ -52,14 +55,14 @@
                 android:orientation="vertical" >
 
                 <ImageButton
-                    android:id="@+id/"
+                    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_remove_light" />
 
                 <ImageButton
+					android:id="@+id/map_zoom_out_button"
                     android:layout_width="@dimen/map_button_size"
                     android:layout_height="@dimen/map_button_size"
                     android:layout_marginTop="@dimen/map_button_spacing"
@@ -75,24 +78,52 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="30dp"
-            android:background="@drawable/btn_flat"
+            android:layout_height="@dimen/map_route_buttons_height"
+            android:id="@+id/map_route_preparation_layout"
             android:layout_gravity="bottom" >
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="Route preparation" >
-            </TextView>
+            
+             <ImageButton
+                android:layout_width="@dimen/map_route_buttons_width"
+                android:layout_height="match_parent"
+                android:id="@+id/map_cancel_route_button"
+                android:background="@drawable/btn_flat"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_action_remove_light" />
+             
+             <ImageButton
+                android:layout_width="@dimen/map_route_buttons_width"
+                android:layout_height="match_parent"
+                android:id="@+id/map_waypoints_route_button"
+                android:background="@drawable/btn_flat"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_action_remove_light" />
+             
+             <ImageButton
+                android:layout_width="@dimen/map_route_buttons_width"
+                android:layout_height="match_parent"
+                android:background="@drawable/btn_flat"
+                android:id="@+id/map_options_route_button"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_action_remove_light" />
+             
+             <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/btn_flat"
+                android:layout_gravity="center_vertical"
+                android:id="@+id/map_go_route_button"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:drawableLeft="@drawable/ic_action_remove_light"
+                android:textSize="20sp" 
+                android:drawablePadding="4dp" />
         </LinearLayout>
         
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/map_context_menu_layout"
+            android:visibility="gone"
             android:background="@drawable/btn_flat" 
             android:layout_gravity="bottom">
 
@@ -101,11 +132,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:ellipsize="end"
-                android:gravity="center"
-                android:textColor="@color/color_black"
-                android:textSize="24sp"
-                android:maxLines="1"
-                android:text="Context menu" >
+                android:gravity="center">
             </TextView>
 
             <ImageButton
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 84b8136b02..0cf6f87e4d 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -11,8 +11,11 @@
 	<color name="list_item_background_dark_pressed">#be39464d</color>
 	
 	<color name="map_widget_stroke">#333333</color>
-	<color name="map_widget_light">#eeffffff</color>
+	<color name="map_widget_light">#aaffffff</color>
+	<color name="map_widget_dark">#aa3f3f3f</color>
+	<color name="map_widget_light_trans">#eeffffff</color>
 	<color name="map_widget_light_pressed">#ddcccccc</color>
+	<color name="map_widget_blue">#3030FF</color>
 
 
 	<color name="actionbar_dark_color">#39464d</color>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 4a3aa3edc3..fa4725999a 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -48,6 +48,8 @@
 	<dimen name="dashboard_parking_left_margin">16dp</dimen>
 	<dimen name="dashboard_parking_icon_size">48dp</dimen>
 	<!--  map buttons -->
+	<dimen name="map_route_buttons_width">60dp</dimen>
+	<dimen name="map_route_buttons_height">54dp</dimen>
 	<dimen name="map_address_height">40dp</dimen>
 	<dimen name="map_button_size">48dp</dimen>
 	<dimen name="map_widget_icon">24dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index fed0404d55..f96b6a3e9a 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -4,12 +4,14 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Surface;
 import net.osmand.PlatformUtil;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
@@ -30,6 +32,7 @@ import net.osmand.plus.views.controls.SmallMapMenuControls;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -38,12 +41,90 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
 public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
+	private static class MapControl {
+		ImageView iv;
+		int bgDark;
+		int bgLight;
+		int resId;
+		int resLight = R.color.icon_color_light;
+		int resDark = 0;
+				
+		boolean nightMode = false;
+		boolean f = true;
+		
+		
+		public MapControl setRoundTransparent() {
+			setBg(R.drawable.btn_circle_trans);
+			return this;
+		}
+		
+		public MapControl setBg(int dayBg, int nightBg) {
+			bgDark = nightBg;
+			bgLight = dayBg;
+			f = true;
+			return this;
+
+		}
+		
+		public MapControl setBg(int bg) {
+			bgDark = bg;
+			bgLight = bg;
+			f = true;
+			return this;
+		}
+		
+		public static MapControl create(ImageView iv, int resId) {
+			MapControl mc = new MapControl();
+			mc.iv = iv;
+			mc.resId = resId;
+			mc.setBg(R.drawable.btn_circle);
+			return mc;
+		}
+		
+		public boolean setIconResId(int resId) {
+			if(this.resId == resId) {
+				return false;
+			}
+			this.resId = resId;
+			f = true;
+			return true;
+		}
+
+		public boolean setIconColorId(int clr) {
+			if(resLight == clr && resDark == clr) {
+				return false;
+			}
+			resLight = clr;
+			resDark = clr;
+			f = true;
+			return true;
+		}
+		
+		public void update(OsmandApplication ctx, boolean night) {
+			if (nightMode == night && !f) {
+				return;
+			}
+			f = false;
+			nightMode = night;
+			iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
+			iv.setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
+		}
+
+		
+		
+	}
+	
+	
+	private List<MapControl> controls = new ArrayList<MapControlsLayer.MapControl>(); 
+	
+	
 	private final MapActivity mapActivity;
 	private int shadowColor = -1;
 	
@@ -68,12 +149,21 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private OsmandSettings settings;
 
 
+	private MapControl backToLocationControl;
+
+
+	private MapControl menuControl;
+
+
 	public MapControlsLayer(MapActivity activity){
 		this.mapActivity = activity;
 		settings = activity.getMyApplication().getSettings();
 	}
 	
 	
+	
+
+
 	@Override
 	public boolean drawInScreenPixels() {
 		return true;
@@ -132,13 +222,63 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initNewControls() {
 		initZooms();
+		initControls();
+	}
+
+
+	private void initControls() {
+		View backToLocation = mapActivity.findViewById(R.id.map_my_location_button);
+		backToLocationControl = MapControl.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location).setBg(R.drawable.btn_circle_blue)
+				;
+		controls.add(backToLocationControl);
 		
+		backToLocation.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
+			}
+		});		
+		
+		View backToMenuButton = mapActivity.findViewById(R.id.map_menu_button);
+		menuControl = MapControl.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).
+		setBg(R.drawable.btn_round, R.drawable.btn_round_night);
+		controls.add(menuControl);
+		backToMenuButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				// double lat = activity.getMapView().getLatitude();
+				// double lon = activity.getMapView().getLongitude();
+				// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
+				notifyClicked();
+				if(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get()) {
+					mapActivity.getDashboard().setDashboardVisibility(true);
+				} else {
+					mapActivity.getMapActions().onDrawerBack();
+					mapActivity.getMapActions().toggleDrawer();
+				}
+			}
+		});
+		
+		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
+		controls.add(MapControl.create((ImageView) routePlanButton, R.drawable.ic_action_info_dark).
+				setBg(R.drawable.btn_round, R.drawable.btn_round_night));
+		routePlanButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				mapActivity.getRoutingHelper().setRoutePlanningMode(true);
+				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
+				mapActivity.refreshMap();
+			}
+		});
 	}
 
 
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
-		mapActivity.findViewById(id)
+		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
+		controls.add(MapControl.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent()
+				);
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -153,6 +293,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
+		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
+		controls.add(MapControl.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent()
+				);
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -198,7 +341,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	@Override
 	public void destroyLayer() {
-
+		controls.clear();
 	}
 
 	@Override
@@ -246,8 +389,31 @@ public class MapControlsLayer extends OsmandMapLayer {
 				(zoomControls.getHeight() + zoomControls.getTotalVerticalMargin()) : 0;
 		rulerControl.setVerticalMargin(vmargin);
 		checkVisibilityAndDraw(true, rulerControl, canvas, tileBox, nightMode);
+		
+		
+		///////////////////////////////////////////////
+		// new update
+		boolean enabled = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
+		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
+		if (!enabled) {
+			backToLocationControl.setIconColorId(R.color.icon_color_light);
+		} else if (tracked) {
+			backToLocationControl.setIconColorId(R.color.color_distance);
+		} else {
+			backToLocationControl.setIconColorId(R.color.color_white);
+		}
+		menuControl.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? 
+				R.drawable.ic_dashboard_dark : R.drawable.ic_navigation_drawer);
+		
+		for(MapControl mc : controls) {
+			mc.update(mapActivity.getMyApplication(),
+					nightMode == null ? false : nightMode.isNightMode());
+		}
+		
 	}
 	
+
+
 	private void updatextColor(int textColor, int shadowColor, MapControls... mc) {
 		for(MapControls m : mc) {
 			m.updateTextColor(textColor, shadowColor);
@@ -264,7 +430,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 			}
 		}
 		if(controls.isVisible()) {
-			controls.onDraw(canvas, tileBox, nightMode);
+			// FIXME
+//			controls.onDraw(canvas, tileBox, nightMode);
 		}		
 	}
 

From 86bbdabb4c6372a0351a38f9666299ac69704bc0 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 12 Mar 2015 00:35:13 +0100
Subject: [PATCH 03/23] Update buttons

---
 OsmAnd/res/drawable/btn_circle_blue.xml       |   2 +-
 OsmAnd/res/values/colors.xml                  |   7 +-
 OsmAnd/res/values/sizes.xml                   |   2 +-
 .../osmand/plus/OsmAndAppCustomization.java   |   1 -
 .../plus/sherpafy/SherpafyCustomization.java  |   4 -
 .../osmand/plus/views/MapControlsLayer.java   | 310 +++++++-----------
 .../views/controls/MapRouteInfoControl.java   |  76 ++---
 .../controls/MapRoutePreferencesControl.java  | 268 +++++++--------
 8 files changed, 272 insertions(+), 398 deletions(-)

diff --git a/OsmAnd/res/drawable/btn_circle_blue.xml b/OsmAnd/res/drawable/btn_circle_blue.xml
index 12d1edcf49..34a59dea72 100644
--- a/OsmAnd/res/drawable/btn_circle_blue.xml
+++ b/OsmAnd/res/drawable/btn_circle_blue.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"><shape android:shape="oval">
-            <solid android:color="@color/color_myloc_distance" />
+            <solid android:color="@color/map_widget_blue_pressed" />
             <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
         </shape></item>
     <item><shape android:shape="oval">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 0cf6f87e4d..ce5ae7fab0 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -11,11 +11,12 @@
 	<color name="list_item_background_dark_pressed">#be39464d</color>
 	
 	<color name="map_widget_stroke">#333333</color>
-	<color name="map_widget_light">#aaffffff</color>
+	<color name="map_widget_light">#eeffffff</color>
 	<color name="map_widget_dark">#aa3f3f3f</color>
-	<color name="map_widget_light_trans">#eeffffff</color>
+	<color name="map_widget_light_trans">#88ffffff</color>
 	<color name="map_widget_light_pressed">#ddcccccc</color>
-	<color name="map_widget_blue">#3030FF</color>
+	<color name="map_widget_blue">#30A0FF</color>
+	<color name="map_widget_blue_pressed">#dd30D0FF</color>
 
 
 	<color name="actionbar_dark_color">#39464d</color>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index fa4725999a..67d0ead6e5 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -55,7 +55,7 @@
 	<dimen name="map_widget_icon">24dp</dimen>
 	<dimen name="map_widget_height">32dp</dimen>
 	<dimen name="map_widget_image">80dp</dimen>
-	<dimen name="map_button_spacing">20dp</dimen>
+	<dimen name="map_button_spacing">18dp</dimen>
 	<dimen name="map_button_margin">4dp</dimen>
 	<dimen name="map_button_inset">4dp</dimen>
 	<dimen name="map_button_rect_rad">3dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index b96c5e4845..a4e72b8ce6 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -151,7 +151,6 @@ public class OsmAndAppCustomization {
 		return osmandSettings.getExternalStorageDirectory();
 	}
 
-	public boolean showNavigationControls() { return true;}
 
 	public boolean onlyTourDownload() {
 		return false;
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 6e2ca75ffb..739a99438b 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -739,9 +739,5 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		a.startActivityForResult(newIntent, 0);
 	}
 	
-	@Override
-	public boolean showNavigationControls() {
-		return false;
-	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index f96b6a3e9a..2a85bdfb88 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -48,7 +48,7 @@ import android.widget.SeekBar;
 public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
-	private static class MapControl {
+	private static class MapHudButton {
 		ImageView iv;
 		int bgDark;
 		int bgLight;
@@ -60,12 +60,12 @@ public class MapControlsLayer extends OsmandMapLayer {
 		boolean f = true;
 		
 		
-		public MapControl setRoundTransparent() {
+		public MapHudButton setRoundTransparent() {
 			setBg(R.drawable.btn_circle_trans);
 			return this;
 		}
 		
-		public MapControl setBg(int dayBg, int nightBg) {
+		public MapHudButton setBg(int dayBg, int nightBg) {
 			bgDark = nightBg;
 			bgLight = dayBg;
 			f = true;
@@ -73,15 +73,15 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 		}
 		
-		public MapControl setBg(int bg) {
+		public MapHudButton setBg(int bg) {
 			bgDark = bg;
 			bgLight = bg;
 			f = true;
 			return this;
 		}
 		
-		public static MapControl create(ImageView iv, int resId) {
-			MapControl mc = new MapControl();
+		public static MapHudButton create(ImageView iv, int resId) {
+			MapHudButton mc = new MapHudButton();
 			mc.iv = iv;
 			mc.resId = resId;
 			mc.setBg(R.drawable.btn_circle);
@@ -113,7 +113,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 			}
 			f = false;
 			nightMode = night;
-			iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
+			if(bgDark != 0 && bgLight != 0) {
+				iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
+			}
 			iv.setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
 		}
 
@@ -121,25 +123,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 		
 	}
 	
-	
-	private List<MapControl> controls = new ArrayList<MapControlsLayer.MapControl>(); 
-	
-	
+	private List<MapHudButton> controls = new ArrayList<MapControlsLayer.MapHudButton>(); 
 	private final MapActivity mapActivity;
 	private int shadowColor = -1;
-	
-	private MapZoomControls zoomControls;
-	private MapZoomControls zoomSideControls;
-	private MapMenuControls mapMenuControls;
-	private RulerControl rulerControl;
-	
-	private SmallMapMenuControls mapSmallMenuControls;
-	private MapCancelControl mapCancelNavigationControl;
-	private MapRouteInfoControl mapInfoNavigationControl;
-	private MapNavigateControl mapNavigationControl;
-	private MapRoutePlanControl mapRoutePlanControl;
-	private MapRoutePreferencesControl mapAppModeControl;
-	private List<MapControls> allControls = new ArrayList<MapControls>();
+//	private RulerControl rulerControl;
+//	private List<MapControls> allControls = new ArrayList<MapControls>();
 	
 	private float scaleCoefficient;
 
@@ -148,11 +136,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private static CommonPreference<Integer> settingsToTransparency;
 	private OsmandSettings settings;
 
-
-	private MapControl backToLocationControl;
+	private MapHudButton backToLocationControl;
+	private MapHudButton menuControl;
+	private View routePreparationLayout;
+	private MapRouteInfoControl mapRouteInfoControl;
+	private MapHudButton optionsRouteControl;
 
 
-	private MapControl menuControl;
+	private MapRoutePreferencesControl optionsRouteControlDialog;
 
 
 	public MapControlsLayer(MapActivity activity){
@@ -173,62 +164,69 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public void initLayer(final OsmandMapTileView view) {
 		scaleCoefficient = view.getScaleCoefficient();
 		FrameLayout parent = getParent();
-		Handler showUIHandler = new Handler();
-		int rightGravity = Gravity.RIGHT | Gravity.BOTTOM;
-		int leftGravity = Gravity.LEFT | Gravity.BOTTOM;
-		int rightCenterGravity = Gravity.RIGHT | Gravity.CENTER;
-		int leftCenterGravity = Gravity.LEFT | Gravity.CENTER;
-		
-		
 		initNewControls();
-		// default buttons
-		zoomControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
-				rightGravity);
-		if (ScreenOrientationHelper.getScreenOrientation(mapActivity) == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT){
-			zoomSideControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
-					rightCenterGravity);
-		} else {
-			zoomSideControls = init(new MapZoomControls(mapActivity, showUIHandler, scaleCoefficient), parent,
-					leftCenterGravity);
-		}
-		mapMenuControls = init(new MapMenuControls(mapActivity, showUIHandler, scaleCoefficient), parent,
-				leftGravity);
-		mapRoutePlanControl = init(new MapRoutePlanControl(mapActivity, showUIHandler, scaleCoefficient), parent,
-				leftGravity);
-		// calculate route buttons
-		mapSmallMenuControls = init(new SmallMapMenuControls(mapActivity, showUIHandler, scaleCoefficient), parent,
-				leftGravity);
-		mapCancelNavigationControl = init(new MapCancelControl(mapActivity, showUIHandler, scaleCoefficient), parent,
-				leftGravity);
-		mapInfoNavigationControl = init(new MapRouteInfoControl(mapActivity.getMapLayers().getContextMenuLayer(),
-				mapActivity, showUIHandler, scaleCoefficient), parent,
-				leftGravity);
-		mapNavigationControl = init(new MapNavigateControl(mapInfoNavigationControl, mapActivity, showUIHandler, scaleCoefficient), parent,
-				rightGravity);
-		mapAppModeControl = init(new MapRoutePreferencesControl(mapActivity, showUIHandler, scaleCoefficient), parent,
-				rightGravity);
-		
-		rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent, 
-				rightGravity);
+		// TODO
+//		rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent, 
+//				rightGravity);
 		initTransparencyBar(view, parent);
-		
-		mapRoutePlanControl.setMargin(mapMenuControls.getWidth());
-		mapCancelNavigationControl.setMargin(mapSmallMenuControls.getWidth());
-		mapInfoNavigationControl.setMargin(mapSmallMenuControls.getWidth() + mapCancelNavigationControl.getWidth());
-		mapAppModeControl.setMargin(mapNavigationControl.getWidth());
-
-		;
 	}
 
 	private void initNewControls() {
 		initZooms();
 		initControls();
+		initRouteControls();
 	}
 
+	
+	private void initRouteControls() {
+		routePreparationLayout = mapActivity.findViewById(R.id.map_route_preparation_layout);
+		View cancelRouteButton = mapActivity.findViewById(R.id.map_cancel_route_button);
+		controls.add(MapHudButton.create((ImageView) cancelRouteButton, R.drawable.ic_action_remove_dark));
+		
+		cancelRouteButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				if(mapActivity.getRoutingHelper().isFollowingMode()) {
+					mapActivity.getMapActions().stopNavigationActionConfirm(mapActivity.getMapView());
+				} else {
+					mapActivity.getMapActions().stopNavigationWithoutConfirm();
+				}
+			}
+		});
+		mapRouteInfoControl = new MapRouteInfoControl(mapActivity.getMapLayers().getContextMenuLayer(),
+				mapActivity);
+		
+		View waypointsButton = mapActivity.findViewById(R.id.map_waypoints_route_button);
+		controls.add(MapHudButton.create((ImageView) waypointsButton, R.drawable.ic_action_flage_dark));
+		waypointsButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				mapRouteInfoControl.showHideDialog();
+			}
+		});
+		
+		View optionsRouteButton = mapActivity.findViewById(R.id.map_options_route_button);
+		optionsRouteControl = MapHudButton.create((ImageView) optionsRouteButton, settings.getApplicationMode().getSmallIcon(false));
+		optionsRouteControlDialog = new MapRoutePreferencesControl(mapActivity);
+		controls.add(optionsRouteControl);
+		optionsRouteButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				optionsRouteControlDialog.showAndHideDialog();
+			}
+		});
+	}
+	
+	public void showDialog(){
+		mapRouteInfoControl.setShowDialog();
+	}
 
 	private void initControls() {
 		View backToLocation = mapActivity.findViewById(R.id.map_my_location_button);
-		backToLocationControl = MapControl.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location).setBg(R.drawable.btn_circle_blue)
+		backToLocationControl = MapHudButton.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location).setBg(R.drawable.btn_circle_blue)
 				;
 		controls.add(backToLocationControl);
 		
@@ -240,7 +238,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});		
 		
 		View backToMenuButton = mapActivity.findViewById(R.id.map_menu_button);
-		menuControl = MapControl.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).
+		menuControl = MapHudButton.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).
 		setBg(R.drawable.btn_round, R.drawable.btn_round_night);
 		controls.add(menuControl);
 		backToMenuButton.setOnClickListener(new View.OnClickListener() {
@@ -260,7 +258,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 		
 		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
-		controls.add(MapControl.create((ImageView) routePlanButton, R.drawable.ic_action_info_dark).
+		controls.add(MapHudButton.create((ImageView) routePlanButton, R.drawable.ic_action_info_dark).
 				setBg(R.drawable.btn_round, R.drawable.btn_round_night));
 		routePlanButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -277,7 +275,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
 		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
-		controls.add(MapControl.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent()
+		controls.add(MapHudButton.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent()
 				);
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -294,7 +292,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		controls.add(MapControl.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent()
+		controls.add(MapHudButton.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent()
 				);
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -308,35 +306,25 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 
 	public void startNavigation() {
-		if (mapNavigationControl == null) {
-			return;
-		}
-		mapNavigationControl.startNavigation();
+		// TODO
+//		if (mapNavigationControl == null) {
+//			return;
+//		}
+//		mapNavigationControl.startNavigation();
 	}
 
 
-	private <T extends MapControls> T init(final T c, FrameLayout parent, int gravity) {
-		c.setGravity(gravity);
-		c.init(parent);
-		allControls.add(c);
-		c.setNotifyClick(new Runnable() {
-			
-			@Override
-			public void run() {
-				notifyClicked(c);
-			}
-		});
-		return c;
-	}
+	
 
 	protected void notifyClicked(MapControls m) {
 		notifyClicked();
 	}
 	
 	protected void notifyClicked() {
-		if(mapNavigationControl != null) {
-			mapNavigationControl.stopCounter();
-		}
+		// TODO
+//		if(mapNavigationControl != null) {
+//			mapNavigationControl.stopCounter();
+//		}
 	}
 
 	@Override
@@ -348,50 +336,26 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
 		boolean isNight = nightMode != null && nightMode.isNightMode();
 		int shadw = isNight ? Color.TRANSPARENT : Color.WHITE;
-		int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK ;
-		if(shadowColor != shadw) {
+		int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK;
+		if (shadowColor != shadw) {
 			shadowColor = shadw;
-			updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls);
+			// TODO
+//			updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls);
 		}
 		// default buttons
 		boolean routePlanningMode = false;
 		RoutingHelper rh = mapActivity.getRoutingHelper();
-		if(rh.isRoutePlanningMode() ) {
+		if (rh.isRoutePlanningMode()) {
 			routePlanningMode = true;
-		} else if((rh.isRouteCalculated() || rh.isRouteBeingCalculated()) && 
-				!rh.isFollowingMode()){
+		} else if ((rh.isRouteCalculated() || rh.isRouteBeingCalculated()) && !rh.isFollowingMode()) {
 			routePlanningMode = true;
 		}
 		boolean routeFollowingMode = !routePlanningMode && rh.isFollowingMode();
-		boolean showDefaultButtons = !routePlanningMode && (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
-		if(routePlanningMode) {
-			forceHideView(zoomControls);
-			forceHideView(mapMenuControls);
-			forceHideView(mapRoutePlanControl);
-		}
-		checkVisibilityAndDraw(showDefaultButtons, zoomControls, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showDefaultButtons, mapMenuControls, canvas, tileBox, nightMode);
-		// show only on touch
-		checkVisibilityAndDraw(false, mapRoutePlanControl, canvas, tileBox, nightMode);
-		
-		// route calculation buttons
 		boolean showRouteCalculationControls = routePlanningMode;
-		boolean showNavigationControls = mapActivity.getMyApplication().getAppCustomization().showNavigationControls();
-		checkVisibilityAndDraw(showRouteCalculationControls, mapSmallMenuControls, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showNavigationControls && showRouteCalculationControls, mapCancelNavigationControl, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showNavigationControls && showRouteCalculationControls, mapInfoNavigationControl, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showNavigationControls && showRouteCalculationControls, mapAppModeControl, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showRouteCalculationControls, mapNavigationControl, canvas, tileBox, nightMode);
-		checkVisibilityAndDraw(showRouteCalculationControls, zoomSideControls, canvas, tileBox, nightMode);
-		
-		// the last one to check other controls visibility
-		int vmargin = mapNavigationControl.isVisible() || zoomControls.isVisible() ?
-				(zoomControls.getHeight() + zoomControls.getTotalVerticalMargin()) : 0;
-		rulerControl.setVerticalMargin(vmargin);
-		checkVisibilityAndDraw(true, rulerControl, canvas, tileBox, nightMode);
-		
-		
-		///////////////////////////////////////////////
+
+		boolean showDefaultButtons = !routePlanningMode
+				&& (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
+		// /////////////////////////////////////////////
 		// new update
 		boolean enabled = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
 		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
@@ -402,14 +366,19 @@ public class MapControlsLayer extends OsmandMapLayer {
 		} else {
 			backToLocationControl.setIconColorId(R.color.color_white);
 		}
-		menuControl.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? 
-				R.drawable.ic_dashboard_dark : R.drawable.ic_navigation_drawer);
-		
-		for(MapControl mc : controls) {
-			mc.update(mapActivity.getMyApplication(),
-					nightMode == null ? false : nightMode.isNightMode());
+		menuControl.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
+						: R.drawable.ic_navigation_drawer);
+		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIcon(false));
+		int vis = showRouteCalculationControls? View.VISIBLE : View.GONE;
+		if(routePreparationLayout.getVisibility() != vis) {
+			routePreparationLayout.setVisibility(vis);
+			mapRouteInfoControl.setVisible(showRouteCalculationControls);
 		}
-		
+
+		for (MapHudButton mc : controls) {
+			mc.update(mapActivity.getMyApplication(), nightMode == null ? false : nightMode.isNightMode());
+		}
+
 	}
 	
 
@@ -419,57 +388,32 @@ public class MapControlsLayer extends OsmandMapLayer {
 			m.updateTextColor(textColor, shadowColor);
 		}
 	}
-
-	private void checkVisibilityAndDraw(boolean visibility, MapControls controls, Canvas canvas,
-			RotatedTileBox tileBox, DrawSettings nightMode) {
-		if(visibility != controls.isVisible() ){
-			if(visibility) {
-				controls.show(getParent());
-			} else {
-				controls.hide(getParent());
-			}
-		}
-		if(controls.isVisible()) {
-			// FIXME
-//			controls.onDraw(canvas, tileBox, nightMode);
-		}		
-	}
-
 	private FrameLayout getParent() {
 		return (FrameLayout) mapActivity.findViewById(R.id.MapButtons);
 	}
 
-	private void forceHideView(MapControls controls) {
-		if (controls.isVisible()) {
-			controls.forceHide(getParent());
-		}
-	}
-
 
 	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		for(MapControls m : allControls) {
-			if(m.isVisible() && m.onSingleTap(point, tileBox)){
-				return true;
-			}
-		}
+		// TODO stop counter & show buttons
+//		for(MapControls m : allControls) {
+//			if(m.isVisible() && m.onSingleTap(point, tileBox)){
+//				return true;
+//			}
+//		}
 		return false;
 	}
 	
 	@Override
 	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
-		if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode()) {
-			if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
-				zoomControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-				mapMenuControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-			}
-			mapRoutePlanControl.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-		}
-		for(MapControls m : allControls) {
-			if(m.isVisible() && m.onTouchEvent(event, tileBox)){
-				return true;
-			}
-		}
+		// TODO stop counter & show buttons
+//		if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode()) {
+//			if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
+//				zoomControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+//				mapMenuControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+//			}
+//			mapRoutePlanControl.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+//		}
 		return false;
 	}
 
@@ -539,22 +483,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public void shiftLayout(int height) {
-		FrameLayout parent = getParent();
-		parent.requestLayout();
-		for(MapControls mc : allControls) {
-			if(mc.isBottom()){
-				mc.setExtraVerticalMargin(height);
-				if( mc.isVisible()) {
-					mc.forceHide(parent);
-					mc.show(parent);
-				}
-			}
-		}
+		// TODO
 	}
 
-	public void showDialog(){
-		mapInfoNavigationControl.setShowDialog();
-	}
+	
 
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
index abf04a4ec9..b8482ffd0a 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@@ -31,7 +31,6 @@ import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.PointF;
 import android.graphics.drawable.Drawable;
-import android.os.Handler;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -45,11 +44,9 @@ import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class MapRouteInfoControl extends MapControls implements IRouteInformationListener {
-	private Button infoButton;
+public class MapRouteInfoControl implements IRouteInformationListener {
 	public static int directionInfo = -1;
 	public static boolean controlVisible = false;
-	
 	private final ContextMenuLayer contextMenu;
 	private final RoutingHelper routingHelper;
 	private OsmandMapTileView mapView;
@@ -59,17 +56,17 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 	private boolean selectFromMapForTarget;
 
 	private boolean showDialog = false;
+	private MapActivity mapActivity;
 
 	public MapRouteInfoControl(ContextMenuLayer contextMenu,
-			MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
+			MapActivity mapActivity) {
 		this.contextMenu = contextMenu;
+		this.mapActivity = mapActivity;
 		routingHelper = mapActivity.getRoutingHelper();
 		mapView = mapActivity.getMapView();
 		routingHelper.addListener(this);
 	}
 	
-	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if(selectFromMapTouch) {
 			LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
@@ -83,30 +80,31 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 			showDialog();
 			return true;
 		}
-		return super.onSingleTap(point, tileBox);
+		return false;
 	}
 	
-	@Override
-	public void showControls(FrameLayout parent) {
-		infoButton = addButton(parent, R.string.route_info, R.drawable.map_btn_signpost);
-		if (showDialog){
-			if (getTargets().getPointToNavigate() == null){
-				showDialog();
-			}
-			showDialog = false;
-		}
-		controlVisible = true;
-		infoButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				if(dialog != null) {
-					hideDialog();
-				} else {
+	public void setVisible(boolean visible) {
+		if(visible) {
+			if (showDialog){
+				if (getTargets().getPointToNavigate() == null){
 					showDialog();
 				}
+				showDialog = false;
 			}
-		});
+			controlVisible = true;
+		} else {
+			hideDialog();
+			controlVisible = false;
+		}
+	}
+	
+	
+	public void showHideDialog() {
+		if(dialog != null) {
+			hideDialog();
+		} else {
+			showDialog();
+		}
 	}
 	
 	private Dialog createDialog() {
@@ -137,7 +135,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 		lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
 		lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
 		lp.gravity = Gravity.BOTTOM;
-		lp.y = (int) (infoButton.getBottom() - infoButton.getTop() + scaleCoefficient * 5 + getExtraVerticalMargin());
+		// TODO
+//		lp.y = (int) (infoButton.getBottom() - infoButton.getTop() + scaleCoefficient * 5 + getExtraVerticalMargin());
 		dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
 		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
 		dialog.getWindow().setAttributes(lp);
@@ -253,26 +252,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 		return controlVisible;
 	}
 	
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, infoButton);
-		hideDialog();
-		controlVisible = false;
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-	}
-	
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_info);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-	
-	
 	private void attachListeners(final View mainView) {
 		final OsmandApplication ctx = mapActivity.getMyApplication();
 		final Button simulateRoute = (Button) mainView.findViewById(R.id.SimulateRoute);
@@ -449,11 +428,9 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 	public void showDialog() {
 		dialog = createDialog();
 		dialog.show();
-		infoButton.setBackgroundResource(R.drawable.map_btn_signpost_p);
 		dialog.setOnDismissListener(new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface dlg) {
-				infoButton.setBackgroundResource(R.drawable.map_btn_signpost);
 				dialog = null;
 			}
 		});
@@ -463,7 +440,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 		if (dialog != null) {
 			dialog.hide();
 			dialog = null;
-			infoButton.setBackgroundResource(R.drawable.map_btn_signpost);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
index 400e58aebb..712f96e2dc 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
@@ -9,14 +9,13 @@ import java.util.Set;
 import net.osmand.CallbackWithObject;
 import net.osmand.Location;
 import net.osmand.data.LatLon;
-import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
-import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
+import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SettingsBaseActivity;
@@ -25,7 +24,6 @@ import net.osmand.plus.activities.actions.AppModeDialog;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RouteProvider.RouteService;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.GeneralRouter.RoutingParameterType;
@@ -35,8 +33,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
-import android.graphics.Canvas;
-import android.os.Handler;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,120 +43,107 @@ import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class MapRoutePreferencesControl extends MapControls {
-	private ImageButton settingsAppModeButton;
+public class MapRoutePreferencesControl {
 	private OsmandSettings settings;
-	private int cachedId;
 	private Dialog dialog;
 	private ArrayAdapter<LocalRoutingParameter> listAdapter;
-	
-	public MapRoutePreferencesControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
+	private MapActivity mapActivity;
+
+	public MapRoutePreferencesControl(MapActivity mapActivity) {
+		this.mapActivity = mapActivity;
 		settings = mapActivity.getMyApplication().getSettings();
 	}
-	
+
 	private static class LocalRoutingParameter {
-		
+
 		public RoutingParameter routingParameter;
 
 		public String getText(MapActivity mapActivity) {
-			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, routingParameter.getId(), routingParameter.getName());
+			return SettingsBaseActivity.getRoutingStringPropertyName(mapActivity, routingParameter.getId(),
+					routingParameter.getName());
 		}
 
 		public boolean isSelected(OsmandSettings settings) {
-			final CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameter.getId());
+			final CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameter
+					.getId());
 			return property.get();
 		}
 
 		public void setSelected(OsmandSettings settings, boolean isChecked) {
-			final CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameter.getId());
-			property.set(isChecked);			
+			final CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameter
+					.getId());
+			property.set(isChecked);
 		}
-		
+
 	}
-	
+
 	private static class OtherLocalRoutingParameter extends LocalRoutingParameter {
 		public String text;
 		public boolean selected;
 		public int id;
-		
+
 		public OtherLocalRoutingParameter(int id, String text, boolean selected) {
 			this.text = text;
 			this.selected = selected;
 			this.id = id;
 		}
-		
+
 		@Override
 		public String getText(MapActivity mapActivity) {
 			return text;
 		}
-		
+
 		@Override
 		public boolean isSelected(OsmandSettings settings) {
 			return selected;
 		}
-		
+
 		@Override
 		public void setSelected(OsmandSettings settings, boolean isChecked) {
 			selected = isChecked;
 		}
 	}
-	
-	@Override
-	public void showControls(FrameLayout parent) {
-		settingsAppModeButton = addImageButton(parent, R.string.route_preferences, R.drawable.map_btn_plain);
-		cachedId = 0;
-		settingsAppModeButton.setOnClickListener(new View.OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				if(dialog != null) {
-					dialog.hide();
+
+	public void showAndHideDialog() {
+		if (dialog != null) {
+			dialog.hide();
+			dialog = null;
+		} else {
+			dialog = showDialog();
+			dialog.show();
+			dialog.setOnDismissListener(new OnDismissListener() {
+				@Override
+				public void onDismiss(DialogInterface dlg) {
 					dialog = null;
-					settingsAppModeButton.setBackgroundResource(R.drawable.map_btn_plain);
-				} else {
-					dialog = showDialog();
-					dialog.show();
-					settingsAppModeButton.setBackgroundResource(R.drawable.map_btn_plain_p);
-					dialog.setOnDismissListener(new OnDismissListener() {
-						@Override
-						public void onDismiss(DialogInterface dlg) {
-							settingsAppModeButton.setBackgroundResource(R.drawable.map_btn_plain);
-							dialog = null;
-						}
-					});
 				}
-			}
-		});
+			});
+		}
 	}
-	
+
 	private Dialog showDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);        
-        View ll = createLayout();
-        builder.setView(ll);
-        //builder.setTitle(R.string.route_preferences);
-        Dialog dialog = builder.create();
-        dialog.setCanceledOnTouchOutside(true);
-        WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
-        lp.copyFrom(dialog.getWindow().getAttributes());
-        lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.gravity = Gravity.BOTTOM;
-        lp.y = (int) (settingsAppModeButton.getBottom() - settingsAppModeButton.getTop() + scaleCoefficient * 5); 
-        dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
-        dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        dialog.getWindow().setAttributes(lp);
-        return dialog;
+		AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
+		View ll = createLayout();
+		builder.setView(ll);
+		// builder.setTitle(R.string.route_preferences);
+		Dialog dialog = builder.create();
+		dialog.setCanceledOnTouchOutside(true);
+		WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
+		lp.copyFrom(dialog.getWindow().getAttributes());
+		lp.width = WindowManager.LayoutParams.WRAP_CONTENT;
+		lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+		lp.gravity = Gravity.BOTTOM;
+		// TODO
+//		lp.y = (int) (settingsAppModeButton.getBottom() - settingsAppModeButton.getTop() + scaleCoefficient * 5);
+		dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+		dialog.getWindow().setAttributes(lp);
+		return dialog;
 	}
-	
-	
+
 	private void updateGpxRoutingParameter(OtherLocalRoutingParameter gpxParam) {
 		GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
 		boolean selected = gpxParam.isSelected(settings);
@@ -174,17 +157,18 @@ public class MapRoutePreferencesControl extends MapControls {
 					Location end = ps.get(ps.size() - 1);
 					TargetPoint pn = tg.getPointToNavigate();
 					boolean update = false;
-					if (pn == null || 
-							MapUtils.getDistance(pn.point, new LatLon(first.getLatitude(), first.getLongitude())) < 10) {
+					if (pn == null
+							|| MapUtils.getDistance(pn.point, new LatLon(first.getLatitude(), first.getLongitude())) < 10) {
 						tg.navigateToPoint(new LatLon(end.getLatitude(), end.getLongitude()), false, -1);
 						update = true;
 					}
-					if (tg.getPointToStart() == null || 
-							MapUtils.getDistance(tg.getPointToStart().point, new LatLon(end.getLatitude(), end.getLongitude())) < 10) {
+					if (tg.getPointToStart() == null
+							|| MapUtils.getDistance(tg.getPointToStart().point,
+									new LatLon(end.getLatitude(), end.getLongitude())) < 10) {
 						tg.setStartPoint(new LatLon(first.getLatitude(), first.getLongitude()), false, null);
 						update = true;
 					}
-					if(update) {
+					if (update) {
 						tg.updateRouteAndReferesh(true);
 					}
 				}
@@ -208,45 +192,47 @@ public class MapRoutePreferencesControl extends MapControls {
 		if (gpxParam.id == R.string.fast_route_mode) {
 			settings.FAST_ROUTE_MODE.set(selected);
 		}
-		if (gpxParam.id	== R.string.speak_favorites){
+		if (gpxParam.id == R.string.speak_favorites) {
 			settings.ANNOUNCE_NEARBY_FAVORITES.set(selected);
 		}
 	}
 
-	
 	private List<LocalRoutingParameter> getRoutingParameters(ApplicationMode am) {
 		List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>();
 		GPXRouteParamsBuilder rparams = mapActivity.getRoutingHelper().getCurrentGPXRoute();
-		boolean osmandRouter = settings.ROUTER_SERVICE.get() == RouteService.OSMAND ;
-		if(!osmandRouter) {
-			list.add(new OtherLocalRoutingParameter(R.string.calculate_osmand_route_without_internet, 
-					getString(R.string.calculate_osmand_route_without_internet), settings.GPX_ROUTE_CALC_OSMAND_PARTS.get()));
-			list.add(new OtherLocalRoutingParameter(R.string.fast_route_mode, 
-					getString(R.string.fast_route_mode), settings.FAST_ROUTE_MODE.get()));
+		boolean osmandRouter = settings.ROUTER_SERVICE.get() == RouteService.OSMAND;
+		if (!osmandRouter) {
+			list.add(new OtherLocalRoutingParameter(R.string.calculate_osmand_route_without_internet,
+					getString(R.string.calculate_osmand_route_without_internet), settings.GPX_ROUTE_CALC_OSMAND_PARTS
+							.get()));
+			list.add(new OtherLocalRoutingParameter(R.string.fast_route_mode, getString(R.string.fast_route_mode),
+					settings.FAST_ROUTE_MODE.get()));
 			return list;
 		}
-		if(rparams != null) {
+		if (rparams != null) {
 			GPXFile fl = rparams.getFile();
 			if (fl.hasRtePt()) {
 				list.add(new OtherLocalRoutingParameter(R.string.use_points_as_intermediates,
 						getString(R.string.use_points_as_intermediates), rparams.isUseIntermediatePointsRTE()));
 			}
-			list.add(new OtherLocalRoutingParameter(R.string.gpx_option_reverse_route, 
+			list.add(new OtherLocalRoutingParameter(R.string.gpx_option_reverse_route,
 					getString(R.string.gpx_option_reverse_route), rparams.isReverse()));
 			if (!rparams.isUseIntermediatePointsRTE()) {
-				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_from_start_point, 
-					getString(R.string.gpx_option_from_start_point), rparams.isPassWholeRoute()));
+				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_from_start_point,
+						getString(R.string.gpx_option_from_start_point), rparams.isPassWholeRoute()));
 				list.add(new OtherLocalRoutingParameter(R.string.gpx_option_calculate_first_last_segment,
-						getString(R.string.gpx_option_calculate_first_last_segment), rparams.isCalculateOsmAndRouteParts()));
+						getString(R.string.gpx_option_calculate_first_last_segment), rparams
+								.isCalculateOsmAndRouteParts()));
 			}
-//			list.add(new OtherLocalRoutingParameter(R.string.announce_gpx_waypoints, 
-//					getString(R.string.announce_gpx_waypoints), rparams.isAnnounceWaypoints()));
+			// list.add(new OtherLocalRoutingParameter(R.string.announce_gpx_waypoints,
+			// getString(R.string.announce_gpx_waypoints), rparams.isAnnounceWaypoints()));
 			// Temporary disabled
-			// list.add(new GPXLocalRoutingParameter(R.string.calculate_osmand_route_gpx, 
-			//		getString(R.string.calculate_osmand_route_gpx), rparams.isCalculateOsmAndRoute()));
+			// list.add(new GPXLocalRoutingParameter(R.string.calculate_osmand_route_gpx,
+			// getString(R.string.calculate_osmand_route_gpx), rparams.isCalculateOsmAndRoute()));
 		}
-		GeneralRouter rm = SettingsNavigationActivity.getRouter(mapActivity.getMyApplication().getDefaultRoutingConfig(), am);
-		if(rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute())) {
+		GeneralRouter rm = SettingsNavigationActivity.getRouter(mapActivity.getMyApplication()
+				.getDefaultRoutingConfig(), am);
+		if (rm == null || (rparams != null && !rparams.isCalculateOsmAndRoute())) {
 			return list;
 		}
 		for (RoutingParameter r : rm.getParameters().values()) {
@@ -259,6 +245,7 @@ public class MapRoutePreferencesControl extends MapControls {
 
 		return list;
 	}
+
 	private String getString(int id) {
 		return mapActivity.getString(id);
 	}
@@ -271,12 +258,12 @@ public class MapRoutePreferencesControl extends MapControls {
 		final ListView lv = (ListView) settingsDlg.findViewById(android.R.id.list);
 		final Set<ApplicationMode> selected = new HashSet<ApplicationMode>();
 		selected.add(am);
-		
+
 		setupSpinner(settingsDlg);
-		
-		
-		listAdapter = new ArrayAdapter<LocalRoutingParameter>(ctx, 
-				R.layout.layers_list_activity_item, R.id.title, getRoutingParameters(am)) {
+		final float scaleCoefficient = mapActivity.getMapView().getScaleCoefficient();
+
+		listAdapter = new ArrayAdapter<LocalRoutingParameter>(ctx, R.layout.layers_list_activity_item, R.id.title,
+				getRoutingParameters(am)) {
 			@Override
 			public View getView(final int position, View convertView, ViewGroup parent) {
 				View v = mapActivity.getLayoutInflater().inflate(R.layout.layers_list_activity_item, null);
@@ -285,8 +272,8 @@ public class MapRoutePreferencesControl extends MapControls {
 				final LocalRoutingParameter rp = getItem(position);
 				tv.setText(rp.getText(mapActivity));
 				tv.setPadding((int) (5 * scaleCoefficient), 0, 0, 0);
-				if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")){
-					//if short route settings - it should be inverse of fast_route_mode
+				if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")) {
+					// if short route settings - it should be inverse of fast_route_mode
 					ch.setChecked(!settings.FAST_ROUTE_MODE.get());
 				} else {
 					ch.setChecked(rp.isSelected(settings));
@@ -295,13 +282,13 @@ public class MapRoutePreferencesControl extends MapControls {
 				ch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 					@Override
 					public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-						//if short way that it should set valut to fast mode opposite of current
-						if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")){
+						// if short way that it should set valut to fast mode opposite of current
+						if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")) {
 							settings.FAST_ROUTE_MODE.set(!isChecked);
 						}
 						rp.setSelected(settings, isChecked);
 
-						if(rp instanceof OtherLocalRoutingParameter) {
+						if (rp instanceof OtherLocalRoutingParameter) {
 							updateGpxRoutingParameter((OtherLocalRoutingParameter) rp);
 						}
 						mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
@@ -310,31 +297,29 @@ public class MapRoutePreferencesControl extends MapControls {
 				return v;
 			}
 		};
-		
-		AppModeDialog.prepareAppModeView(mapActivity, selected, false, 
-				(ViewGroup) settingsDlg.findViewById(R.id.TopBar), true,
-				new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if(selected.size() > 0) {
-					ApplicationMode next = selected.iterator().next();
-					settings.APPLICATION_MODE.set(next);
-					mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
-					updateParameters();
-				}
-			}
 
-			
-		});
+		AppModeDialog.prepareAppModeView(mapActivity, selected, false,
+				(ViewGroup) settingsDlg.findViewById(R.id.TopBar), true, new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						if (selected.size() > 0) {
+							ApplicationMode next = selected.iterator().next();
+							settings.APPLICATION_MODE.set(next);
+							mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
+							updateParameters();
+						}
+					}
+
+				});
 		lv.setAdapter(listAdapter);
 		return settingsDlg;
 	}
-	
+
 	private void updateParameters() {
 		ApplicationMode am = settings.APPLICATION_MODE.get();
 		listAdapter.setNotifyOnChange(false);
 		listAdapter.clear();
-		for(LocalRoutingParameter r : getRoutingParameters(am)) {
+		for (LocalRoutingParameter r : getRoutingParameters(am)) {
 			listAdapter.add(r);
 		}
 		listAdapter.notifyDataSetChanged();
@@ -347,19 +332,19 @@ public class MapRoutePreferencesControl extends MapControls {
 
 			@Override
 			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-				if(position == 0) {
-					if(mapActivity.getRoutingHelper().getCurrentGPXRoute() != null) {
+				if (position == 0) {
+					if (mapActivity.getRoutingHelper().getCurrentGPXRoute() != null) {
 						mapActivity.getRoutingHelper().setGpxParams(null);
 						settings.FOLLOW_THE_GPX_ROUTE.set(null);
 						mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();
 					}
 					updateParameters();
-				} else if(position == 1) {
+				} else if (position == 1) {
 					openGPXFileSelection(gpxSpinner);
-				} else if(position == 2) {
-					// nothing to change 
-				}				
-				
+				} else if (position == 2) {
+					// nothing to change
+				}
+
 			}
 
 			@Override
@@ -370,7 +355,7 @@ public class MapRoutePreferencesControl extends MapControls {
 
 	protected void openGPXFileSelection(final Spinner gpxSpinner) {
 		GpxUiHelper.selectGPXFile(mapActivity, false, false, new CallbackWithObject<GPXUtilities.GPXFile[]>() {
-			
+
 			@Override
 			public boolean processResult(GPXFile[] result) {
 				mapActivity.getMapActions().setGPXRouteParams(result[0]);
@@ -388,34 +373,19 @@ public class MapRoutePreferencesControl extends MapControls {
 		gpxActions.add(mapActivity.getString(R.string.shared_string_none));
 		gpxActions.add(mapActivity.getString(R.string.select_gpx));
 		GPXRouteParamsBuilder rp = mapActivity.getRoutingHelper().getCurrentGPXRoute();
-		if(rp != null) {
+		if (rp != null) {
 			gpxActions.add(new File(rp.getFile().path).getName());
 		}
-		
-		ArrayAdapter<String> gpxAdapter = new ArrayAdapter<String>(mapActivity, 
-				android.R.layout.simple_spinner_item, 
-				gpxActions
-				);
+
+		ArrayAdapter<String> gpxAdapter = new ArrayAdapter<String>(mapActivity, android.R.layout.simple_spinner_item,
+				gpxActions);
 		gpxAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		gpxSpinner.setAdapter(gpxAdapter);
-		if(rp != null) {
+		if (rp != null) {
 			gpxSpinner.setSelection(2);
 		} else {
 			gpxSpinner.setSelection(0);
 		}
 	}
 
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, settingsAppModeButton);
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		int id = settings.getApplicationMode().getSmallIcon(false); // settingsAppModeButton.isPressed() || dialog != null
-		if(cachedId != id && settingsAppModeButton.getLeft() > 0) {
-			cachedId = id;
-			settingsAppModeButton.setImageResource(id);
-		}
-	}
 }

From 2aef8cc8d0bcc15ec37c10fbc1def5eaefb98739 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 12 Mar 2015 01:45:53 +0100
Subject: [PATCH 04/23] update buttons

---
 OsmAnd/res/drawable/btn_flat.xml              |   1 -
 OsmAnd/res/drawable/btn_flat_night.xml        |  13 +
 .../res/drawable/btn_inset_circle_night.xml   |  16 +
 OsmAnd/res/drawable/btn_round_night.xml       |   2 +-
 OsmAnd/res/layout/map_hud_bottom.xml          |   3 +-
 OsmAnd/res/layout/map_view_on_dashboard.xml   |   2 +-
 OsmAnd/res/values/colors.xml                  |   1 +
 OsmAnd/res/values/sizes.xml                   |   2 +-
 OsmAnd/res/values/strings.xml                 |   1 +
 .../src/net/osmand/plus/ApplicationMode.java  |   3 +-
 .../osmand/plus/dashboard/DashboardOnMap.java |  14 +-
 .../osmand/plus/views/MapControlsLayer.java   | 351 ++++++++++++------
 12 files changed, 274 insertions(+), 135 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_flat_night.xml
 create mode 100644 OsmAnd/res/drawable/btn_inset_circle_night.xml

diff --git a/OsmAnd/res/drawable/btn_flat.xml b/OsmAnd/res/drawable/btn_flat.xml
index fa17c040e5..01dad73153 100644
--- a/OsmAnd/res/drawable/btn_flat.xml
+++ b/OsmAnd/res/drawable/btn_flat.xml
@@ -4,7 +4,6 @@
     <item android:state_pressed="true"><shape android:shape="rectangle">
             <solid android:color="@color/map_widget_light_pressed" />
             <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
-            <corners android:radius="@dimen/map_button_rect_rad" />
         </shape></item>
     <item><shape android:shape="rectangle">
             <solid android:color="@color/map_widget_light" />
diff --git a/OsmAnd/res/drawable/btn_flat_night.xml b/OsmAnd/res/drawable/btn_flat_night.xml
new file mode 100644
index 0000000000..bbf270e69b
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_flat_night.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark_pressed" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle_night.xml b/OsmAnd/res/drawable/btn_inset_circle_night.xml
new file mode 100644
index 0000000000..dcc355f6e9
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_inset_circle_night.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_dark_pressed" />
+                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+            </shape>
+        </inset></item>
+    <item><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_dark" />
+                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+            </shape>
+        </inset></item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_round_night.xml b/OsmAnd/res/drawable/btn_round_night.xml
index 97904f75ea..c8fbd85119 100644
--- a/OsmAnd/res/drawable/btn_round_night.xml
+++ b/OsmAnd/res/drawable/btn_round_night.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"><shape android:shape="rectangle">
-            <solid android:color="@color/map_widget_light_pressed" />
+            <solid android:color="@color/map_widget_dark_pressed" />
             <corners android:radius="@dimen/map_button_rect_rad" />
             <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
         </shape></item>
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index a691e26910..97c1d72d54 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -115,7 +115,8 @@
                 android:gravity="center_vertical"
                 android:paddingLeft="12dp"
                 android:drawableLeft="@drawable/ic_action_remove_light"
-                android:textSize="20sp" 
+                android:textSize="20sp"
+                android:textStyle="bold" 
                 android:drawablePadding="4dp" />
         </LinearLayout>
         
diff --git a/OsmAnd/res/layout/map_view_on_dashboard.xml b/OsmAnd/res/layout/map_view_on_dashboard.xml
index 34bca26f36..4197af279b 100644
--- a/OsmAnd/res/layout/map_view_on_dashboard.xml
+++ b/OsmAnd/res/layout/map_view_on_dashboard.xml
@@ -11,7 +11,7 @@
         android:layout_marginLeft="@dimen/map_button_margin"
         android:layout_marginTop="@dimen/map_button_margin"
         android:background="@drawable/btn_inset_circle"
-        android:src="@drawable/ic_action_layers_light" />
+        android:src="@drawable/ic_action_remove_light" />
 
     <Button
         android:id="@+id/map_download_button"
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index ce5ae7fab0..0c385a778c 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -13,6 +13,7 @@
 	<color name="map_widget_stroke">#333333</color>
 	<color name="map_widget_light">#eeffffff</color>
 	<color name="map_widget_dark">#aa3f3f3f</color>
+	<color name="map_widget_dark_pressed">#ddcccccc</color>
 	<color name="map_widget_light_trans">#88ffffff</color>
 	<color name="map_widget_light_pressed">#ddcccccc</color>
 	<color name="map_widget_blue">#30A0FF</color>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 67d0ead6e5..678d76a753 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -55,7 +55,7 @@
 	<dimen name="map_widget_icon">24dp</dimen>
 	<dimen name="map_widget_height">32dp</dimen>
 	<dimen name="map_widget_image">80dp</dimen>
-	<dimen name="map_button_spacing">18dp</dimen>
+	<dimen name="map_button_spacing">15dp</dimen>
 	<dimen name="map_button_margin">4dp</dimen>
 	<dimen name="map_button_inset">4dp</dimen>
 	<dimen name="map_button_rect_rad">3dp</dimen>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 5cdee0968d..64f426f57f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          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="shared_string_go">Go</string>
 	<string name="action_create">Action create</string>
 	<string name="action_modify">Action modify</string>
 	<string name="action_delete">Action delete</string>
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 9d1ddf8c18..4d2e877e08 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -52,6 +52,7 @@ public class ApplicationMode {
 	static {
 		ApplicationMode[] exceptPedestrianAndDefault = new ApplicationMode[] { CAR, BICYCLE, BOAT, AIRCRAFT };
 		ApplicationMode[] exceptAirBoat = new ApplicationMode[] { DEFAULT, CAR, BICYCLE, PEDESTRIAN };
+		ApplicationMode[] exceptAirBoatDefault = new ApplicationMode[] { CAR, BICYCLE, PEDESTRIAN };
 		ApplicationMode[] pedestrian = new ApplicationMode[] { PEDESTRIAN };
 		ApplicationMode[] pedestrianBicycle = new ApplicationMode[] { PEDESTRIAN, BICYCLE };
 		
@@ -75,7 +76,7 @@ public class ApplicationMode {
 		// top
 		regWidget("compass", all);
 		regWidget("config", none);
-		regWidget("street_name", exceptAirBoat);
+		regWidget("street_name", exceptAirBoatDefault);
 		regWidget("back_to_location", all);
 		regWidget("monitoring_services", none);
 		regWidget("bgService", none);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 7790e3c47c..c4afc9595e 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -38,6 +38,7 @@ import android.view.animation.Animation.AnimationListener;
 import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.ScrollView;
 
 /**
@@ -66,6 +67,7 @@ public class DashboardOnMap {
 	private float mapRotation;
 	private boolean inLocationUpdate = false;
 	private boolean saveBackAction;
+	private ImageView switchButton;
 
 
 	public DashboardOnMap(MapActivity ma) {
@@ -90,12 +92,13 @@ public class DashboardOnMap {
 		dashboardView.setOnClickListener(listener);
 		
 		
-		dashboardView.findViewById(R.id.map_layers_button).setOnClickListener(new View.OnClickListener() {
+		switchButton =  (ImageView) dashboardView.findViewById(R.id.map_layers_button);
+		switchButton.setOnClickListener(new View.OnClickListener() {
 			
 			@Override
 			public void onClick(View v) {
 				setDashboardVisibility(false);
-				mapActivity.getMapActions().prepareConfigureMap();
+				mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.set(false);
 				mapActivity.getMapActions().toggleDrawer();				
 			}
 		});
@@ -169,18 +172,17 @@ public class DashboardOnMap {
 			dashboardView.setVisibility(View.VISIBLE);
 			fabButton.showFloatingActionButton();
 			open(dashboardView.findViewById(R.id.animateContent));
+			switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_navigation_drawer));
 			
 			mapActivity.getMapActions().disableDrawer();
-			mapActivity.findViewById(R.id.MapInfoControls).setVisibility(View.GONE);
-			mapActivity.findViewById(R.id.MapButtons).setVisibility(View.GONE);
+			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.GONE);
 			updateLocation(true, true, false);
 			
 		} else {
 			mapActivity.getMapActions().enableDrawer();
 			mapActivity.getMapViewTrackingUtilities().setDashboard(null);
 			hide(dashboardView.findViewById(R.id.animateContent));
-			mapActivity.findViewById(R.id.MapInfoControls).setVisibility(View.VISIBLE);
-			mapActivity.findViewById(R.id.MapButtons).setVisibility(View.VISIBLE);
+			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
 			fabButton.hideFloatingActionButton();
 			for (WeakReference<DashBaseFragment> df : fragList) {
 				if (df.get() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 2a85bdfb88..a490444c61 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -19,6 +19,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.helpers.WaypointDialogHelper;
+import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.controls.MapRoutePlanControl;
 import net.osmand.plus.views.controls.MapRoutePreferencesControl;
 import net.osmand.plus.views.controls.MapCancelControl;
@@ -29,6 +30,7 @@ import net.osmand.plus.views.controls.MapNavigateControl;
 import net.osmand.plus.views.controls.MapZoomControls;
 import net.osmand.plus.views.controls.RulerControl;
 import net.osmand.plus.views.controls.SmallMapMenuControls;
+import net.osmand.plus.views.mapwidgets.ImageViewWidget;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PointF;
@@ -39,32 +41,35 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
+import android.view.animation.Animation;
+import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
+import android.widget.TextView;
 
 public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
+
 	private static class MapHudButton {
-		ImageView iv;
+		View iv;
 		int bgDark;
 		int bgLight;
 		int resId;
 		int resLight = R.color.icon_color_light;
 		int resDark = 0;
-				
+
 		boolean nightMode = false;
 		boolean f = true;
-		
-		
+
 		public MapHudButton setRoundTransparent() {
 			setBg(R.drawable.btn_circle_trans);
 			return this;
 		}
-		
+
 		public MapHudButton setBg(int dayBg, int nightBg) {
 			bgDark = nightBg;
 			bgLight = dayBg;
@@ -72,24 +77,23 @@ public class MapControlsLayer extends OsmandMapLayer {
 			return this;
 
 		}
-		
+
 		public MapHudButton setBg(int bg) {
 			bgDark = bg;
 			bgLight = bg;
 			f = true;
 			return this;
 		}
-		
-		public static MapHudButton create(ImageView iv, int resId) {
+
+		public static MapHudButton create(View iv, int resId) {
 			MapHudButton mc = new MapHudButton();
 			mc.iv = iv;
 			mc.resId = resId;
-			mc.setBg(R.drawable.btn_circle);
 			return mc;
 		}
-		
+
 		public boolean setIconResId(int resId) {
-			if(this.resId == resId) {
+			if (this.resId == resId) {
 				return false;
 			}
 			this.resId = resId;
@@ -97,38 +101,41 @@ public class MapControlsLayer extends OsmandMapLayer {
 			return true;
 		}
 
-		public boolean setIconColorId(int clr) {
-			if(resLight == clr && resDark == clr) {
-				return false;
+		public MapHudButton setIconColorId(int clr) {
+			if (resLight == clr && resDark == clr) {
+				return this;
 			}
 			resLight = clr;
 			resDark = clr;
 			f = true;
-			return true;
+			return this;
 		}
-		
+
 		public void update(OsmandApplication ctx, boolean night) {
 			if (nightMode == night && !f) {
 				return;
 			}
 			f = false;
 			nightMode = night;
-			if(bgDark != 0 && bgLight != 0) {
+			if (bgDark != 0 && bgLight != 0) {
 				iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
 			}
-			iv.setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
+			if (iv instanceof ImageView) {
+				((ImageView) iv).setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
+			} else if (iv instanceof TextView) {
+				((TextView) iv).setCompoundDrawables(
+						ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight), null, null, null);
+			}
 		}
 
-		
-		
 	}
-	
-	private List<MapHudButton> controls = new ArrayList<MapControlsLayer.MapHudButton>(); 
+
+	private List<MapHudButton> controls = new ArrayList<MapControlsLayer.MapHudButton>();
 	private final MapActivity mapActivity;
 	private int shadowColor = -1;
-//	private RulerControl rulerControl;
-//	private List<MapControls> allControls = new ArrayList<MapControls>();
-	
+	// private RulerControl rulerControl;
+	// private List<MapControls> allControls = new ArrayList<MapControls>();
+
 	private float scaleCoefficient;
 
 	private SeekBar transparencyBar;
@@ -136,24 +143,21 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private static CommonPreference<Integer> settingsToTransparency;
 	private OsmandSettings settings;
 
+	private MapRoutePreferencesControl optionsRouteControlDialog;
+	private MapRouteInfoControl mapRouteInfoControlDialog;
+	private View routePreparationLayout;
 	private MapHudButton backToLocationControl;
 	private MapHudButton menuControl;
-	private View routePreparationLayout;
-	private MapRouteInfoControl mapRouteInfoControl;
 	private MapHudButton optionsRouteControl;
+	private MapHudButton routeGoControl;
+	private MapHudButton compassHud;
+	private float cachedRotate = 0;
+	private RotateAnimation rotateAnimation;
 
-
-	private MapRoutePreferencesControl optionsRouteControlDialog;
-
-
-	public MapControlsLayer(MapActivity activity){
+	public MapControlsLayer(MapActivity activity) {
 		this.mapActivity = activity;
 		settings = activity.getMyApplication().getSettings();
 	}
-	
-	
-	
-
 
 	@Override
 	public boolean drawInScreenPixels() {
@@ -164,51 +168,77 @@ public class MapControlsLayer extends OsmandMapLayer {
 	public void initLayer(final OsmandMapTileView view) {
 		scaleCoefficient = view.getScaleCoefficient();
 		FrameLayout parent = getParent();
-		initNewControls();
 		// TODO
-//		rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent, 
-//				rightGravity);
+		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
+		// rightGravity);
 		initTransparencyBar(view, parent);
-	}
-
-	private void initNewControls() {
 		initZooms();
 		initControls();
 		initRouteControls();
+		initTopControls();
+	}
+
+	private void initTopControls() {
+		View configureMap = mapActivity.findViewById(R.id.map_layers_button);
+		controls.add(MapHudButton.create((ImageView) configureMap, R.drawable.ic_action_layers_dark).setBg(
+				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night));
+		configureMap.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				mapActivity.getMapActions().prepareConfigureMap();
+				mapActivity.getMapActions().toggleDrawer();
+			}
+		});
+
+		View compass = mapActivity.findViewById(R.id.map_compass_button);
+		compassHud = MapHudButton.create((ImageView) compass, R.drawable.map_compass).setIconColorId(0)
+				.setBg(R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
+		controls.add(compassHud);
+		compass.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				mapActivity.getMapViewTrackingUtilities().switchRotateMapMode();
+			}
+		});
+
 	}
 
-	
 	private void initRouteControls() {
 		routePreparationLayout = mapActivity.findViewById(R.id.map_route_preparation_layout);
 		View cancelRouteButton = mapActivity.findViewById(R.id.map_cancel_route_button);
-		controls.add(MapHudButton.create((ImageView) cancelRouteButton, R.drawable.ic_action_remove_dark));
-		
+		controls.add(MapHudButton.create((ImageView) cancelRouteButton, R.drawable.ic_action_remove_dark).setBg(
+				R.drawable.btn_flat, R.drawable.btn_flat_night));
+
 		cancelRouteButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				notifyClicked();
-				if(mapActivity.getRoutingHelper().isFollowingMode()) {
+				if (mapActivity.getRoutingHelper().isFollowingMode()) {
 					mapActivity.getMapActions().stopNavigationActionConfirm(mapActivity.getMapView());
 				} else {
 					mapActivity.getMapActions().stopNavigationWithoutConfirm();
 				}
 			}
 		});
-		mapRouteInfoControl = new MapRouteInfoControl(mapActivity.getMapLayers().getContextMenuLayer(),
+		mapRouteInfoControlDialog = new MapRouteInfoControl(mapActivity.getMapLayers().getContextMenuLayer(),
 				mapActivity);
-		
+
 		View waypointsButton = mapActivity.findViewById(R.id.map_waypoints_route_button);
-		controls.add(MapHudButton.create((ImageView) waypointsButton, R.drawable.ic_action_flage_dark));
+		controls.add(MapHudButton.create((ImageView) waypointsButton, R.drawable.ic_action_flage_dark).setBg(
+				R.drawable.btn_flat, R.drawable.btn_flat_night));
 		waypointsButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				notifyClicked();
-				mapRouteInfoControl.showHideDialog();
+				mapRouteInfoControlDialog.showHideDialog();
 			}
 		});
-		
+
 		View optionsRouteButton = mapActivity.findViewById(R.id.map_options_route_button);
-		optionsRouteControl = MapHudButton.create((ImageView) optionsRouteButton, settings.getApplicationMode().getSmallIcon(false));
+		optionsRouteControl = MapHudButton.create((ImageView) optionsRouteButton,
+				settings.getApplicationMode().getSmallIcon(true)).setBg(R.drawable.btn_flat, R.drawable.btn_flat_night);
 		optionsRouteControlDialog = new MapRoutePreferencesControl(mapActivity);
 		controls.add(optionsRouteControl);
 		optionsRouteButton.setOnClickListener(new View.OnClickListener() {
@@ -218,28 +248,41 @@ public class MapControlsLayer extends OsmandMapLayer {
 				optionsRouteControlDialog.showAndHideDialog();
 			}
 		});
+
+		TextView routeGoButton = (TextView) mapActivity.findViewById(R.id.map_go_route_button);
+		routeGoControl = MapHudButton.create(routeGoButton, R.drawable.ic_destination_arrow_white).setBg(
+				R.drawable.btn_flat, R.drawable.btn_flat_night);
+		controls.add(routeGoControl);
+		routeGoButton.setText(mapActivity.getString(R.string.shared_string_go).toUpperCase());
+		routeGoButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				notifyClicked();
+				startNavigation();
+			}
+		});
 	}
-	
-	public void showDialog(){
-		mapRouteInfoControl.setShowDialog();
+
+	public void showDialog() {
+		mapRouteInfoControlDialog.setShowDialog();
 	}
 
 	private void initControls() {
 		View backToLocation = mapActivity.findViewById(R.id.map_my_location_button);
-		backToLocationControl = MapHudButton.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location).setBg(R.drawable.btn_circle_blue)
-				;
+		backToLocationControl = MapHudButton.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location)
+				.setBg(R.drawable.btn_circle_blue);
 		controls.add(backToLocationControl);
-		
+
 		backToLocation.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
 			}
-		});		
-		
+		});
+
 		View backToMenuButton = mapActivity.findViewById(R.id.map_menu_button);
-		menuControl = MapHudButton.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).
-		setBg(R.drawable.btn_round, R.drawable.btn_round_night);
+		menuControl = MapHudButton.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).setBg(
+				R.drawable.btn_round, R.drawable.btn_round_night);
 		controls.add(menuControl);
 		backToMenuButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -248,7 +291,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				// double lon = activity.getMapView().getLongitude();
 				// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
 				notifyClicked();
-				if(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get()) {
+				if (mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get()) {
 					mapActivity.getDashboard().setDashboardVisibility(true);
 				} else {
 					mapActivity.getMapActions().onDrawerBack();
@@ -256,10 +299,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 				}
 			}
 		});
-		
+
 		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
-		controls.add(MapHudButton.create((ImageView) routePlanButton, R.drawable.ic_action_info_dark).
-				setBg(R.drawable.btn_round, R.drawable.btn_round_night));
+		controls.add(MapHudButton.create((ImageView) routePlanButton, R.drawable.ic_action_gdirections_dark).setBg(
+				R.drawable.btn_round, R.drawable.btn_round_night));
 		routePlanButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -269,14 +312,13 @@ public class MapControlsLayer extends OsmandMapLayer {
 				mapActivity.refreshMap();
 			}
 		});
-	}
 
+	}
 
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
 		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
-		controls.add(MapHudButton.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent()
-				);
+		controls.add(MapHudButton.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent());
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -292,8 +334,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		controls.add(MapHudButton.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent()
-				);
+		controls.add(MapHudButton.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out)
+				.setRoundTransparent());
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -301,30 +343,42 @@ public class MapControlsLayer extends OsmandMapLayer {
 				mapActivity.changeZoom(-1, System.currentTimeMillis());
 			}
 		});
-		zoomOutButton.setOnLongClickListener(listener);		
+		zoomOutButton.setOnLongClickListener(listener);
 	}
 
-
 	public void startNavigation() {
-		// TODO
-//		if (mapNavigationControl == null) {
-//			return;
-//		}
-//		mapNavigationControl.startNavigation();
+		stopCounter();
+		OsmandApplication app = mapActivity.getMyApplication();
+		RoutingHelper routingHelper = app.getRoutingHelper();
+		if (routingHelper.isFollowingMode()) {
+			routingHelper.setRoutePlanningMode(false);
+			mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
+		} else {
+			if (!app.getTargetPointsHelper().checkPointToNavigateShort()) {
+				mapRouteInfoControlDialog.showDialog();
+			} else {
+				mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
+				app.getSettings().FOLLOW_THE_ROUTE.set(true);
+				routingHelper.setFollowingMode(true);
+				routingHelper.setRoutePlanningMode(false);
+				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
+				routingHelper.setCurrentLocation(app.getLocationProvider().getLastKnownLocation(), false);
+				app.getRoutingHelper().notifyIfRouteIsCalculated();
+			}
+		}
 	}
 
+	private void stopCounter() {
+		// TODO stop counter
 
-	
+	}
 
 	protected void notifyClicked(MapControls m) {
 		notifyClicked();
 	}
-	
+
 	protected void notifyClicked() {
-		// TODO
-//		if(mapNavigationControl != null) {
-//			mapNavigationControl.stopCounter();
-//		}
+		stopCounter();
 	}
 
 	@Override
@@ -340,7 +394,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		if (shadowColor != shadw) {
 			shadowColor = shadw;
 			// TODO
-//			updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls);
+			// updatextColor(textColor, shadw, rulerControl, zoomControls, mapMenuControls);
 		}
 		// default buttons
 		boolean routePlanningMode = false;
@@ -357,6 +411,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				&& (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
 		// /////////////////////////////////////////////
 		// new update
+
 		boolean enabled = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
 		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
 		if (!enabled) {
@@ -366,63 +421,116 @@ public class MapControlsLayer extends OsmandMapLayer {
 		} else {
 			backToLocationControl.setIconColorId(R.color.color_white);
 		}
-		menuControl.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
+
+		menuControl
+				.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
 						: R.drawable.ic_navigation_drawer);
-		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIcon(false));
-		int vis = showRouteCalculationControls? View.VISIBLE : View.GONE;
-		if(routePreparationLayout.getVisibility() != vis) {
+
+		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIcon(true));
+		int vis = showRouteCalculationControls ? View.VISIBLE : View.GONE;
+		if (showRouteCalculationControls) {
+			((TextView) routeGoControl.iv).setTextColor(textColor);
+		}
+
+		if (routePreparationLayout.getVisibility() != vis) {
 			routePreparationLayout.setVisibility(vis);
-			mapRouteInfoControl.setVisible(showRouteCalculationControls);
+			mapRouteInfoControlDialog.setVisible(showRouteCalculationControls);
+		}
+
+		float mapRotate = mapActivity.getMapView().getRotate();
+		if (mapRotate != cachedRotate && (rotateAnimation == null || rotateAnimation.hasEnded())) {
+			float c = cachedRotate - mapRotate;
+			cachedRotate = mapRotate;
+			// compassHud.iv.setPivotX();
+			// compassHud.iv.setPivotY();
+			// compassHud.iv.setRotation(mapRotate);
+			rotateAnimation = new RotateAnimation(0.0f, c, compassHud.iv.getWidth() / 2, 
+					compassHud.iv.getHeight() / 2);
+			// Set the animation's parameters
+			rotateAnimation.setDuration(100); // duration in ms
+			rotateAnimation.setRepeatCount(0); // -1 = infinite repeated
+			rotateAnimation.setRepeatMode(Animation.REVERSE); // reverses each repeat
+			rotateAnimation.setFillAfter(true); // keep rotation after animation
+
+			// Aply animation to image view
+			compassHud.iv.setAnimation(rotateAnimation);
+			// compassHud.iv.invalidate();
+		}
+		if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
+			compassHud.setIconResId(isNight ? R.drawable.map_compass_niu_white : R.drawable.map_compass_niu);
+		} else if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
+			compassHud.setIconResId(isNight ? R.drawable.map_compass_bearing_white : R.drawable.map_compass_bearing);
+		} else {
+			compassHud.setIconResId(isNight ? R.drawable.map_compass_white : R.drawable.map_compass);
 		}
 
 		for (MapHudButton mc : controls) {
 			mc.update(mapActivity.getMyApplication(), nightMode == null ? false : nightMode.isNightMode());
 		}
-
 	}
-	
 
+	// public ImageViewWidget createCompassView(final MapActivity map){
+	// final OsmandMapTileView view = map.getMapView();
+	// final OsmandApplication app = map.getMyApplication();
+	// final int mw = (int) compass.getMinimumWidth() ;
+	// final int mh = (int) compass.getMinimumHeight() ;
+	// ImageViewWidget compassView = new ImageViewWidget(map) {
+	// private float cachedRotate = 0;
+	// private int cachedRotateMap = 0;
+	// private boolean nm;
+	// @Override
+	// protected void onDraw(Canvas canvas) {
+	// canvas.save();
+	// canvas.rotate(view.getRotate(), mw / 2, mh / 2);
+	// getDrawable().draw(canvas);
+	// canvas.restore();
+	// }
+	//
+	//
+	// };
+	// compassView.setOnClickListener(new View.OnClickListener() {
+	// @Override
+	// public void onClick(View v) {
+	// map.getMapViewTrackingUtilities().switchRotateMapMode();
+	// }
+	// });
+	//
+	// return compassView;
+	// }
 
-	private void updatextColor(int textColor, int shadowColor, MapControls... mc) {
-		for(MapControls m : mc) {
-			m.updateTextColor(textColor, shadowColor);
-		}
-	}
 	private FrameLayout getParent() {
 		return (FrameLayout) mapActivity.findViewById(R.id.MapButtons);
 	}
 
-
-	@Override
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		// TODO stop counter & show buttons
-//		for(MapControls m : allControls) {
-//			if(m.isVisible() && m.onSingleTap(point, tileBox)){
-//				return true;
-//			}
-//		}
+		// for(MapControls m : allControls) {
+		// if(m.isVisible() && m.onSingleTap(point, tileBox)){
+		// return true;
+		// }
+		// }
 		return false;
 	}
-	
+
 	@Override
 	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
 		// TODO stop counter & show buttons
-//		if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode()) {
-//			if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
-//				zoomControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-//				mapMenuControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-//			}
-//			mapRoutePlanControl.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-//		}
+		// if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode())
+		// {
+		// if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
+		// zoomControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+		// mapMenuControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+		// }
+		// mapRoutePlanControl.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
+		// }
 		return false;
 	}
 
-
-	/////////////////  Transparency bar /////////////////////////
+	// /////////////// Transparency bar /////////////////////////
 	private void initTransparencyBar(final OsmandMapTileView view, FrameLayout parent) {
 		int minimumHeight = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumHeight();
-		android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
-				Gravity.BOTTOM | Gravity.CENTER);
+		android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
+				LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.CENTER);
 		params.setMargins(0, 0, 0, minimumHeight + 3);
 		transparencyBarLayout = new LinearLayout(view.getContext());
 		transparencyBarLayout.setVisibility(settingsToTransparency != null ? View.VISIBLE : View.GONE);
@@ -430,7 +538,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 		transparencyBar = new SeekBar(view.getContext());
 		transparencyBar.setMax(255);
-		if(settingsToTransparency != null) {
+		if (settingsToTransparency != null) {
 			transparencyBar.setProgress(settingsToTransparency.get());
 		}
 		transparencyBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@@ -468,15 +576,15 @@ public class MapControlsLayer extends OsmandMapLayer {
 		imageButton.setBackgroundResource(R.drawable.headliner_close);
 		transparencyBarLayout.addView(imageButton, prms);
 	}
-	
+
 	public void showTransparencyBar(CommonPreference<Integer> transparenPreference) {
 		MapControlsLayer.settingsToTransparency = transparenPreference;
 		transparencyBarLayout.setVisibility(View.VISIBLE);
 		transparencyBar.setProgress(transparenPreference.get());
 	}
-	
+
 	public void hideTransparencyBar(CommonPreference<Integer> transparentPreference) {
-		if(settingsToTransparency == transparentPreference) {
+		if (settingsToTransparency == transparentPreference) {
 			transparencyBarLayout.setVisibility(View.GONE);
 			settingsToTransparency = null;
 		}
@@ -486,7 +594,4 @@ public class MapControlsLayer extends OsmandMapLayer {
 		// TODO
 	}
 
-	
-
-
 }

From 407500211d17b2cb7a12e7b48f51dad398b9199f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 12 Mar 2015 02:05:29 +0100
Subject: [PATCH 05/23] Update controls layer

---
 OsmAnd/res/values/colors.xml                  |   2 +-
 .../osmand/plus/dashboard/DashboardOnMap.java |   3 +-
 .../osmand/plus/views/MapControlsLayer.java   | 281 ++++++++----------
 .../plus/views/controls/MapCancelControl.java |  54 ----
 .../views/controls/MapRoutePlanControl.java   |  52 ----
 .../views/controls/SmallMapMenuControls.java  |  55 ----
 6 files changed, 134 insertions(+), 313 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 0c385a778c..f14630d148 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -14,7 +14,7 @@
 	<color name="map_widget_light">#eeffffff</color>
 	<color name="map_widget_dark">#aa3f3f3f</color>
 	<color name="map_widget_dark_pressed">#ddcccccc</color>
-	<color name="map_widget_light_trans">#88ffffff</color>
+	<color name="map_widget_light_trans">#88bbbbbb</color>
 	<color name="map_widget_light_pressed">#ddcccccc</color>
 	<color name="map_widget_blue">#30A0FF</color>
 	<color name="map_widget_blue_pressed">#dd30D0FF</color>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index c4afc9595e..8e4b14d554 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -172,7 +172,8 @@ public class DashboardOnMap {
 			dashboardView.setVisibility(View.VISIBLE);
 			fabButton.showFloatingActionButton();
 			open(dashboardView.findViewById(R.id.animateContent));
-			switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_navigation_drawer));
+			switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_navigation_drawer,
+					R.color.icon_color_light));
 			
 			mapActivity.getMapActions().disableDrawer();
 			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.GONE);
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index a490444c61..540a508a5d 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -1,48 +1,29 @@
 package net.osmand.plus.views;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Surface;
-import net.osmand.PlatformUtil;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.helpers.WaypointDialogHelper;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.controls.MapRoutePlanControl;
-import net.osmand.plus.views.controls.MapRoutePreferencesControl;
-import net.osmand.plus.views.controls.MapCancelControl;
 import net.osmand.plus.views.controls.MapControls;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
-import net.osmand.plus.views.controls.MapMenuControls;
-import net.osmand.plus.views.controls.MapNavigateControl;
+import net.osmand.plus.views.controls.MapRoutePreferencesControl;
 import net.osmand.plus.views.controls.MapZoomControls;
-import net.osmand.plus.views.controls.RulerControl;
-import net.osmand.plus.views.controls.SmallMapMenuControls;
-import net.osmand.plus.views.mapwidgets.ImageViewWidget;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
 import android.graphics.PointF;
 import android.graphics.drawable.Drawable;
-import android.os.Handler;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
-import android.view.animation.Animation;
-import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -54,80 +35,13 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
 
-	private static class MapHudButton {
-		View iv;
-		int bgDark;
-		int bgLight;
-		int resId;
-		int resLight = R.color.icon_color_light;
-		int resDark = 0;
-
-		boolean nightMode = false;
-		boolean f = true;
-
-		public MapHudButton setRoundTransparent() {
-			setBg(R.drawable.btn_circle_trans);
-			return this;
-		}
-
-		public MapHudButton setBg(int dayBg, int nightBg) {
-			bgDark = nightBg;
-			bgLight = dayBg;
-			f = true;
-			return this;
-
-		}
-
-		public MapHudButton setBg(int bg) {
-			bgDark = bg;
-			bgLight = bg;
-			f = true;
-			return this;
-		}
-
-		public static MapHudButton create(View iv, int resId) {
-			MapHudButton mc = new MapHudButton();
-			mc.iv = iv;
-			mc.resId = resId;
-			return mc;
-		}
-
-		public boolean setIconResId(int resId) {
-			if (this.resId == resId) {
-				return false;
-			}
-			this.resId = resId;
-			f = true;
-			return true;
-		}
-
-		public MapHudButton setIconColorId(int clr) {
-			if (resLight == clr && resDark == clr) {
-				return this;
-			}
-			resLight = clr;
-			resDark = clr;
-			f = true;
-			return this;
-		}
-
-		public void update(OsmandApplication ctx, boolean night) {
-			if (nightMode == night && !f) {
-				return;
-			}
-			f = false;
-			nightMode = night;
-			if (bgDark != 0 && bgLight != 0) {
-				iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
-			}
-			if (iv instanceof ImageView) {
-				((ImageView) iv).setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
-			} else if (iv instanceof TextView) {
-				((TextView) iv).setCompoundDrawables(
-						ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight), null, null, null);
-			}
-		}
-
+	
+	
+	public MapHudButton createHudButton(View iv, int resId) {
+		MapHudButton mc = new MapHudButton();
+		mc.iv = iv;
+		mc.resId = resId;
+		return mc;
 	}
 
 	private List<MapHudButton> controls = new ArrayList<MapControlsLayer.MapHudButton>();
@@ -152,7 +66,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private MapHudButton routeGoControl;
 	private MapHudButton compassHud;
 	private float cachedRotate = 0;
-	private RotateAnimation rotateAnimation;
 
 	public MapControlsLayer(MapActivity activity) {
 		this.mapActivity = activity;
@@ -177,10 +90,43 @@ public class MapControlsLayer extends OsmandMapLayer {
 		initRouteControls();
 		initTopControls();
 	}
+	
+	private class CompassDrawable extends Drawable {
+
+		private Drawable original;
+
+		public CompassDrawable(Drawable original) {
+			this.original = original;
+		}
+
+		@Override
+		public void draw(Canvas canvas) {
+			canvas.save();
+			canvas.rotate(cachedRotate, canvas.getWidth() / 2, canvas.getHeight() / 2);
+			original.draw(canvas);
+			canvas.restore();
+
+		}
+
+		@Override
+		public void setAlpha(int alpha) {
+			original.setAlpha(alpha);
+		}
+
+		@Override
+		public void setColorFilter(ColorFilter cf) {
+			original.setColorFilter(cf);
+		}
+
+		@Override
+		public int getOpacity() {
+			return original.getOpacity();
+		}
+	}
 
 	private void initTopControls() {
 		View configureMap = mapActivity.findViewById(R.id.map_layers_button);
-		controls.add(MapHudButton.create((ImageView) configureMap, R.drawable.ic_action_layers_dark).setBg(
+		controls.add(createHudButton((ImageView) configureMap, R.drawable.ic_action_layers_dark).setBg(
 				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night));
 		configureMap.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -192,7 +138,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View compass = mapActivity.findViewById(R.id.map_compass_button);
-		compassHud = MapHudButton.create((ImageView) compass, R.drawable.map_compass).setIconColorId(0)
+//		protected void onDraw(Canvas canvas) {
+			// }
+		compassHud = createHudButton((ImageView) compass, R.drawable.map_compass).setIconColorId(0)
 				.setBg(R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
 		controls.add(compassHud);
 		compass.setOnClickListener(new View.OnClickListener() {
@@ -208,7 +156,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private void initRouteControls() {
 		routePreparationLayout = mapActivity.findViewById(R.id.map_route_preparation_layout);
 		View cancelRouteButton = mapActivity.findViewById(R.id.map_cancel_route_button);
-		controls.add(MapHudButton.create((ImageView) cancelRouteButton, R.drawable.ic_action_remove_dark).setBg(
+		controls.add(createHudButton((ImageView) cancelRouteButton, R.drawable.ic_action_remove_dark).setBg(
 				R.drawable.btn_flat, R.drawable.btn_flat_night));
 
 		cancelRouteButton.setOnClickListener(new View.OnClickListener() {
@@ -226,7 +174,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				mapActivity);
 
 		View waypointsButton = mapActivity.findViewById(R.id.map_waypoints_route_button);
-		controls.add(MapHudButton.create((ImageView) waypointsButton, R.drawable.ic_action_flage_dark).setBg(
+		controls.add(createHudButton((ImageView) waypointsButton, R.drawable.ic_action_flage_dark).setBg(
 				R.drawable.btn_flat, R.drawable.btn_flat_night));
 		waypointsButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -237,7 +185,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View optionsRouteButton = mapActivity.findViewById(R.id.map_options_route_button);
-		optionsRouteControl = MapHudButton.create((ImageView) optionsRouteButton,
+		optionsRouteControl = createHudButton((ImageView) optionsRouteButton,
 				settings.getApplicationMode().getSmallIcon(true)).setBg(R.drawable.btn_flat, R.drawable.btn_flat_night);
 		optionsRouteControlDialog = new MapRoutePreferencesControl(mapActivity);
 		controls.add(optionsRouteControl);
@@ -250,7 +198,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		TextView routeGoButton = (TextView) mapActivity.findViewById(R.id.map_go_route_button);
-		routeGoControl = MapHudButton.create(routeGoButton, R.drawable.ic_destination_arrow_white).setBg(
+		routeGoControl = createHudButton(routeGoButton, R.drawable.ic_destination_arrow_white).setBg(
 				R.drawable.btn_flat, R.drawable.btn_flat_night);
 		controls.add(routeGoControl);
 		routeGoButton.setText(mapActivity.getString(R.string.shared_string_go).toUpperCase());
@@ -269,7 +217,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initControls() {
 		View backToLocation = mapActivity.findViewById(R.id.map_my_location_button);
-		backToLocationControl = MapHudButton.create((ImageView) backToLocation, R.drawable.ic_action_get_my_location)
+		backToLocationControl = createHudButton((ImageView) backToLocation, R.drawable.ic_action_get_my_location)
 				.setBg(R.drawable.btn_circle_blue);
 		controls.add(backToLocationControl);
 
@@ -281,7 +229,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View backToMenuButton = mapActivity.findViewById(R.id.map_menu_button);
-		menuControl = MapHudButton.create((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).setBg(
+		menuControl = createHudButton((ImageView) backToMenuButton, R.drawable.ic_navigation_drawer).setBg(
 				R.drawable.btn_round, R.drawable.btn_round_night);
 		controls.add(menuControl);
 		backToMenuButton.setOnClickListener(new View.OnClickListener() {
@@ -301,7 +249,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
-		controls.add(MapHudButton.create((ImageView) routePlanButton, R.drawable.ic_action_gdirections_dark).setBg(
+		controls.add(createHudButton((ImageView) routePlanButton, R.drawable.ic_action_gdirections_dark).setBg(
 				R.drawable.btn_round, R.drawable.btn_round_night));
 		routePlanButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -318,7 +266,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private void initZooms() {
 		final OsmandMapTileView view = mapActivity.getMapView();
 		View zoomInButton = mapActivity.findViewById(R.id.map_zoom_in_button);
-		controls.add(MapHudButton.create((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent());
+		controls.add(createHudButton((ImageView) zoomInButton, R.drawable.ic_action_zoom_in).setRoundTransparent());
 		zoomInButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -334,7 +282,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		controls.add(MapHudButton.create((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out)
+		controls.add(createHudButton((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out)
 				.setRoundTransparent());
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -438,23 +386,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 
 		float mapRotate = mapActivity.getMapView().getRotate();
-		if (mapRotate != cachedRotate && (rotateAnimation == null || rotateAnimation.hasEnded())) {
+		if (mapRotate != cachedRotate) {
 			float c = cachedRotate - mapRotate;
 			cachedRotate = mapRotate;
-			// compassHud.iv.setPivotX();
-			// compassHud.iv.setPivotY();
-			// compassHud.iv.setRotation(mapRotate);
-			rotateAnimation = new RotateAnimation(0.0f, c, compassHud.iv.getWidth() / 2, 
-					compassHud.iv.getHeight() / 2);
-			// Set the animation's parameters
-			rotateAnimation.setDuration(100); // duration in ms
-			rotateAnimation.setRepeatCount(0); // -1 = infinite repeated
-			rotateAnimation.setRepeatMode(Animation.REVERSE); // reverses each repeat
-			rotateAnimation.setFillAfter(true); // keep rotation after animation
-
 			// Aply animation to image view
-			compassHud.iv.setAnimation(rotateAnimation);
-			// compassHud.iv.invalidate();
+			 compassHud.iv.invalidate();
 		}
 		if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
 			compassHud.setIconResId(isNight ? R.drawable.map_compass_niu_white : R.drawable.map_compass_niu);
@@ -469,35 +405,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
-	// public ImageViewWidget createCompassView(final MapActivity map){
-	// final OsmandMapTileView view = map.getMapView();
-	// final OsmandApplication app = map.getMyApplication();
-	// final int mw = (int) compass.getMinimumWidth() ;
-	// final int mh = (int) compass.getMinimumHeight() ;
-	// ImageViewWidget compassView = new ImageViewWidget(map) {
-	// private float cachedRotate = 0;
-	// private int cachedRotateMap = 0;
-	// private boolean nm;
-	// @Override
-	// protected void onDraw(Canvas canvas) {
-	// canvas.save();
-	// canvas.rotate(view.getRotate(), mw / 2, mh / 2);
-	// getDrawable().draw(canvas);
-	// canvas.restore();
-	// }
-	//
-	//
-	// };
-	// compassView.setOnClickListener(new View.OnClickListener() {
-	// @Override
-	// public void onClick(View v) {
-	// map.getMapViewTrackingUtilities().switchRotateMapMode();
-	// }
-	// });
-	//
-	// return compassView;
-	// }
-
 	private FrameLayout getParent() {
 		return (FrameLayout) mapActivity.findViewById(R.id.MapButtons);
 	}
@@ -594,4 +501,78 @@ public class MapControlsLayer extends OsmandMapLayer {
 		// TODO
 	}
 
+	
+	private class MapHudButton {
+		View iv;
+		int bgDark;
+		int bgLight;
+		int resId;
+		int resLight = R.color.icon_color_light;
+		int resDark = 0;
+
+		boolean nightMode = false;
+		boolean f = true;
+		boolean compass;
+
+		public MapHudButton setRoundTransparent() {
+			setBg(R.drawable.btn_circle_trans);
+			return this;
+		}
+
+		public MapHudButton setBg(int dayBg, int nightBg) {
+			bgDark = nightBg;
+			bgLight = dayBg;
+			f = true;
+			return this;
+
+		}
+
+		public MapHudButton setBg(int bg) {
+			bgDark = bg;
+			bgLight = bg;
+			f = true;
+			return this;
+		}
+
+		public boolean setIconResId(int resId) {
+			if (this.resId == resId) {
+				return false;
+			}
+			this.resId = resId;
+			f = true;
+			return true;
+		}
+
+		public MapHudButton setIconColorId(int clr) {
+			if (resLight == clr && resDark == clr) {
+				return this;
+			}
+			resLight = clr;
+			resDark = clr;
+			f = true;
+			return this;
+		}
+
+		public void update(OsmandApplication ctx, boolean night) {
+			if (nightMode == night && !f) {
+				return;
+			}
+			f = false;
+			nightMode = night;
+			if (bgDark != 0 && bgLight != 0) {
+				iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
+			}
+			if (iv instanceof ImageView) {
+				if(compass) {
+					((ImageView) iv).setImageDrawable(new CompassDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight)));
+				} else {
+					((ImageView) iv).setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
+				}
+			} else if (iv instanceof TextView) {
+				((TextView) iv).setCompoundDrawables(
+						ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight), null, null, null);
+			}
+		}
+
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
deleted file mode 100644
index f498490ab9..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapCancelControl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class MapCancelControl extends MapControls {
-	private Button cancelButton;
-	
-	
-	public MapCancelControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-	}
-	
-	@Override
-	public void showControls(FrameLayout parent) {
-		cancelButton = addButton(parent, R.string.cancel_navigation, R.drawable.map_btn_cancel);
-		cancelButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				if(mapActivity.getRoutingHelper().isFollowingMode()) {
-					mapActivity.getMapActions().stopNavigationActionConfirm(mapActivity.getMapView());
-				} else {
-					mapActivity.getMapActions().stopNavigationWithoutConfirm();
-				}
-			}
-		});
-	}
-
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, cancelButton);
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-	}
-	
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_cancel);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java
deleted file mode 100644
index 5620e5b33c..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRoutePlanControl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class MapRoutePlanControl extends MapControls {
-	private Button routePlanButton;
-	
-	
-	public MapRoutePlanControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-	}
-	
-	@Override
-	public void showControls(FrameLayout parent) {
-		routePlanButton = addButton(parent, R.string.info_button, R.drawable.map_btn_info);
-		routePlanButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				mapActivity.getRoutingHelper().setRoutePlanningMode(true);
-				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
-				mapActivity.refreshMap();
-			}
-		});
-	}
-
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, routePlanButton);
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-	}
-	
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_info);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java b/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
deleted file mode 100644
index e13dbfe6a5..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/SmallMapMenuControls.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class SmallMapMenuControls extends MapControls {
-	private Button backToMenuButton;
-	
-	public SmallMapMenuControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-	}
-	
-	@Override
-	public void showControls(FrameLayout parent) {
-		backToMenuButton = addButton(parent, R.string.backToMenu, R.drawable.map_btn_menu);
-		mapActivity.accessibleContent.add(backToMenuButton);
-		backToMenuButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				if(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get()) {
-					mapActivity.getDashboard().setDashboardVisibility(true);
-				} else {
-					mapActivity.getMapActions().onDrawerBack();
-					mapActivity.getMapActions().toggleDrawer();
-				}
-			}
-		});
-	}
-
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, backToMenuButton);
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-	}
-
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_menu);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-}

From ce1a2f4ccd1c4b9cd015891d1ca49bc4f3b591ec Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 12 Mar 2015 02:08:03 +0100
Subject: [PATCH 06/23] Update

---
 OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 540a508a5d..47fd4ef2a1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -142,6 +142,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			// }
 		compassHud = createHudButton((ImageView) compass, R.drawable.map_compass).setIconColorId(0)
 				.setBg(R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
+		compassHud.compass = true;
 		controls.add(compassHud);
 		compass.setOnClickListener(new View.OnClickListener() {
 			@Override

From 47ab27b5d1fa32563cbcc62453b26e2d1cce2282 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Fri, 13 Mar 2015 21:47:19 +0100
Subject: [PATCH 07/23] Temp fix

---
 OsmAnd/res/values/strings.xml                 |   3 +
 OsmAnd/res/xml/navigation_settings.xml        |   5 +
 .../osmand/plus/activities/MapActivity.java   |   8 +-
 .../SettingsNavigationActivity.java           |  20 ++-
 .../osmand/plus/views/MapControlsLayer.java   | 115 ++++++++++++++----
 .../views/controls/MapRouteInfoControl.java   |   4 -
 6 files changed, 123 insertions(+), 32 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 64f426f57f..0dd37df103 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,8 @@
          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="delay_to_start_navigation_descr">Automatically start navigation after specified interval</string>
+    <string name="delay_to_start_navigation">Skip route planning</string>
     <string name="shared_string_go">Go</string>
 	<string name="action_create">Action create</string>
 	<string name="action_modify">Action modify</string>
@@ -32,6 +34,7 @@
 	<string name="shared_string_cancel">Cancel</string>
 	<string name="shared_string_dismiss">Dismiss</string>
 	<string name="shared_string_yes">Yes</string>
+	<string name="shared_string_not_use">Not use</string>
 	<string name="shared_string_no">No</string>
 	<string name="shared_string_on">On</string>
 	<string name="shared_string_off">Off</string>
diff --git a/OsmAnd/res/xml/navigation_settings.xml b/OsmAnd/res/xml/navigation_settings.xml
index 88ca9de0e7..e88306ffb9 100644
--- a/OsmAnd/res/xml/navigation_settings.xml
+++ b/OsmAnd/res/xml/navigation_settings.xml
@@ -32,5 +32,10 @@
                     android:key="wake_on_voice_int"
                     android:title="@string/wake_on_voice"
                     android:summary="@string/wake_on_voice_descr" />
+            
+            <ListPreference
+                    android:key="delay_to_start_navigation"
+                    android:title="@string/delay_to_start_navigation"
+                    android:summary="@string/delay_to_start_navigation_descr" />
         </PreferenceCategory>
 </PreferenceScreen>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 56896d6c13..22317d1e74 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -160,10 +160,10 @@ public class MapActivity extends AccessibleActivity {
 					if (tn != null) {
 						((TextView) findViewById(R.id.ProgressMessage)).setText(tn);
 					}
-					if(event == InitEvents.NATIVE_INITIALIZED) {
-						setupOpenGLView();
-						openGlSetup = true;
-					}
+//					if(event == InitEvents.NATIVE_INITIALIZED) {
+//						setupOpenGLView();
+//						openGlSetup = true;
+//					}
 					if(event == InitEvents.MAPS_INITIALIZED) {
 						mapView.refreshMap(true);
 					}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index f0e5706f9e..af798a857c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -5,9 +5,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import net.osmand.plus.*;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.DeviceAdminRecv;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.AutoZoomMap;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.RoutingParameter;
@@ -184,13 +189,22 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		if (!mode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
 			category.removePreference(speedLimitExceed);
 		}
+		
+		Integer[] delayIntervals = new Integer[] { -1, 3, 5, 7, 10, 15, 20 };
+		String[] delayIntervalNames = new String[delayIntervals.length];
+		for (int i = 0; i < delayIntervals.length; i++) {
+			if (i == 0) {
+				delayIntervalNames[i] = getString(R.string.shared_string_not_use);
+			} else {
+				delayIntervalNames[i] = delayIntervals[i] + " " + getString(R.string.int_seconds);
+			}
+		}
+		registerListPreference(settings.DELAY_TO_START_NAVIGATION, screen, delayIntervalNames, delayIntervals);
 
 
 		profileDialog();
 	}
 	
-	
-
 
 	private void prepareRoutingPrefs(PreferenceScreen screen) {
 		PreferenceCategory cat = (PreferenceCategory) screen.findPreference("routing_preferences");
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 47fd4ef2a1..a1d6202396 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -19,6 +19,7 @@ import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PointF;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -66,10 +67,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private MapHudButton routeGoControl;
 	private MapHudButton compassHud;
 	private float cachedRotate = 0;
+	private static long startCounter;
+	private Runnable delayStart;
+	private Handler showUIHandler;
 
 	public MapControlsLayer(MapActivity activity) {
 		this.mapActivity = activity;
 		settings = activity.getMyApplication().getSettings();
+		
 	}
 
 	@Override
@@ -84,6 +89,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		// TODO
 		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
 		// rightGravity);
+		showUIHandler = new Handler();
 		initTransparencyBar(view, parent);
 		initZooms();
 		initControls();
@@ -102,10 +108,41 @@ public class MapControlsLayer extends OsmandMapLayer {
 		@Override
 		public void draw(Canvas canvas) {
 			canvas.save();
-			canvas.rotate(cachedRotate, canvas.getWidth() / 2, canvas.getHeight() / 2);
+			canvas.rotate(cachedRotate, getIntrinsicWidth() / 2, getIntrinsicHeight() / 2);
 			original.draw(canvas);
 			canvas.restore();
-
+		}
+		
+		@Override
+		public int getMinimumHeight() {
+			return original.getMinimumHeight();
+		}
+		
+		@Override
+		public int getMinimumWidth() {
+			return original.getMinimumWidth();
+		}
+		
+		@Override
+		public int getIntrinsicHeight() {
+			return original.getIntrinsicHeight();
+		}
+		
+		@Override
+		public int getIntrinsicWidth() {
+			return original.getIntrinsicWidth();
+		}
+		
+		@Override
+		public void setChangingConfigurations(int configs) {
+			super.setChangingConfigurations(configs);
+			original.setChangingConfigurations(configs);
+		}
+		
+		@Override
+		public void setBounds(int left, int top, int right, int bottom) {
+			super.setBounds(left, top, right, bottom);
+			original.setBounds(left, top, right, bottom);
 		}
 
 		@Override
@@ -207,7 +244,12 @@ public class MapControlsLayer extends OsmandMapLayer {
 			@Override
 			public void onClick(View v) {
 				notifyClicked();
-				startNavigation();
+				RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
+				if(!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
+					mapActivity.getMapActions().enterRoutePlanningMode(null, null, false);
+				} else {
+					startNavigation();
+				}
 			}
 		});
 	}
@@ -318,9 +360,36 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	private void stopCounter() {
-		// TODO stop counter
+		startCounter = 0;
 
 	}
+	
+	public void startCounter() {
+		OsmandSettings settings = mapActivity.getMyApplication().getSettings();
+		int del = settings.DELAY_TO_START_NAVIGATION.get();
+		if(del <= 0) {
+			return;
+		}
+		if (startCounter <= 0) {
+			startCounter = System.currentTimeMillis() + del * 1000;
+			delayStart = new Runnable() {
+				@Override
+				public void run() {
+					if (startCounter > 0) {
+						if (System.currentTimeMillis() > startCounter) {
+							startCounter = 0;
+							startNavigation();
+						} else {
+							mapActivity.refreshMap();
+							showUIHandler.postDelayed(delayStart, 1000);
+						}
+					}
+				}
+			};
+			delayStart.run();
+		}
+		
+	}
 
 	protected void notifyClicked(MapControls m) {
 		notifyClicked();
@@ -379,16 +448,30 @@ public class MapControlsLayer extends OsmandMapLayer {
 		int vis = showRouteCalculationControls ? View.VISIBLE : View.GONE;
 		if (showRouteCalculationControls) {
 			((TextView) routeGoControl.iv).setTextColor(textColor);
+			final String text ;
+			if (startCounter > 0) {
+				int get = (int) ((startCounter - System.currentTimeMillis()) / 1000l);
+				text = mapActivity.getString(R.string.shared_string_go) + " (" + get + ")";
+			} else {
+				text = mapActivity.getString(R.string.shared_string_go) ;
+			}
+			((TextView) routeGoControl.iv).setText(text);
 		}
 
 		if (routePreparationLayout.getVisibility() != vis) {
 			routePreparationLayout.setVisibility(vis);
 			mapRouteInfoControlDialog.setVisible(showRouteCalculationControls);
+			if(showRouteCalculationControls) {
+				if(!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isPauseNavigation()) {
+					startCounter();
+				}
+			} else {
+				stopCounter();
+			}
 		}
 
 		float mapRotate = mapActivity.getMapView().getRotate();
 		if (mapRotate != cachedRotate) {
-			float c = cachedRotate - mapRotate;
 			cachedRotate = mapRotate;
 			// Aply animation to image view
 			 compassHud.iv.invalidate();
@@ -411,26 +494,16 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		// TODO stop counter & show buttons
-		// for(MapControls m : allControls) {
-		// if(m.isVisible() && m.onSingleTap(point, tileBox)){
-		// return true;
-		// }
-		// }
+		if(mapRouteInfoControlDialog.onSingleTap(point, tileBox)) {
+			return true;
+		}
+		stopCounter();
 		return false;
 	}
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
-		// TODO stop counter & show buttons
-		// if(!mapActivity.getRoutingHelper().isRoutePlanningMode() && mapActivity.getRoutingHelper().isFollowingMode())
-		// {
-		// if(!settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get()) {
-		// zoomControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-		// mapMenuControls.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-		// }
-		// mapRoutePlanControl.showWithDelay(getParent(), TIMEOUT_TO_SHOW_BUTTONS);
-		// }
+		stopCounter();
 		return false;
 	}
 
@@ -570,7 +643,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 					((ImageView) iv).setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
 				}
 			} else if (iv instanceof TextView) {
-				((TextView) iv).setCompoundDrawables(
+				((TextView) iv).setCompoundDrawablesWithIntrinsicBounds(
 						ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight), null, null, null);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
index b8482ffd0a..3ba2641917 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@@ -20,7 +20,6 @@ import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.RoutingHelper.IRouteInformationListener;
 import net.osmand.plus.views.ContextMenuLayer;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -28,9 +27,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
-import android.graphics.Canvas;
 import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -38,7 +35,6 @@ import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.Spinner;

From 7f93abc33209081d58c2df9c8efdaf4018305006 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 01:02:35 +0100
Subject: [PATCH 08/23] Fix issues

---
 OsmAnd/res/drawable/btn_round_trans.xml       |  15 +
 OsmAnd/res/layout/map_hud_bottom.xml          | 121 +++++---
 OsmAnd/res/values/sizes.xml                   |   6 +
 .../net/londatiga/android/QuickAction.java    |   8 +-
 .../osmand/plus/dashboard/DashboardOnMap.java |   1 +
 .../osmand/plus/views/MapControlsLayer.java   | 246 +++++++++++----
 .../plus/views/controls/MapMenuControls.java  | 139 ---------
 .../plus/views/controls/MapZoomControls.java  | 288 ------------------
 .../plus/views/controls/RulerControl.java     |  30 +-
 9 files changed, 312 insertions(+), 542 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_round_trans.xml
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java

diff --git a/OsmAnd/res/drawable/btn_round_trans.xml b/OsmAnd/res/drawable/btn_round_trans.xml
new file mode 100644
index 0000000000..24682aaa11
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_round_trans.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 97c1d72d54..51ff0465bd 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -2,13 +2,64 @@
 <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">
+    android:layout_gravity="bottom"
+    android:orientation="vertical" >
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
+        <FrameLayout
+            android:id="@+id/map_app_mode_shadow"
+            android:layout_width="@dimen/map_button_shadow_width"
+            android:layout_height="@dimen/map_button_shadow_height"
+            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" >
+
+            <ImageView
+                android:id="@+id/map_app_mode_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|center"
+                android:layout_marginTop="3dp"
+                android:src="@drawable/ic_action_remove_light" />
+
+            <TextView
+                android:id="@+id/map_app_mode_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|center"
+                android:layout_marginTop="3dp"
+                android:textSize="@dimen/map_button_text_size" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/map_transparency_layout"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_gravity="bottom|center"
+            android:layout_marginBottom="@dimen/map_button_size"
+            android:orientation="horizontal" >
+
+            <SeekBar
+                android:id="@+id/map_transparency_seekbar"
+                android:layout_height="wrap_content"
+                android:layout_width="@dimen/map_trans_seek_size" 
+                android:layout_gravity="center"
+                />
+
+            <ImageButton
+                android:id="@+id/map_transparency_hide"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/btn_circle_transparent"
+                android:src="@drawable/headliner_close" />
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -17,18 +68,18 @@
             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:id="@+id/map_menu_button"
                 android:src="@drawable/ic_action_remove_light" />
 
             <ImageButton
+                android:id="@+id/map_route_info_button"
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
                 android:layout_marginLeft="@dimen/map_button_spacing"
                 android:background="@drawable/btn_round"
-                android:id="@+id/map_route_info_button"
                 android:src="@drawable/ic_action_remove_light" />
         </LinearLayout>
 
@@ -62,7 +113,7 @@
                     android:src="@drawable/ic_action_remove_light" />
 
                 <ImageButton
-					android:id="@+id/map_zoom_out_button"
+                    android:id="@+id/map_zoom_out_button"
                     android:layout_width="@dimen/map_button_size"
                     android:layout_height="@dimen/map_button_size"
                     android:layout_marginTop="@dimen/map_button_spacing"
@@ -77,63 +128,63 @@
         android:layout_height="wrap_content" >
 
         <LinearLayout
+            android:id="@+id/map_route_preparation_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/map_route_buttons_height"
-            android:id="@+id/map_route_preparation_layout"
             android:layout_gravity="bottom" >
-            
-             <ImageButton
-                android:layout_width="@dimen/map_route_buttons_width"
-                android:layout_height="match_parent"
+
+            <ImageButton
                 android:id="@+id/map_cancel_route_button"
-                android:background="@drawable/btn_flat"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_action_remove_light" />
-             
-             <ImageButton
                 android:layout_width="@dimen/map_route_buttons_width"
                 android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/btn_flat"
+                android:src="@drawable/ic_action_remove_light" />
+
+            <ImageButton
                 android:id="@+id/map_waypoints_route_button"
-                android:background="@drawable/btn_flat"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_action_remove_light" />
-             
-             <ImageButton
                 android:layout_width="@dimen/map_route_buttons_width"
                 android:layout_height="match_parent"
-                android:background="@drawable/btn_flat"
-                android:id="@+id/map_options_route_button"
                 android:layout_gravity="center_vertical"
+                android:background="@drawable/btn_flat"
                 android:src="@drawable/ic_action_remove_light" />
-             
-             <TextView
+
+            <ImageButton
+                android:id="@+id/map_options_route_button"
+                android:layout_width="@dimen/map_route_buttons_width"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/btn_flat"
+                android:src="@drawable/ic_action_remove_light" />
+
+            <TextView
+                android:id="@+id/map_go_route_button"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/btn_flat"
                 android:layout_gravity="center_vertical"
-                android:id="@+id/map_go_route_button"
+                android:background="@drawable/btn_flat"
+                android:drawableLeft="@drawable/ic_action_remove_light"
+                android:drawablePadding="4dp"
                 android:gravity="center_vertical"
                 android:paddingLeft="12dp"
-                android:drawableLeft="@drawable/ic_action_remove_light"
                 android:textSize="20sp"
-                android:textStyle="bold" 
-                android:drawablePadding="4dp" />
+                android:textStyle="bold" />
         </LinearLayout>
-        
+
         <LinearLayout
+            android:id="@+id/map_context_menu_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/map_context_menu_layout"
-            android:visibility="gone"
-            android:background="@drawable/btn_flat" 
-            android:layout_gravity="bottom">
+            android:layout_gravity="bottom"
+            android:background="@drawable/btn_flat"
+            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
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 678d76a753..5629a6f3c8 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -48,15 +48,21 @@
 	<dimen name="dashboard_parking_left_margin">16dp</dimen>
 	<dimen name="dashboard_parking_icon_size">48dp</dimen>
 	<!--  map buttons -->
+	
+	<dimen name="map_trans_seek_size">80dp</dimen>
+	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_route_buttons_width">60dp</dimen>
 	<dimen name="map_route_buttons_height">54dp</dimen>
 	<dimen name="map_address_height">40dp</dimen>
 	<dimen name="map_button_size">48dp</dimen>
+	<dimen name="map_button_shadow_width">52dp</dimen>
+	<dimen name="map_button_shadow_height">85dp</dimen>
 	<dimen name="map_widget_icon">24dp</dimen>
 	<dimen name="map_widget_height">32dp</dimen>
 	<dimen name="map_widget_image">80dp</dimen>
 	<dimen name="map_button_spacing">15dp</dimen>
 	<dimen name="map_button_margin">4dp</dimen>
+	<dimen name="map_button_shadow_margin">2dp</dimen>
 	<dimen name="map_button_inset">4dp</dimen>
 	<dimen name="map_button_rect_rad">3dp</dimen>
 	<dimen name="map_button_stroke">1px</dimen>
diff --git a/OsmAnd/src/net/londatiga/android/QuickAction.java b/OsmAnd/src/net/londatiga/android/QuickAction.java
index 3f4f505f3c..d95e2427fe 100644
--- a/OsmAnd/src/net/londatiga/android/QuickAction.java
+++ b/OsmAnd/src/net/londatiga/android/QuickAction.java
@@ -48,6 +48,7 @@ public class QuickAction extends CustomPopupWindow {
 	private boolean animateTrack;
 	private ViewGroup mTrack;
 	private ArrayList<ActionItem> actionList;
+	private boolean top;
 	
 	/**
 	 * Constructor
@@ -85,6 +86,11 @@ public class QuickAction extends CustomPopupWindow {
 		animStyle		= ANIM_AUTO;
 		animateTrack	= true;
 	}
+	
+	public void setOnAnchorOnTop(boolean top) {
+		this.top = top;
+		
+	}
 
 	/**
 	 * Animate track
@@ -150,7 +156,7 @@ public class QuickAction extends CustomPopupWindow {
 		boolean onTop		= true;
 		
 		// display on bottom
-		if (rootHeight > anchor.getTop()) {
+		if (rootHeight > anchor.getTop() || onTop) {
 			yPos 	= anchorRect.bottom;
 			onTop	= false;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 8e4b14d554..3388e9e0c7 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -291,6 +291,7 @@ public class DashboardOnMap {
 		if(!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
 			mapActivity.getMapActions().enterRoutePlanningMode(null, null, false);
 		} else {
+			mapActivity.getRoutingHelper().setRoutePlanningMode(true);
 			mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
 			mapActivity.refreshMap();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index a1d6202396..69cc64dd47 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -1,10 +1,17 @@
 package net.osmand.plus.views;
 
+import gnu.trove.list.array.TIntArrayList;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import net.londatiga.android.ActionItem;
+import net.londatiga.android.QuickAction;
+import net.osmand.core.android.MapRendererContext;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
@@ -13,19 +20,18 @@ import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.controls.MapControls;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.plus.views.controls.MapRoutePreferencesControl;
-import net.osmand.plus.views.controls.MapZoomControls;
+import net.osmand.plus.views.corenative.NativeCoreContext;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PointF;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
-import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -36,8 +42,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private static final int TIMEOUT_TO_SHOW_BUTTONS = 5000;
 
-	
-	
 	public MapHudButton createHudButton(View iv, int resId) {
 		MapHudButton mc = new MapHudButton();
 		mc.iv = iv;
@@ -70,11 +74,18 @@ public class MapControlsLayer extends OsmandMapLayer {
 	private static long startCounter;
 	private Runnable delayStart;
 	private Handler showUIHandler;
+	private ImageView appModeIcon;
+	private TextView zoomText;
+	private OsmandMapTileView mapView;
+	private OsmandApplication app;
+	private View mapAppModeShadow;
 
 	public MapControlsLayer(MapActivity activity) {
 		this.mapActivity = activity;
+		app = activity.getMyApplication();
 		settings = activity.getMyApplication().getSettings();
-		
+		mapView = mapActivity.getMapView();
+
 	}
 
 	@Override
@@ -85,18 +96,17 @@ public class MapControlsLayer extends OsmandMapLayer {
 	@Override
 	public void initLayer(final OsmandMapTileView view) {
 		scaleCoefficient = view.getScaleCoefficient();
-		FrameLayout parent = getParent();
 		// TODO
 		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
 		// rightGravity);
 		showUIHandler = new Handler();
-		initTransparencyBar(view, parent);
+		initTransparencyBar();
 		initZooms();
 		initControls();
 		initRouteControls();
 		initTopControls();
 	}
-	
+
 	private class CompassDrawable extends Drawable {
 
 		private Drawable original;
@@ -112,33 +122,33 @@ public class MapControlsLayer extends OsmandMapLayer {
 			original.draw(canvas);
 			canvas.restore();
 		}
-		
+
 		@Override
 		public int getMinimumHeight() {
 			return original.getMinimumHeight();
 		}
-		
+
 		@Override
 		public int getMinimumWidth() {
 			return original.getMinimumWidth();
 		}
-		
+
 		@Override
 		public int getIntrinsicHeight() {
 			return original.getIntrinsicHeight();
 		}
-		
+
 		@Override
 		public int getIntrinsicWidth() {
 			return original.getIntrinsicWidth();
 		}
-		
+
 		@Override
 		public void setChangingConfigurations(int configs) {
 			super.setChangingConfigurations(configs);
 			original.setChangingConfigurations(configs);
 		}
-		
+
 		@Override
 		public void setBounds(int left, int top, int right, int bottom) {
 			super.setBounds(left, top, right, bottom);
@@ -175,10 +185,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View compass = mapActivity.findViewById(R.id.map_compass_button);
-//		protected void onDraw(Canvas canvas) {
-			// }
-		compassHud = createHudButton((ImageView) compass, R.drawable.map_compass).setIconColorId(0)
-				.setBg(R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
+		// protected void onDraw(Canvas canvas) {
+		// }
+		compassHud = createHudButton((ImageView) compass, R.drawable.map_compass).setIconColorId(0).setBg(
+				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
 		compassHud.compass = true;
 		controls.add(compassHud);
 		compass.setOnClickListener(new View.OnClickListener() {
@@ -245,7 +255,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			public void onClick(View v) {
 				notifyClicked();
 				RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
-				if(!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
+				if (!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
 					mapActivity.getMapActions().enterRoutePlanningMode(null, null, false);
 				} else {
 					startNavigation();
@@ -290,6 +300,16 @@ public class MapControlsLayer extends OsmandMapLayer {
 				}
 			}
 		});
+		mapAppModeShadow = mapActivity.findViewById(R.id.map_app_mode_shadow);
+		mapAppModeShadow.setOnClickListener(new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				onApplicationModePress(v);
+			}
+		});
+		appModeIcon = (ImageView) mapActivity.findViewById(R.id.map_app_mode_icon);
+		zoomText = (TextView) mapActivity.findViewById(R.id.map_app_mode_text);
 
 		View routePlanButton = mapActivity.findViewById(R.id.map_route_info_button);
 		controls.add(createHudButton((ImageView) routePlanButton, R.drawable.ic_action_gdirections_dark).setBg(
@@ -298,9 +318,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 			@Override
 			public void onClick(View v) {
 				notifyClicked();
-				mapActivity.getRoutingHelper().setRoutePlanningMode(true);
-				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
-				mapActivity.refreshMap();
+				RoutingHelper routingHelper = mapActivity.getRoutingHelper();
+				if (!routingHelper.isFollowingMode() && !routingHelper.isRoutePlanningMode()) {
+					mapActivity.getMapActions().enterRoutePlanningMode(null, null, false);
+				} else {
+					mapActivity.getRoutingHelper().setRoutePlanningMode(true);
+					mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
+					mapActivity.refreshMap();
+				}
 			}
 		});
 
@@ -322,11 +347,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 			}
 		});
-		final View.OnLongClickListener listener = MapZoomControls.getOnClickMagnifierListener(view);
+		final View.OnLongClickListener listener = MapControlsLayer.getOnClickMagnifierListener(view);
 		zoomInButton.setOnLongClickListener(listener);
 		View zoomOutButton = mapActivity.findViewById(R.id.map_zoom_out_button);
-		controls.add(createHudButton((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out)
-				.setRoundTransparent());
+		controls.add(createHudButton((ImageView) zoomOutButton, R.drawable.ic_action_zoom_out).setRoundTransparent());
 		zoomOutButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -363,11 +387,11 @@ public class MapControlsLayer extends OsmandMapLayer {
 		startCounter = 0;
 
 	}
-	
+
 	public void startCounter() {
 		OsmandSettings settings = mapActivity.getMyApplication().getSettings();
 		int del = settings.DELAY_TO_START_NAVIGATION.get();
-		if(del <= 0) {
+		if (del <= 0) {
 			return;
 		}
 		if (startCounter <= 0) {
@@ -388,7 +412,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 			};
 			delayStart.run();
 		}
-		
+
 	}
 
 	protected void notifyClicked(MapControls m) {
@@ -440,20 +464,33 @@ public class MapControlsLayer extends OsmandMapLayer {
 			backToLocationControl.setIconColorId(R.color.color_white);
 		}
 
-		menuControl
-				.setIconResId(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
-						: R.drawable.ic_navigation_drawer);
+		menuControl.setIconResId(settings.USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
+				: R.drawable.ic_navigation_drawer);
 
+		if(routeFollowingMode || routePlanningMode) {
+			mapAppModeShadow.setVisibility(View.GONE);
+		} else {
+			mapAppModeShadow.setVisibility(View.VISIBLE);
+			if (!mapView.isZooming() || !OsmandPlugin.isDevelopment()) {
+				zoomText.setVisibility(View.GONE);
+				appModeIcon.setVisibility(View.VISIBLE);
+				appModeIcon.setImageResource(settings.getApplicationMode().getSmallIcon(isNight));
+			} else {
+				zoomText.setVisibility(View.VISIBLE);
+				appModeIcon.setVisibility(View.GONE);
+				zoomText.setText(getZoomLevel(tileBox));
+			}
+		}
 		optionsRouteControl.setIconResId(settings.getApplicationMode().getSmallIcon(true));
 		int vis = showRouteCalculationControls ? View.VISIBLE : View.GONE;
 		if (showRouteCalculationControls) {
 			((TextView) routeGoControl.iv).setTextColor(textColor);
-			final String text ;
+			final String text;
 			if (startCounter > 0) {
 				int get = (int) ((startCounter - System.currentTimeMillis()) / 1000l);
 				text = mapActivity.getString(R.string.shared_string_go) + " (" + get + ")";
 			} else {
-				text = mapActivity.getString(R.string.shared_string_go) ;
+				text = mapActivity.getString(R.string.shared_string_go);
 			}
 			((TextView) routeGoControl.iv).setText(text);
 		}
@@ -461,8 +498,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		if (routePreparationLayout.getVisibility() != vis) {
 			routePreparationLayout.setVisibility(vis);
 			mapRouteInfoControlDialog.setVisible(showRouteCalculationControls);
-			if(showRouteCalculationControls) {
-				if(!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isPauseNavigation()) {
+			if (showRouteCalculationControls) {
+				if (!mapActivity.getRoutingHelper().isFollowingMode()
+						&& !mapActivity.getRoutingHelper().isPauseNavigation()) {
 					startCounter();
 				}
 			} else {
@@ -474,7 +512,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		if (mapRotate != cachedRotate) {
 			cachedRotate = mapRotate;
 			// Aply animation to image view
-			 compassHud.iv.invalidate();
+			compassHud.iv.invalidate();
 		}
 		if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
 			compassHud.setIconResId(isNight ? R.drawable.map_compass_niu_white : R.drawable.map_compass_niu);
@@ -489,12 +527,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
-	private FrameLayout getParent() {
-		return (FrameLayout) mapActivity.findViewById(R.id.MapButtons);
-	}
 
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if(mapRouteInfoControlDialog.onSingleTap(point, tileBox)) {
+		if (mapRouteInfoControlDialog.onSingleTap(point, tileBox)) {
 			return true;
 		}
 		stopCounter();
@@ -508,16 +543,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	// /////////////// Transparency bar /////////////////////////
-	private void initTransparencyBar(final OsmandMapTileView view, FrameLayout parent) {
-		int minimumHeight = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumHeight();
-		android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
-				LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.CENTER);
-		params.setMargins(0, 0, 0, minimumHeight + 3);
-		transparencyBarLayout = new LinearLayout(view.getContext());
-		transparencyBarLayout.setVisibility(settingsToTransparency != null ? View.VISIBLE : View.GONE);
-		parent.addView(transparencyBarLayout, params);
-
-		transparencyBar = new SeekBar(view.getContext());
+	private void initTransparencyBar() {
+		transparencyBarLayout = (LinearLayout) mapActivity.findViewById(R.id.map_transparency_layout);
+		transparencyBar = (SeekBar) mapActivity.findViewById(R.id.map_transparency_seekbar);
 		transparencyBar.setMax(255);
 		if (settingsToTransparency != null) {
 			transparencyBar.setProgress(settingsToTransparency.get());
@@ -540,12 +568,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				}
 			}
 		});
-		android.widget.LinearLayout.LayoutParams prms = new LinearLayout.LayoutParams((int) (scaleCoefficient * 100),
-				LayoutParams.WRAP_CONTENT);
-		transparencyBarLayout.addView(transparencyBar, prms);
-		ImageButton imageButton = new ImageButton(view.getContext());
-		prms = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-		prms.setMargins((int) (2 * scaleCoefficient), (int) (2 * scaleCoefficient), 0, 0);
+		ImageButton imageButton = (ImageButton) mapActivity.findViewById(R.id.map_transparency_hide);
 		imageButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -553,9 +576,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 				hideTransparencyBar(settingsToTransparency);
 			}
 		});
-		imageButton.setContentDescription(view.getContext().getString(R.string.shared_string_close));
-		imageButton.setBackgroundResource(R.drawable.headliner_close);
-		transparencyBarLayout.addView(imageButton, prms);
 	}
 
 	public void showTransparencyBar(CommonPreference<Integer> transparenPreference) {
@@ -575,7 +595,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		// TODO
 	}
 
-	
 	private class MapHudButton {
 		View iv;
 		int bgDark;
@@ -637,10 +656,12 @@ public class MapControlsLayer extends OsmandMapLayer {
 				iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
 			}
 			if (iv instanceof ImageView) {
-				if(compass) {
-					((ImageView) iv).setImageDrawable(new CompassDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight)));
+				if (compass) {
+					((ImageView) iv).setImageDrawable(new CompassDrawable(ctx.getIconsCache().getIcon(resId,
+							nightMode ? resDark : resLight)));
 				} else {
-					((ImageView) iv).setImageDrawable(ctx.getIconsCache().getIcon(resId, nightMode ? resDark : resLight));
+					((ImageView) iv).setImageDrawable(ctx.getIconsCache()
+							.getIcon(resId, nightMode ? resDark : resLight));
 				}
 			} else if (iv instanceof TextView) {
 				((TextView) iv).setCompoundDrawablesWithIntrinsicBounds(
@@ -649,4 +670,99 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 
 	}
+
+	private void onApplicationModePress(View v) {
+		final QuickAction mQuickAction = new QuickAction(v);
+		mQuickAction.setOnAnchorOnTop(true);
+		List<ApplicationMode> vls = ApplicationMode.values(mapActivity.getMyApplication().getSettings());
+		final ApplicationMode[] modes = vls.toArray(new ApplicationMode[vls.size()]);
+		int[] icons = new int[vls.size()];
+		int[] values = new int[vls.size()];
+		for (int k = 0; k < modes.length; k++) {
+			icons[k] = modes[k].getSmallIcon(false);
+			values[k] = modes[k].getStringResource();
+		}
+		for (int i = 0; i < modes.length; i++) {
+			final ActionItem action = new ActionItem();
+			action.setTitle(mapActivity.getResources().getString(values[i]));
+			action.setIcon(mapActivity.getResources().getDrawable(icons[i]));
+			final int j = i;
+			action.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					mapActivity.getMyApplication().getSettings().APPLICATION_MODE.set(modes[j]);
+					mQuickAction.dismiss();
+				}
+			});
+			mQuickAction.addActionItem(action);
+		}
+		mQuickAction.setAnimStyle(QuickAction.ANIM_AUTO);
+		mQuickAction.show();
+	}
+
+	private String getZoomLevel(RotatedTileBox tb) {
+		String zoomText = tb.getZoom() + "";
+		double frac = tb.getMapDensity();
+		if (frac != 0) {
+			int ifrac = (int) (frac * 10);
+			zoomText += " ";
+			zoomText += Math.abs(ifrac) / 10;
+			if (ifrac % 10 != 0) {
+				zoomText += "." + Math.abs(ifrac) % 10;
+			}
+		}
+		return zoomText;
+	}
+
+	public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
+		final View.OnLongClickListener listener = new View.OnLongClickListener() {
+
+			@Override
+			public boolean onLongClick(View notUseCouldBeNull) {
+				final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
+				final AlertDialog.Builder bld = new AlertDialog.Builder(view.getContext());
+				int p = (int) (mapDensity.get() * 100);
+				final TIntArrayList tlist = new TIntArrayList(new int[] { 33, 50, 75, 100, 150, 200, 300, 400 });
+				final List<String> values = new ArrayList<String>();
+				int i = -1;
+				for (int k = 0; k <= tlist.size(); k++) {
+					final boolean end = k == tlist.size();
+					if (i == -1) {
+						if ((end || p < tlist.get(k))) {
+							values.add(p + "%");
+							i = k;
+						} else if (p == tlist.get(k)) {
+							i = k;
+						}
+
+					}
+					if (k < tlist.size()) {
+						values.add(tlist.get(k) + "%");
+					}
+				}
+				if (values.size() != tlist.size()) {
+					tlist.insert(i, p);
+				}
+
+				bld.setTitle(R.string.map_magnifier);
+				bld.setSingleChoiceItems(values.toArray(new String[values.size()]), i,
+						new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								int p = tlist.get(which);
+								mapDensity.set(p / 100.0f);
+								view.setComplexZoom(view.getZoom(), view.getSettingsMapDensity());
+								MapRendererContext mapContext = NativeCoreContext.getMapRendererContext();
+								if (mapContext != null) {
+									mapContext.updateMapSettings();
+								}
+								dialog.dismiss();
+							}
+						});
+				bld.show();
+				return true;
+			}
+		};
+		return listener;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
deleted file mode 100644
index df1490434d..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapMenuControls.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import java.util.List;
-
-import net.londatiga.android.ActionItem;
-import net.londatiga.android.QuickAction;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.OsmandMapTileView;
-import android.graphics.Canvas;
-import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class MapMenuControls extends MapControls {
-	private Button backToMenuButton;
-	private Drawable modeShadow;
-	private Drawable cacheAppModeIcon = null;
-	private ApplicationMode cacheApplicationMode = null;
-	
-	
-	public MapMenuControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-	}
-	
-	private void initBackToMenuButton(final OsmandMapTileView view, FrameLayout parent) {
-		backToMenuButton = addButton(parent, R.string.backToMenu, R.drawable.map_btn_menu);
-		modeShadow = view.getResources().getDrawable(R.drawable.zoom_background);
-		backToMenuButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				// double lat = activity.getMapView().getLatitude();
-				// double lon = activity.getMapView().getLongitude();
-				// MainMenuActivity.backToMainMenuDialog(activity, new LatLon(lat, lon));
-				notifyClicked();
-				if(mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get()) {
-					mapActivity.getDashboard().setDashboardVisibility(true);
-				} else {
-					mapActivity.getMapActions().onDrawerBack();
-					mapActivity.getMapActions().toggleDrawer();
-				}
-			}
-		});
-	}
-
-	@Override
-	public void showControls(FrameLayout layout) {
-		initBackToMenuButton(mapActivity.getMapView(), layout);
-	}
-
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, backToMenuButton);
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		if(mapActivity.findViewById(R.id.MapButtons).getVisibility() == View.GONE) {
-			return;
-		}
-		drawApplicationMode(canvas, nightMode != null && nightMode.isNightMode());
-	}
-	
-	
-	private void drawApplicationMode(Canvas canvas, boolean nightMode) {
-		OsmandMapTileView view = mapActivity.getMapView();
-		ApplicationMode  appMode = view.getSettings().getApplicationMode();
-		if(appMode != cacheApplicationMode){
-			modeShadow.setBounds(backToMenuButton.getLeft() + (int) (2 * scaleCoefficient), backToMenuButton.getTop() - (int) (24 * scaleCoefficient),
-					backToMenuButton.getRight() - (int) (4 * scaleCoefficient), backToMenuButton.getBottom());
-			cacheAppModeIcon = view.getResources().getDrawable(appMode.getSmallIcon(nightMode));
-			int l = modeShadow.getBounds().left + (modeShadow.getBounds().width() - cacheAppModeIcon.getMinimumWidth()) / 2;
-			int t = (int) (modeShadow.getBounds().top + 2 * scaleCoefficient);
-			cacheAppModeIcon.setBounds(l, t, l + cacheAppModeIcon.getMinimumWidth(), t + cacheAppModeIcon.getMinimumHeight());	
-		}
-		modeShadow.draw(canvas);
-		if(cacheAppModeIcon != null){
-			cacheAppModeIcon.draw(canvas);
-		}
-		
-	}
-	
-	@Override
-	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if (modeShadow.getBounds().contains((int) point.x, (int) point.y)) {
-			onApplicationModePress();
-			return true;
-		}
-		return false;
-	}
-	
-	
-	
-	private void onApplicationModePress() {
-		final QuickAction mQuickAction = new QuickAction(backToMenuButton);
-		List<ApplicationMode> vls = ApplicationMode.values(mapActivity.getMyApplication().getSettings());
-		final ApplicationMode[] modes = vls.toArray(new ApplicationMode[vls.size()]);
-		int[] icons = new int[vls.size()];
-		int[] values = new int[vls.size()];
-		for(int k = 0; k < modes.length; k++) {
-			icons[k] = modes[k].getSmallIcon(false);
-			values[k] = modes[k].getStringResource();
-		}
-		for (int i = 0; i < modes.length; i++) {
-			final ActionItem action = new ActionItem();
-			action.setTitle(mapActivity.getResources().getString(values[i]));
-			action.setIcon(mapActivity.getResources().getDrawable(icons[i]));
-			final int j = i;
-			action.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					mapActivity.getMyApplication().getSettings().APPLICATION_MODE.set(modes[j]);
-					mQuickAction.dismiss();
-				}
-			});
-			mQuickAction.addActionItem(action);
-		}
-		mQuickAction.setAnimStyle(QuickAction.ANIM_AUTO);
-		mQuickAction.show();
-	}
-
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_menu);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-	
-
-
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java
deleted file mode 100644
index 9721b59418..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapZoomControls.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import gnu.trove.list.array.TIntArrayList;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import net.osmand.core.android.MapRendererContext;
-import net.osmand.core.android.MapRendererView;
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.OsmAndConstants;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.BaseMapLayer;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.ShadowText;
-import net.osmand.plus.views.corenative.NativeCoreContext;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Message;
-import android.text.TextPaint;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class MapZoomControls extends MapControls {
-	private static final int SHOW_ZOOM_LEVEL_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_CONTROLS + 1;
-	private static final int SHOW_ZOOM_BUTTON_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_CONTROLS + 2;
-	private static final int SHOW_ZOOM_LEVEL_DELAY = 1000;
-	private static final int SHOW_ZOOM_LEVEL_BUTTON_DELAY = 1500;
-	
-	private Button zoomInButton;
-	private Button zoomOutButton;
-
-	private TextPaint zoomTextPaint;
-	private Drawable zoomShadow;
-	private Bitmap mapMagnifier;
-	private Paint bitmapPaint;
-	private boolean showZoomLevel = false;
-	private boolean showZoomLevelButton = false;
-	private OsmandMapTileView view;
-
-	public MapZoomControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-		view = mapActivity.getMapView();
-		zoomTextPaint = new TextPaint();
-		zoomTextPaint.setTextSize(18 * scaleCoefficient);
-		zoomTextPaint.setAntiAlias(true);
-		zoomTextPaint.setFakeBoldText(true);
-	}
-
-	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		if (isShowZoomLevel() && zoomShadow.getBounds().contains((int) point.x, (int) point.y)) {
-			getOnClickMagnifierListener(view).onLongClick(null);
-			return true;
-		}
-		return false;
-	}
-
-	
-	@Override
-	protected void showControls(FrameLayout parent) {
-		int minimumWidth = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth();
-		int minimumHeight = view.getResources().getDrawable(R.drawable.map_zoom_in).getMinimumWidth();
-		vmargin = 0;
-		zoomInButton = addButton(parent, R.string.zoomIn, R.drawable.map_zoom_in);
-		if(isBottom()) {
-			zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out, minimumWidth);
-		} else {
-			vmargin = minimumHeight - (minimumHeight / 6);
-			zoomOutButton = addButton(parent, R.string.zoomOut, R.drawable.map_zoom_out);
-		}
-		zoomInButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				if (view.isZooming()) {
-					mapActivity.changeZoom(2, System.currentTimeMillis());
-				} else {
-					mapActivity.changeZoom(1, System.currentTimeMillis());
-				}
-
-			}
-		});
-		final View.OnLongClickListener listener = getOnClickMagnifierListener(view);
-		zoomInButton.setOnLongClickListener(listener);
-		zoomOutButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				long time = Calendar.getInstance().getTime().getTime();
-				notifyClicked();
-				mapActivity.changeZoom(-1, System.currentTimeMillis());
-			}
-		});
-		zoomOutButton.setOnLongClickListener(listener);		
-	}
-
-	@Override
-	public void initControls(FrameLayout parent) {
-		if(isBottom()) {
-			zoomShadow = view.getResources().getDrawable(R.drawable.zoom_background).mutate();
-		}
-		mapMagnifier = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_magnifier);
-		bitmapPaint = new Paint();
-	}
-
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, zoomInButton);
-		removeButton(layout, zoomOutButton);
-	}
-
-	private void drawZoomLevel(Canvas canvas, RotatedTileBox tb, boolean drawZoomLevel) {
-		if (zoomShadow.getBounds().width() == 0) {
-			zoomShadow.setBounds(zoomInButton.getLeft() - 2, zoomInButton.getTop() - (int) (18 * scaleCoefficient),
-					zoomInButton.getRight(), zoomInButton.getBottom());
-		}
-		zoomShadow.draw(canvas);
-		if (drawZoomLevel) {
-			String zoomText = tb.getZoom() + "";
-			double frac = tb.getMapDensity();
-			if (frac != 0) {
-				int ifrac = (int) (frac * 10);
-				zoomText += " ";
-				zoomText += Math.abs(ifrac) / 10;
-				if (ifrac % 10 != 0) {
-					zoomText += "." + Math.abs(ifrac) % 10;
-				}
-			}
-			float length = zoomTextPaint.measureText(zoomText);
-
-			ShadowText.draw(zoomText, canvas, zoomInButton.getLeft() + (zoomInButton.getWidth() - length - 2) / 2,
-					zoomInButton.getTop() + 4 * scaleCoefficient, zoomTextPaint, shadowColor);
-		} else {
-			int size = (int) (16 * scaleCoefficient);
-			int top = (int) (zoomInButton.getTop() - size - 4 * scaleCoefficient);
-			int left = (int) (zoomInButton.getLeft() + (zoomInButton.getWidth() - mapMagnifier.getWidth() - 2 * scaleCoefficient) / 2);
-			// canvas density /2 ? size * 2
-			canvas.drawBitmap(mapMagnifier, null, new Rect(left, top, left + size * 2, top + size * 2), bitmapPaint);
-		}
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		BaseMapLayer mainLayer = view.getMainLayer();
-		boolean zoomInEnabled = mainLayer != null && tileBox.getZoom() < mainLayer.getMaximumShownMapZoom();
-		boolean zoomOutEnabled = mainLayer != null && tileBox.getZoom() > mainLayer.getMinimumShownMapZoom();
-		if (zoomInButton.isEnabled() != zoomInEnabled) {
-			zoomInButton.setEnabled(zoomInEnabled);
-		}
-		if (zoomOutButton.isEnabled() != zoomOutEnabled) {
-			zoomOutButton.setEnabled(zoomOutEnabled);
-		}
-		if (isBottom()) {
-			if (view.isZooming()) {
-				showZoomLevel = true;
-				showZoomLevelButton = false;
-				showUIHandler.removeMessages(SHOW_ZOOM_LEVEL_MSG_ID);
-				showUIHandler.removeMessages(SHOW_ZOOM_BUTTON_MSG_ID);
-			} else {
-				if (isShowZoomLevel() && view.getSettings().SHOW_RULER.get()) {
-					hideZoomLevelInTime();
-				}
-			}
-			boolean drawZoomLevel = isShowZoomLevel() || !view.getSettings().SHOW_RULER.get();
-			if (drawZoomLevel) {
-				drawZoomLevel(canvas, tileBox, !showZoomLevelButton);
-			}
-		}
-	}
-
-	private void sendMessageToShowZoomLevel() {
-		Message msg = Message.obtain(showUIHandler, new Runnable() {
-			@Override
-			public void run() {
-				showZoomLevelButton = true;
-				sendMessageToShowZoomButton();
-				view.refreshMap();
-			}
-
-		});
-		msg.what = SHOW_ZOOM_LEVEL_MSG_ID;
-		showUIHandler.sendMessageDelayed(msg, SHOW_ZOOM_LEVEL_DELAY);
-	}
-
-	private void sendMessageToShowZoomButton() {
-		Message msg = Message.obtain(showUIHandler, new Runnable() {
-			@Override
-			public void run() {
-				showZoomLevelButton = false;
-				showZoomLevel = false;
-				view.refreshMap();
-			}
-
-		});
-		msg.what = SHOW_ZOOM_BUTTON_MSG_ID;
-		showUIHandler.sendMessageDelayed(msg, SHOW_ZOOM_LEVEL_BUTTON_DELAY);
-	}
-
-	private void hideZoomLevelInTime() {
-		if (!showUIHandler.hasMessages(SHOW_ZOOM_LEVEL_MSG_ID) && !showUIHandler.hasMessages(SHOW_ZOOM_BUTTON_MSG_ID)) {
-			sendMessageToShowZoomLevel();
-		}
-	}
-
-	@Override
-	public void updateTextColor(int textColor, int shadowColor) {
-		super.updateTextColor(textColor, shadowColor);
-		zoomTextPaint.setColor(textColor);
-	}
-
-	public boolean isShowZoomLevel() {
-		return showZoomLevel;
-	}
-
-	public int getHeight() {
-		if (height == 0) {
-			Drawable buttonDrawable = view.getResources().getDrawable(R.drawable.map_zoom_in);
-			height = buttonDrawable.getMinimumHeight();
-		}
-		return height;
-	}
-
-	
-	public static View.OnLongClickListener getOnClickMagnifierListener(final OsmandMapTileView view) {
-		final View.OnLongClickListener listener = new View.OnLongClickListener() {
-
-			@Override
-			public boolean onLongClick(View notUseCouldBeNull) {
-				final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
-				final AlertDialog.Builder bld = new AlertDialog.Builder(view.getContext());
-				int p = (int) (mapDensity.get() * 100);
-				final TIntArrayList tlist = new TIntArrayList(new int[] {33, 50, 75, 100, 150, 200, 300, 400 });
-				final List<String> values = new ArrayList<String>();
-				int i = -1;
-				for (int k = 0; k <= tlist.size(); k++) {
-					final boolean end = k == tlist.size();
-					if (i == -1) {
-						if ((end || p < tlist.get(k))) {
-							values.add(p + "%");
-							i = k;
-						} else if (p == tlist.get(k)) {
-							i = k;
-						}
-
-					}
-					if (k < tlist.size()) {
-						values.add(tlist.get(k) + "%");
-					}
-				}
-				if (values.size() != tlist.size()) {
-					tlist.insert(i, p);
-				}
-
-				bld.setTitle(R.string.map_magnifier);
-				bld.setSingleChoiceItems(values.toArray(new String[values.size()]), i,
-						new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								int p = tlist.get(which);
-								mapDensity.set(p / 100.0f);
-								view.setComplexZoom(view.getZoom(), view.getSettingsMapDensity());
-								MapRendererContext mapContext = NativeCoreContext.getMapRendererContext();
-								if(mapContext != null) {
-									mapContext.updateMapSettings();
-								}
-								dialog.dismiss();
-							}
-						});
-				bld.show();
-				return true;
-			}
-		};
-		return listener;
-	}
-
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
index d01f32d917..91ea3968b3 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
@@ -27,15 +27,13 @@ public class RulerControl extends MapControls {
 	double cacheRulerTileX = 0;
 	double cacheRulerTileY = 0;
 	float cacheRulerTextLen = 0;
-	MapZoomControls zoomControls;
 	Drawable rulerDrawable;
 	TextPaint rulerTextPaint;
 	final static double screenRulerPercent = 0.25;
 	boolean isNightRemembered = false;
 
-	public RulerControl(MapZoomControls zoomControls, MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
+	public RulerControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
 	super(mapActivity, showUIHandler, scaleCoefficient);
-		this.zoomControls = zoomControls;
 		rulerTextPaint = new TextPaint();
 		rulerTextPaint.setTextSize(20 * scaleCoefficient);
 		rulerTextPaint.setAntiAlias(true);
@@ -58,10 +56,10 @@ public class RulerControl extends MapControls {
 
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
-		if( (zoomControls.isVisible() && zoomControls.isShowZoomLevel()) || !mapActivity.getMyApplication().getSettings().SHOW_RULER.get()){
+		if (!mapActivity.getMyApplication().getSettings().SHOW_RULER.get()) {
 			return;
 		}
-		if(mapActivity.findViewById(R.id.MapButtons).getVisibility() == View.GONE) {
+		if (mapActivity.findViewById(R.id.MapButtons).getVisibility() == View.GONE) {
 			return;
 		}
 		OsmandMapTileView view = mapActivity.getMapView();
@@ -69,9 +67,10 @@ public class RulerControl extends MapControls {
 		// update cache
 		if (view.isZooming()) {
 			cacheRulerText = null;
-		} else if (((isNight != isNightRemembered) || (tb.getZoom() != cacheRulerZoom) ||
-				Math.abs(tb.getCenterTileX() - cacheRulerTileX) +  Math.abs(tb.getCenterTileY() - cacheRulerTileY) > 1) && 
-				 tb.getPixWidth() > 0){
+		} else if (((isNight != isNightRemembered) || (tb.getZoom() != cacheRulerZoom) || Math.abs(tb.getCenterTileX()
+				- cacheRulerTileX)
+				+ Math.abs(tb.getCenterTileY() - cacheRulerTileY) > 1)
+				&& tb.getPixWidth() > 0) {
 			cacheRulerZoom = (tb.getZoom());
 			cacheRulerTileX = tb.getCenterTileX();
 			cacheRulerTileY = tb.getCenterTileY();
@@ -80,9 +79,11 @@ public class RulerControl extends MapControls {
 			double roundedDist = OsmAndFormatter.calculateRoundedDist(dist * screenRulerPercent, view.getApplication());
 
 			int cacheRulerDistPix = (int) (pixDensity * roundedDist);
-			cacheRulerText = ShadowText.create(OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getApplication()));
+			cacheRulerText = ShadowText.create(OsmAndFormatter.getFormattedDistance((float) roundedDist,
+					view.getApplication()));
 			cacheRulerTextLen = rulerTextPaint.measureText(cacheRulerText.getText());
-			rulerDrawable = (isNight ? mapActivity.getResources().getDrawable(R.drawable.ruler_night) : mapActivity.getResources().getDrawable(R.drawable.ruler));
+			rulerDrawable = (isNight ? mapActivity.getResources().getDrawable(R.drawable.ruler_night) : mapActivity
+					.getResources().getDrawable(R.drawable.ruler));
 			Rect bounds = rulerDrawable.getBounds();
 			bounds.right = (int) (view.getWidth() - 7 * scaleCoefficient);
 			bounds.left = bounds.right - cacheRulerDistPix;
@@ -93,16 +94,17 @@ public class RulerControl extends MapControls {
 		if (cacheRulerText != null) {
 			Rect bounds = rulerDrawable.getBounds();
 			int bottom = (int) (view.getHeight() - vmargin);
-			if(bounds.bottom != bottom) {
+			if (bounds.bottom != bottom) {
 				bounds.bottom = bottom;
 				bounds.top = bounds.bottom - rulerDrawable.getMinimumHeight();
 				rulerDrawable.setBounds(bounds);
 				rulerDrawable.invalidateSelf();
 			}
 			rulerDrawable.draw(canvas);
-			int shadowColor = isNight == true ? mapActivity.getResources().getColor(R.color.widgettext_shadow_night) : Color.WHITE;
-			cacheRulerText.draw(canvas, bounds.left + (bounds.width() - cacheRulerTextLen) / 2, bounds.bottom - 8 * scaleCoefficient,
-					rulerTextPaint, shadowColor);
+			int shadowColor = isNight == true ? mapActivity.getResources().getColor(R.color.widgettext_shadow_night)
+					: Color.WHITE;
+			cacheRulerText.draw(canvas, bounds.left + (bounds.width() - cacheRulerTextLen) / 2, bounds.bottom - 8
+					* scaleCoefficient, rulerTextPaint, shadowColor);
 		}
 		isNightRemembered = isNight;
 	}

From 5f83cd3b2cbf0aecc3bd1468237ffe0c9a9d5999 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 02:01:43 +0100
Subject: [PATCH 09/23] Remove status bar

---
 OsmAnd/res/layout/map_hud_top.xml             |  54 +++--
 OsmAnd/res/layout/map_hud_widget.xml          |  25 +-
 OsmAnd/res/values/sizes.xml                   |   3 +
 .../net/londatiga/android/QuickAction.java    |   6 +-
 .../net/osmand/plus/views/MapInfoLayer.java   |  74 +-----
 .../views/controls/MapNavigateControl.java    | 229 ------------------
 .../mapwidgets/MapInfoWidgetsFactory.java     |  76 ------
 .../views/mapwidgets/MapWidgetRegistry.java   |  72 ------
 8 files changed, 69 insertions(+), 470 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 44b6e44c68..9c662778a4 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="match_parent"
     android:orientation="vertical" >
@@ -13,6 +14,15 @@
         android:background="@drawable/btn_flat"
         android:orientation="horizontal" >
 
+        <ImageView
+            android:id="@+id/waypoint_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/map_button_margin"
+            android:layout_marginRight="@dimen/map_button_margin"
+            android:src="@drawable/ic_action_remove_light" />
+
         <TextView
             android:id="@+id/map_address_text"
             android:layout_width="0dp"
@@ -21,9 +31,12 @@
             android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
+            android:shadowColor="@color/color_myloc_distance"
+            android:shadowRadius="10"
             android:text="TEST Street name"
             android:textColor="@color/color_black"
-            android:textSize="24sp" >
+            android:textSize="@dimen/map_widget_text_size"
+            android:textStyle="bold" >
         </TextView>
 
         <ImageButton
@@ -58,6 +71,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|left"
+                android:id="@+id/map_left_widgets_panel"
                 android:layout_weight="0.4"
                 android:orientation="vertical" >
 
@@ -65,10 +79,12 @@
                     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" />
                     <include layout="@layout/map_hud_widget" />
+                    -->
                 </LinearLayout>
 
                 <LinearLayout
@@ -95,6 +111,7 @@
                 </LinearLayout>
             </LinearLayout>
             <!-- empty block to not let widgets grow more than 40% -->
+
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -126,34 +143,29 @@
                 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" >
 
+                    <!-- 
                     <include layout="@layout/map_hud_widget" />
-
-
                     <include layout="@layout/map_hud_widget" />
-
                     <include layout="@layout/map_hud_widget" />
+ 					-->
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" >
 
-                    <include layout="@layout/map_hud_widget" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top|right"
-                    android:layout_marginRight="@dimen/map_button_margin"
-                    android:layout_marginTop="@dimen/map_button_margin"
-                    android:orientation="horizontal" >
-
-                    <ImageButton
-                        android:layout_width="@dimen/map_button_size"
-                        android:layout_height="@dimen/map_button_size"
-                        android:background="@drawable/btn_inset_circle"
-                        android:src="@drawable/ic_action_remove_light" />
+                        <ImageButton
+                            android:id="@+id/map_collapse_button"
+                            android:layout_width="@dimen/map_button_size"
+                            android:layout_height="@dimen/map_button_size"
+                            android:layout_gravity="center"
+                            android:background="@drawable/btn_inset_circle"
+                            android:src="@drawable/ic_action_remove_light" />
+                    </FrameLayout>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 143aeeff4b..b952769e0d 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -29,10 +29,31 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
             android:layout_weight="1"
+            android:minWidth="30dp"
+            android:maxLines="1"
+            android:shadowColor="@color/color_myloc_distance"
             android:textColor="@color/color_black"
-            android:text="202 km" />
+            android:shadowRadius="10"
+            android:textStyle="bold"
+            android:textSize="@dimen/map_widget_text_size"
+            android:text="1048" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
+            android:layout_marginRight="4dp"
+            android:maxLines="1"
+            android:shadowColor="@color/color_myloc_distance"
+            android:textColor="@color/color_black"
+            android:shadowRadius="10"
+            android:textStyle="bold"
+            android:textSize="@dimen/map_widget_text_size_small"
+            android:text="km" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 5629a6f3c8..dc3df34249 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -50,6 +50,9 @@
 	<!--  map buttons -->
 	
 	<dimen name="map_trans_seek_size">80dp</dimen>
+	<dimen name="map_widget_text_size">20sp</dimen>
+	<dimen name="map_widget_text_size_small">14sp</dimen>
+	<dimen name="map_widget_text_bottom_margin">2sp</dimen>
 	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_route_buttons_width">60dp</dimen>
 	<dimen name="map_route_buttons_height">54dp</dimen>
diff --git a/OsmAnd/src/net/londatiga/android/QuickAction.java b/OsmAnd/src/net/londatiga/android/QuickAction.java
index d95e2427fe..0bd93123b5 100644
--- a/OsmAnd/src/net/londatiga/android/QuickAction.java
+++ b/OsmAnd/src/net/londatiga/android/QuickAction.java
@@ -48,7 +48,7 @@ public class QuickAction extends CustomPopupWindow {
 	private boolean animateTrack;
 	private ViewGroup mTrack;
 	private ArrayList<ActionItem> actionList;
-	private boolean top;
+	private boolean onTop;
 	
 	/**
 	 * Constructor
@@ -88,7 +88,7 @@ public class QuickAction extends CustomPopupWindow {
 	}
 	
 	public void setOnAnchorOnTop(boolean top) {
-		this.top = top;
+		this.onTop = top;
 		
 	}
 
@@ -156,7 +156,7 @@ public class QuickAction extends CustomPopupWindow {
 		boolean onTop		= true;
 		
 		// display on bottom
-		if (rootHeight > anchor.getTop() || onTop) {
+		if (rootHeight > anchor.getTop() && !this.onTop) {
 			yPos 	= anchorRect.bottom;
 			onTop	= false;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 69090480bc..74253ad6a0 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -35,11 +35,9 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.MeasureSpec;
 import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 public class MapInfoLayer extends OsmandMapLayer {
 
@@ -55,8 +53,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private Paint paintSmallSubText;
 	private Paint paintImg;
 	
-	// layout pseudo-constants
-	private int STATUS_BAR_MARGIN_X = -4;
 	
 	private TopTextView topText;
 	private View progressBar;
@@ -64,7 +60,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	// groups
 	private StackWidgetView rightStack;
 	private StackWidgetView leftStack;
-	private LinearLayout statusBar;
 	private BaseMapWidget lanesControl;
 	private BaseMapWidget alarmControl;
 	private MapWidgetRegistry mapInfoControls;
@@ -147,8 +142,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 	
 	public void registerAllControls(){
-		statusBar = new LinearLayout(view.getContext());
-		statusBar.setOrientation(LinearLayout.HORIZONTAL);
 		RouteInfoWidgetsFactory ric = new RouteInfoWidgetsFactory(scaleCoefficient);
 		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory(scaleCoefficient);
 		OsmandApplication app = view.getApplication();
@@ -189,16 +182,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 		TextInfoWidget plainTime = ric.createPlainTimeControl(map, paintText, paintSubText);
 		mapInfoControls.registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
 
-		// Top widgets
-		ImageViewWidget compassView = mic.createCompassView(map);
-		mapInfoControls.registerTopWidget(compassView, R.drawable.widget_compass_dark, R.drawable.widget_compass_light, R.string.map_widget_compass, "compass", MapWidgetRegistry.LEFT_CONTROL, 5);
-		mapInfoControls.registerTopWidget(mic.createLockInfo(map), R.drawable.widget_lock_screen_dark, R.drawable.widget_lock_screen_light, R.string.bg_service_screen_lock, "bgService",
-				MapWidgetRegistry.LEFT_CONTROL,  15);
-		mapInfoControls.registerTopWidget(createBackToLocation(mic), R.drawable.widget_backtolocation_dark, R.drawable.widget_backtolocation_light, R.string.map_widget_back_to_loc, "back_to_location", MapWidgetRegistry.RIGHT_CONTROL, 5);
-		topText = mic.createStreetView(app, map, paintText);
-		mapInfoControls.registerTopWidget(topText, R.drawable.street_name_dark, R.drawable.street_name_light, R.string.map_widget_top_text,
-				"street_name", MapWidgetRegistry.MAIN_CONTROL, 100);
-		
 		// Register appearance widgets
 		AppearanceWidgetsFactory.INSTANCE.registerAppearanceWidgets(map, this, mapInfoControls);
 	}
@@ -214,20 +197,15 @@ public class MapInfoLayer extends OsmandMapLayer {
 		leftStack.requestLayout();
 		rightStack.requestLayout();
 		
-		statusBar.removeAllViews();
-		mapInfoControls.populateStatusBar(statusBar);
 		updateColorShadowsOfText(null);
 	}
 
 	public void createControls() {
 		FrameLayout parent = (FrameLayout) ((FrameLayout) view.getParent()).findViewById(R.id.MapInfoControls);
-		// 1. Create view groups and controls
-		statusBar.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_top));
 		
 		// form measurement
 		ImageView iv = new ImageView(map);
 		iv.setImageDrawable(map.getResources().getDrawable(R.drawable.la_backtoloc_disabled));
-		statusBar.addView(iv);
 		rightStack = new StackWidgetView(view.getContext());
 		leftStack = new StackWidgetView(view.getContext());
 		
@@ -235,20 +213,15 @@ public class MapInfoLayer extends OsmandMapLayer {
 		Rect topRectPadding = new Rect();
 		view.getResources().getDrawable(R.drawable.box_top).getPadding(topRectPadding);
 		// for measurement
-		STATUS_BAR_MARGIN_X = (int) (STATUS_BAR_MARGIN_X * scaleCoefficient);
-		statusBar.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-		Rect statusBarPadding = new Rect();
-		statusBar.getBackground().getPadding(statusBarPadding);
 		// 3. put into frame parent layout controls
 
 		// status bar hides own top part 
-		int topMargin = statusBar.getMeasuredHeight()  - statusBarPadding.top - statusBarPadding.bottom ;
 		// we want that status bar lays over map stack controls
-		topMargin -= topRectPadding.top;
+		int topMargin = -topRectPadding.top;
 
 		FrameLayout.LayoutParams flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.RIGHT);
-		flp.rightMargin = STATUS_BAR_MARGIN_X;
+		flp.rightMargin = 0;
 		flp.topMargin = topMargin;
 		rightStack.setLayoutParams(flp);
 		
@@ -261,16 +234,15 @@ public class MapInfoLayer extends OsmandMapLayer {
 		
 		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.LEFT);
-		flp.leftMargin = STATUS_BAR_MARGIN_X;
+		flp.leftMargin = 0;
 		flp.topMargin = topMargin;
 		leftStack.setLayoutParams(flp);
 
 		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP);
-		flp.leftMargin = STATUS_BAR_MARGIN_X;
-		flp.rightMargin = STATUS_BAR_MARGIN_X;
+		flp.leftMargin = 0;
+		flp.rightMargin = 0;
 		flp.topMargin = -topRectPadding.top;
-		statusBar.setLayoutParams(flp);
 		
 		flp = new FrameLayout.LayoutParams((int)(78 * scaleCoefficient),
 				(int)(78 * scaleCoefficient), Gravity.LEFT | Gravity.BOTTOM);
@@ -280,7 +252,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 		parent.addView(rightStack);
 		parent.addView(leftStack);
-		parent.addView(statusBar);
 		parent.addView(lanesControl);
 		parent.addView(alarmControl);
 		alarmControl.setVisibility(View.GONE);
@@ -323,8 +294,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 					}
 				}).reg();
 		final ApplicationMode mode = settings.getApplicationMode();
-		cm.item(R.string.map_widget_top).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
-		addControls(cm, mapInfoControls.getTop(), mode);
 		cm.item(R.string.map_widget_right).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
 		addControls(cm, mapInfoControls.getRight(), mode);
 		cm.item(R.string.map_widget_left).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
@@ -434,7 +403,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 			leftStack.setExpandImageDrawable(view.getResources().getDrawable(expand));
 			rightStack.setExpandImageDrawable(view.getResources().getDrawable(expand));
-			statusBar.setBackgroundDrawable(view.getResources().getDrawable(boxTop));
 
 			paintText.setColor(textColor);
 			paintSubText.setColor(textColor);
@@ -452,7 +420,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 			
 			rightStack.invalidate();
 			leftStack.invalidate();
-			statusBar.invalidate();
 		}
 	}
 	
@@ -465,12 +432,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		leftStack.updateInfo(drawSettings);
 		lanesControl.updateInfo(drawSettings);
 		alarmControl.updateInfo(drawSettings);
-		for (int i = 0; i < statusBar.getChildCount(); i++) {
-			View v = statusBar.getChildAt(i);
-			if (v instanceof UpdateableWidget) {
-				((UpdateableWidget) v).updateInfo(drawSettings);
-			}
-		}
+		
 	}
 	
 	public StackWidgetView getRightStack() {
@@ -539,27 +501,5 @@ public class MapInfoLayer extends OsmandMapLayer {
 		return defValue;
 	}
 
-	private UpdateFrameLayout createBackToLocation(MapInfoWidgetsFactory mic){
-		progressBar = new View(view.getContext());
-		progressBar.setPadding((int) (5 * scaleCoefficient), 0, (int) (5 * scaleCoefficient), 0);
-		final ImageViewWidget widget = mic.createBackToLocation(map);
-		Drawable backToLoc = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled);
-		UpdateFrameLayout layout = new UpdateFrameLayout(view.getContext(), widget) ;
-		FrameLayout.LayoutParams fparams;
-		fparams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT);
-		layout.addView(widget, fparams);
-		fparams = new FrameLayout.LayoutParams((int) (backToLoc.getMinimumWidth() ),
-				backToLoc.getMinimumHeight());
-		//this fix needed for android 2.3 because margin doesn't work without gravity
-		fparams.gravity = Gravity.TOP;
-		fparams.setMargins((int) (5 * scaleCoefficient), 0, 0, 0);
-		layout.addView(progressBar, fparams);
-		layout.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				widget.performClick();
-			}
-		});
-		return layout;
-	}
+	
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java
deleted file mode 100644
index a8feff4f91..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapNavigateControl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import gnu.trove.list.array.TIntArrayList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.ShadowText;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.text.TextPaint;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-public class MapNavigateControl extends MapControls {
-	private Button navigateButton;
-	private MapRouteInfoControl ri;
-	private Runnable delayStart;
-	private Drawable navigateShadow;
-	private Bitmap mapMagnifier;
-	private TextPaint counterTextPaint;
-	private Paint bitmapPaint;
-	private static long startCounter = 0; 
-	
-	
-	public MapNavigateControl(MapRouteInfoControl ri,  MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		super(mapActivity, showUIHandler, scaleCoefficient);
-		this.ri = ri;
-		counterTextPaint = new TextPaint();
-		counterTextPaint.setTextSize(18 * scaleCoefficient);
-		counterTextPaint.setAntiAlias(true);
-		counterTextPaint.setFakeBoldText(true);
-	}
-	
-	
-	public void startCounter() {
-		OsmandSettings settings = mapActivity.getMyApplication().getSettings();
-		if(settings.DELAY_TO_START_NAVIGATION.get() <= 0) {
-			return;
-		}
-		if (startCounter <= 0) {
-			startCounter = System.currentTimeMillis() + settings.DELAY_TO_START_NAVIGATION.get() * 1000;
-			delayStart = new Runnable() {
-				@Override
-				public void run() {
-					if (startCounter > 0) {
-						if (System.currentTimeMillis() > startCounter) {
-							startCounter = 0;
-							startNavigation();
-						} else {
-							mapActivity.refreshMap();
-							showUIHandler.postDelayed(delayStart, 1000);
-						}
-					}
-				}
-			};
-			delayStart.run();
-		}
-		
-	}
-	
-	public void startNavigation() {
-		stopCounter();
-		OsmandApplication app = mapActivity.getMyApplication();
-		RoutingHelper routingHelper = app.getRoutingHelper();
-		if(routingHelper.isFollowingMode()) {
-			routingHelper.setRoutePlanningMode(false);
-			mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
-		} else {
-			if(!app.getTargetPointsHelper().checkPointToNavigateShort()) {
-				ri.showDialog();
-			} else {
-				mapActivity.getMapViewTrackingUtilities().backToLocationImpl();
-				app.getSettings().FOLLOW_THE_ROUTE.set(true);
-				routingHelper.setFollowingMode(true);
-				routingHelper.setRoutePlanningMode(false);
-				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
-				routingHelper.setCurrentLocation(app.getLocationProvider().getLastKnownLocation(), false);
-				app.getRoutingHelper().notifyIfRouteIsCalculated();
-			}
-		}
-	}
-
-	@Override
-	public void showControls(final FrameLayout parent) {
-		navigateButton = addButton(parent, R.string.get_directions, R.drawable.map_btn_navigate);
-		navigateButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				notifyClicked();
-				startNavigation();
-			}
-		});
-		if(!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isPauseNavigation()) {
-			startCounter();
-		}
-	}
-
-	@Override
-	protected void initControls(FrameLayout layout) {
-		super.initControls(layout);
-		navigateShadow = mapActivity.getResources().getDrawable(R.drawable.zoom_background).mutate();
-		mapMagnifier = BitmapFactory.decodeResource(mapActivity.getResources(), R.drawable.map_magnifier);
-		bitmapPaint = new Paint();
-	}
-	@Override
-	public void hideControls(FrameLayout layout) {
-		removeButton(layout, navigateButton);
-		stopCounter();
-	}
-
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
-		if(!mapActivity.getRoutingHelper().isFollowingMode()) {
-			drawCount(canvas, tileBox);
-		}
-	}
-	
-
-	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
-		stopCounter();
-		return false;
-	}
-	
-	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		stopCounter();
-		if (navigateShadow.getBounds().contains((int) point.x, (int) point.y)) {
-			openDialog();
-			return true;
-		}
-		return false;
-	}
-	
-	private void openDialog() {
-		Builder bld = new AlertDialog.Builder(mapActivity);
-		final TIntArrayList opt = new TIntArrayList();
-		List<String> items = new ArrayList<String>(); 
-		int[] checkedItem = new int[]{ -1};
-		Integer selected = mapActivity.getMyApplication().getSettings().DELAY_TO_START_NAVIGATION.get();
-		addOpt(-1, items, opt, checkedItem, selected);
-		addOpt(3, items, opt, checkedItem, selected);
-		addOpt(5, items, opt, checkedItem, selected);
-		addOpt(7, items, opt, checkedItem, selected);
-		addOpt(10, items, opt, checkedItem, selected);
-		addOpt(15, items, opt, checkedItem, selected);
-		addOpt(20, items, opt, checkedItem, selected);
-		bld.setTitle(R.string.delay_navigation_start);
-		bld.setSingleChoiceItems(items.toArray(new String[items.size()]), checkedItem[0], new DialogInterface.OnClickListener() {
-			
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				notifyClicked();
-				dialog.dismiss();
-				mapActivity.getMyApplication().getSettings().DELAY_TO_START_NAVIGATION.set(opt.get(which));
-				startCounter();
-			}
-		});
-		bld.show();
-	}
-
-
-	private void addOpt(int i, List<String> items, TIntArrayList opt, int[] checkedItem, int selected) {
-		if(i == selected) {
-			checkedItem[0] = items.size();
-		}
-		opt.add(i);
-		if(i < 0) {
-			items.add(mapActivity.getString(R.string.auto_follow_route_never));
-		} else {
-			items.add(i + " " +mapActivity.getString(R.string.int_seconds));
-		}
-	}
-
-
-	private void drawCount(Canvas canvas, RotatedTileBox tb) {
-		if ((navigateShadow.getBounds().width() == 0 && navigateButton.getWidth() > 0 )||
-				navigateShadow.getBounds().bottom != navigateButton.getBottom()) {
-			navigateShadow.setBounds(navigateButton.getLeft() - 2, navigateButton.getTop()
-					- (int) (18 * scaleCoefficient), navigateButton.getRight(), navigateButton.getBottom());
-		}
-		if(navigateShadow.getBounds().width() > 0) {
-			navigateShadow.draw(canvas);
-		}
-		if (startCounter > 0) {
-			int get = (int) ((startCounter -System.currentTimeMillis())  / 1000l);
-			final String text = get + "";
-			float length = counterTextPaint.measureText(text);
-			ShadowText.draw(text, canvas, navigateButton.getLeft() + (navigateButton.getWidth() - length - 2) / 2,
-					navigateButton.getTop() + 4 * scaleCoefficient, counterTextPaint, shadowColor);
-		} else {
-			int size = (int) (16 * scaleCoefficient);
-			int top = (int) (navigateButton.getTop() - size - 4 * scaleCoefficient);
-			int left = (int) (navigateButton.getLeft() + (navigateButton.getWidth() - mapMagnifier.getWidth() - 2 * scaleCoefficient) / 2);
-			// canvas density /2 ? size * 2
-			canvas.drawBitmap(mapMagnifier, null, new Rect(left, top, left + size * 2, top + size * 2), bitmapPaint);
-		}
-	}
-	
-	public int getWidth() {
-		if (width == 0) {
-			Drawable buttonDrawable = mapActivity.getResources().getDrawable(R.drawable.map_btn_navigate);
-			width = buttonDrawable.getMinimumWidth();
-		}
-		return width ;
-	}
-
-
-	public void stopCounter() {
-		startCounter = 0;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 603333e7b4..499b27e25c 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -312,82 +312,6 @@ public class MapInfoWidgetsFactory {
 	}
 	
 	
-	public ImageViewWidget createCompassView(final MapActivity map){
-		final OsmandMapTileView view = map.getMapView();
-		final OsmandApplication app = map.getMyApplication();
-		final Drawable compassNiu = map.getResources().getDrawable(R.drawable.map_compass_niu);
-		final Drawable compassNiuWhite = map.getResources().getDrawable(R.drawable.map_compass_niu_white);
-		final Drawable compassBearing = map.getResources().getDrawable(R.drawable.map_compass_bearing);
-		final Drawable compassBearingWhite = map.getResources().getDrawable(R.drawable.map_compass_bearing_white);
-		final Drawable compass = map.getResources().getDrawable(R.drawable.map_compass);
-		final Drawable compassWhite = map.getResources().getDrawable(R.drawable.map_compass_white);
-		final int mw = (int) compass.getMinimumWidth() ;
-		final int mh = (int) compass.getMinimumHeight() ;
-		ImageViewWidget compassView = new ImageViewWidget(map) {
-			private float cachedRotate = 0;
-			private int cachedRotateMap = 0;
-			private boolean nm;
-			@Override
-			protected void onDraw(Canvas canvas) {
-				canvas.save();
-				canvas.rotate(view.getRotate(), mw / 2, mh / 2);
-				getDrawable().draw(canvas);
-				canvas.restore();
-			}
-		
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean nightMode = drawSettings != null && drawSettings.isNightMode();
-				if(nightMode != this.nm) {
-					this.nm = nightMode;
-					if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
-						setImageDrawable(nightMode ? compassNiuWhite : compassNiu);
-					} else if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
-						setImageDrawable(nightMode ? compassBearingWhite : compassBearing);
-					} else {
-						setImageDrawable(nightMode ? compassWhite : compass);
-					}
-					return true;
-				}
-				if(view.getRotate() != cachedRotate) {
-					cachedRotate = view.getRotate();
-					invalidate();
-					return true;
-				}
-				if(app.getSettings().ROTATE_MAP.get() != cachedRotateMap) {
-					cachedRotateMap = app.getSettings().ROTATE_MAP.get();
-					if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
-						setImageDrawable(drawSettings.isNightMode() ? compassNiuWhite : compassNiu);
-					} else if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
-						setImageDrawable(drawSettings.isNightMode() ? compassBearingWhite : compassBearing);
-					} else {
-						setImageDrawable(drawSettings.isNightMode() ? compassWhite : compass);
-					}
-					return true;
-				}
-				return false;
-			}
-		};
-		compassView.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				map.getMapViewTrackingUtilities().switchRotateMapMode();
-			}
-		});
-		if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
-			compassView.setImageDrawable(compassNiu);
-		} else if (app.getSettings().ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
-			compassView.setImageDrawable(compassBearing);
-		} else {
-			compassView.setImageDrawable(compass);
-		}
-		return compassView;
-	}
-	
-	public TopTextView createStreetView(OsmandApplication app, MapActivity map, Paint paintText){
-		return new TopTextView(app, map, paintText);
-	}
-	
 	public class TopTextView extends TextView implements UpdateableWidget {
 		private final RoutingHelper routingHelper;
 		private final MapActivity map;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 0c07f99ae6..195ecc0d76 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -28,25 +28,6 @@ public class MapWidgetRegistry {
 	private Set<MapWidgetRegInfo> appearanceWidgets = new LinkedHashSet<MapWidgetRegistry.MapWidgetRegInfo>();
 	private Set<MapWidgetRegInfo> left = new TreeSet<MapWidgetRegistry.MapWidgetRegInfo>();
 	private Set<MapWidgetRegInfo> right = new TreeSet<MapWidgetRegistry.MapWidgetRegInfo>();
-	private Set<MapWidgetRegInfo> top = new TreeSet<MapWidgetRegistry.MapWidgetRegInfo>(new Comparator<MapWidgetRegInfo>() {
-		@Override
-		public int compare(MapWidgetRegInfo object1, MapWidgetRegInfo object2) {
-			if (object1.position != object2.position) {
-				if(object1.position == LEFT_CONTROL) {
-					return -1;
-				} else if(object1.position == RIGHT_CONTROL) {
-					return 1;
-				} else {
-					return object2.position == LEFT_CONTROL ? 1 : -1;
-				}
-			}
-			int cmp = object1.priorityOrder - object2.priorityOrder;
-			if(object1.position == RIGHT_CONTROL) {
-				cmp = -cmp;
-			}
-			return cmp;
-		}
-	});
 	private Map<ApplicationMode, Set<String>> visibleElementsFromSettings = new LinkedHashMap<ApplicationMode, Set<String>>();
 	private final OsmandSettings settings;
 			
@@ -82,39 +63,6 @@ public class MapWidgetRegistry {
 	}
 	
 	
-	public MapWidgetRegInfo registerTopWidget(View m, int drawableDark, int drawableLight, int messageId, String key,
-			int left, int priorityOrder) {
-		MapWidgetRegInfo ii = new MapWidgetRegInfo();
-		ii.key = key;
-		ii.visibleModes = new LinkedHashSet<ApplicationMode>();
-		ii.visibleCollapsible = null;
-		for (ApplicationMode ms : ApplicationMode.values(settings)) {
-			boolean def = ms.isWidgetVisible(key);
-			Set<String> set = visibleElementsFromSettings.get(ms);
-			if (set != null) {
-				if (set.contains(key)) {
-					def = true;
-				} else if (set.contains("-" + key)) {
-					def = false;
-				}
-			}
-			if (def) {
-				ii.visibleModes.add(ms);
-			}
-		}
-		if (m != null)
-			m.setContentDescription(m.getContext().getString(messageId));
-		ii.drawableDark = drawableDark;
-		ii.drawableLight = drawableLight;
-		ii.messageId = messageId;
-		ii.m = m;
-		ii.priorityOrder = priorityOrder;
-		ii.position = left;
-		this.top.add(ii);
-		return ii;
-	}
-	
-	
 	
 	public void registerSideWidget(BaseMapWidget m, int drawableDark,int drawableLight, int messageId, String key, boolean left, int priorityOrder) {
 		MapWidgetRegInfo ii = new MapWidgetRegInfo();
@@ -182,7 +130,6 @@ public class MapWidgetRegistry {
 				LinkedHashSet<String> set = new LinkedHashSet<String>();
 				restoreModes(set, left, mode);
 				restoreModes(set, right, mode);
-				restoreModes(set, top, mode);
 				this.visibleElementsFromSettings.put(mode, set);
 			}
 			// clear everything
@@ -223,10 +170,6 @@ public class MapWidgetRegistry {
 		return right;
 	}
 	
-	public Set<MapWidgetRegInfo> getTop() {
-		return top;
-	}
-	
 	public Set<MapWidgetRegInfo> getAppearanceWidgets() {
 		return appearanceWidgets;
 	}
@@ -243,20 +186,6 @@ public class MapWidgetRegistry {
 		}
 	}
 	
-	public void populateStatusBar(ViewGroup statusBar){
-		ApplicationMode appMode = settings.getApplicationMode();
-		for (MapWidgetRegInfo r : top) {
-			boolean main = r.position == MAIN_CONTROL;
-			if (r.visibleModes.contains(appMode)) {
-				LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, main? 1 : 0);
-				statusBar.addView((View) r.m, params);
-			} else if (main) {
-				LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 1);
-				statusBar.addView(new TextView(((View) r.m).getContext()), params);
-			}
-		}
-	}
-	
 	private void resetDefault(ApplicationMode mode, Set<MapWidgetRegInfo> set ){
 		for(MapWidgetRegInfo ri : set) {
 			if(ri.preference != null) {
@@ -281,7 +210,6 @@ public class MapWidgetRegistry {
 		ApplicationMode appMode = settings.getApplicationMode();
 		resetDefault(appMode, left);
 		resetDefault(appMode, right);
-		resetDefault(appMode, top);
 		resetDefault(appMode, appearanceWidgets);
 		this.visibleElementsFromSettings.put(appMode, null);
 		settings.MAP_INFO_CONTROLS.set("");

From 7ed68a48c8896a5efb61c31987d2cc4fa9f1ba41 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 20:10:22 +0100
Subject: [PATCH 10/23] Update maps

---
 OsmAnd/res/layout/map_hud_top.xml             |  33 ++-
 OsmAnd/res/layout/map_hud_widget.xml          |  10 +-
 .../osmand/plus/activities/MapActivity.java   | 105 ++++----
 .../plus/osmedit/EditingPOIActivity.java      | 101 ++++----
 .../plus/osmedit/OpenstreetmapRemoteUtil.java | 147 ++++++------
 .../osmand/plus/views/MapControlsLayer.java   |  37 +--
 .../net/osmand/plus/views/MapInfoLayer.java   |  85 ++-----
 .../osmand/plus/views/OsmandMapTileView.java  |   8 -
 .../plus/views/controls/MapControls.java      | 224 ------------------
 .../plus/views/controls/RulerControl.java     |  23 +-
 .../mapwidgets/AppearanceWidgetsFactory.java  | 107 ++++-----
 .../mapwidgets/MapInfoWidgetsFactory.java     |  64 +----
 .../views/mapwidgets/MapWidgetRegistry.java   |  15 +-
 .../mapwidgets/RouteInfoWidgetsFactory.java   |  44 ++--
 .../plus/views/mapwidgets/TextInfoWidget.java | 162 ++++++-------
 15 files changed, 415 insertions(+), 750 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/MapControls.java

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 9c662778a4..fd1b10fd52 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -8,7 +8,6 @@
     <!-- TOP ROW -->
 
     <LinearLayout
-        android:id="@+id/WaypointVisit2"
         android:layout_width="fill_parent"
         android:layout_height="@dimen/map_address_height"
         android:background="@drawable/btn_flat"
@@ -33,10 +32,11 @@
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
             android:shadowRadius="10"
-            android:text="TEST Street name"
+            android:text="Long Street Name"
             android:textColor="@color/color_black"
             android:textSize="@dimen/map_widget_text_size"
-            android:textStyle="bold" >
+            android:textStyle="bold"
+            android:visibility="gone" >
         </TextView>
 
         <ImageButton
@@ -68,10 +68,10 @@
             android:weightSum="1" >
 
             <LinearLayout
+                android:id="@+id/map_left_widgets_panel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|left"
-                android:id="@+id/map_left_widgets_panel"
                 android:layout_weight="0.4"
                 android:orientation="vertical" >
 
@@ -118,7 +118,25 @@
                 android:layout_weight="0.6" >
             </LinearLayout>
         </LinearLayout>
-        <!-- CENTER TODO -->
+        <!-- CENTER -->
+
+        <LinearLayout
+            android:id="@+id/map_center_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|center"
+            android:background="@drawable/btn_round"
+            android:orientation="vertical" 
+            >
+
+            <ProgressBar
+                android:id="@+id/map_horizontal_progress"
+                android:layout_width="100dp"
+                android:layout_height="wrap_content" 
+                android:max="100"
+                android:progress="60"
+                android:visibility="gone"/>
+        </LinearLayout>
         <!-- RIGHT widgets colon -->
 
         <LinearLayout
@@ -149,11 +167,12 @@
                     android:layout_gravity="top|right"
                     android:orientation="vertical" >
 
-                    <!-- 
+                    <!--
                     <include layout="@layout/map_hud_widget" />
                     <include layout="@layout/map_hud_widget" />
                     <include layout="@layout/map_hud_widget" />
- 					-->
+                    -->
+
                     <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" >
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index b952769e0d..25698ef3c0 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -4,10 +4,10 @@
     android:minWidth="100dp"
     android:layout_height="wrap_content"
     android:background="@drawable/btn_left_round"
-    android:orientation="vertical"
-   >
+    android:orientation="vertical">
 
     <ImageButton
+        android:id="@+id/widget_top_icon"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/map_widget_image"
         android:layout_gravity="center"
@@ -22,13 +22,16 @@
         <ImageView
             android:layout_width="@dimen/map_widget_icon"
             android:layout_height="@dimen/map_widget_icon"
+            android:id="@+id/widget_icon"
             android:gravity="center"
             android:layout_gravity="left|center_vertical"
-            android:src="@drawable/ic_action_remove_light" />
+            android:src="@drawable/ic_action_remove_light" 
+            android:visibility="invisible"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:id="@+id/widget_text"
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
             android:layout_weight="1"
@@ -43,6 +46,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:id="@+id/widget_text_small"
             android:layout_marginLeft="4dp"
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 22317d1e74..24fc1c2e80 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -58,7 +58,6 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.net.Uri;
@@ -67,16 +66,12 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
 import android.view.ViewStub;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -110,7 +105,6 @@ public class MapActivity extends AccessibleActivity {
 
 	private List<DialogProvider> dialogProviders = new ArrayList<DialogProvider>(2);
 	private StateChangedListener<ApplicationMode> applicationModeListener;
-	private FrameLayout lockView;
 	private GpxImportHelper gpxImportHelper;
 	private WakeLockHelper wakeLockHelper;
 	private boolean intentLocation = false;
@@ -147,43 +141,7 @@ public class MapActivity extends AccessibleActivity {
 		}
 
 		dashboardOnMap.createDashboardView();
-		if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
-			dashboardOnMap.setDashboardVisibility(true);
-		}
-		if (app.isApplicationInitializing()) {
-			findViewById(R.id.init_progress).setVisibility(View.VISIBLE);
-			initListener = new AppInitializeListener() {
-				boolean openGlSetup = false;
-				@Override
-				public void onProgress(AppInitializer init, InitEvents event) {
-					String tn = init.getCurrentInitTaskName();
-					if (tn != null) {
-						((TextView) findViewById(R.id.ProgressMessage)).setText(tn);
-					}
-//					if(event == InitEvents.NATIVE_INITIALIZED) {
-//						setupOpenGLView();
-//						openGlSetup = true;
-//					}
-					if(event == InitEvents.MAPS_INITIALIZED) {
-						mapView.refreshMap(true);
-					}
-				}
-
-				@Override
-				public void onFinish(AppInitializer init) {
-					if(!openGlSetup) {
-						setupOpenGLView();
-					}
-					mapView.refreshMap(true);
-					findViewById(R.id.init_progress).setVisibility(View.GONE);
-					findViewById(R.id.drawer_layout).invalidate();
-				}
-			};
-			getMyApplication().checkApplicationIsBeingInitialized(this, initListener);
-		} else {
-			setupOpenGLView();
-		}
-		
+		checkAppInitialization();
 		parseLaunchIntentLocation();
 
 		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
@@ -231,19 +189,53 @@ public class MapActivity extends AccessibleActivity {
 		}
 		addDialogProvider(mapActions);
 		OsmandPlugin.onMapActivityCreate(this);
-		if (lockView != null) {
-			((FrameLayout) mapView.getParent()).addView(lockView);
-		}
 		gpxImportHelper = new GpxImportHelper(this, getMyApplication(), getMapView());
-
 		mapActions.prepareStartOptionsMenu();
-
 		wakeLockHelper = new WakeLockHelper(getMyApplication());
 		if(System.currentTimeMillis() - tm > 50) {
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
 	}
 
+	private void checkAppInitialization() {
+		if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
+			dashboardOnMap.setDashboardVisibility(true);
+		}
+		if (app.isApplicationInitializing()) {
+			findViewById(R.id.init_progress).setVisibility(View.VISIBLE);
+			initListener = new AppInitializeListener() {
+				boolean openGlSetup = false;
+				@Override
+				public void onProgress(AppInitializer init, InitEvents event) {
+					String tn = init.getCurrentInitTaskName();
+					if (tn != null) {
+						((TextView) findViewById(R.id.ProgressMessage)).setText(tn);
+					}
+					if(event == InitEvents.NATIVE_INITIALIZED) {
+						setupOpenGLView();
+						openGlSetup = true;
+					}
+					if(event == InitEvents.MAPS_INITIALIZED) {
+						mapView.refreshMap(true);
+					}
+				}
+
+				@Override
+				public void onFinish(AppInitializer init) {
+					if(!openGlSetup) {
+						setupOpenGLView();
+					}
+					mapView.refreshMap(true);
+					findViewById(R.id.init_progress).setVisibility(View.GONE);
+					findViewById(R.id.drawer_layout).invalidate();
+				}
+			};
+			getMyApplication().checkApplicationIsBeingInitialized(this, initListener);
+		} else {
+			setupOpenGLView();
+		}
+	}
+
 	
 	private void setupOpenGLView() {
 		if (settings.USE_OPENGL_RENDER.get() && NativeCoreContext.isInit()) {
@@ -262,23 +254,8 @@ public class MapActivity extends AccessibleActivity {
 		}
 	}
 
-	public void addLockView(FrameLayout lockView) {
-		this.lockView = lockView;
-	}
-
 	private void createProgressBarForRouting() {
-		FrameLayout parent = (FrameLayout) mapView.getParent();
-		FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
-				LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
-		DisplayMetrics dm = getResources().getDisplayMetrics();
-		params.topMargin = (int) (60 * dm.density);
-		final ProgressBar pb = new ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal);
-		pb.setIndeterminate(false);
-		pb.setMax(100);
-		pb.setLayoutParams(params);
-		pb.setVisibility(View.GONE);
-
-		parent.addView(pb);
+		final ProgressBar pb = (ProgressBar) findViewById(R.id.map_horizontal_progress);
 		app.getRoutingHelper().setProgressBar(new RouteCalculationProgressCallback() {
 
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index d01c08e419..511bae8757 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -29,6 +29,7 @@ import net.osmand.util.OpeningHoursParser;
 import net.osmand.util.OpeningHoursParser.BasicOpeningHourRule;
 import net.osmand.util.OpeningHoursParser.OpeningHours;
 import net.osmand.util.OpeningHoursParser.OpeningHoursRule;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.app.Dialog;
@@ -58,7 +59,7 @@ import android.widget.Toast;
 
 public class EditingPOIActivity implements DialogProvider {
 	
-	private final MapActivity ctx;
+	private final Activity activity;
 	private final OpenstreetmapUtil openstreetmapUtil;
 	private final OpenstreetmapUtil openstreetmapUtilToLoad;
 	private AutoCompleteTextView typeText;
@@ -94,20 +95,20 @@ public class EditingPOIActivity implements DialogProvider {
 	
 
 	public EditingPOIActivity(MapActivity uiContext){
-		this.ctx = uiContext;
+		this.activity = uiContext;
 
 		poiTypes = uiContext.getMyApplication().getPoiTypes();
 		allTranslatedSubTypes = poiTypes.getAllTranslatedNames();
 		settings = ((OsmandApplication) uiContext.getApplication()).getSettings();
 		if (settings.OFFLINE_EDITION.get() || !settings.isInternetConnectionAvailable(true)) {
-			this.openstreetmapUtil = new OpenstreetmapLocalUtil(ctx);
+			this.openstreetmapUtil = new OpenstreetmapLocalUtil(activity);
 			if (settings.isInternetConnectionAvailable(true)) {
-				this.openstreetmapUtilToLoad = new OpenstreetmapRemoteUtil(ctx, ctx.getMapView().getView());
+				this.openstreetmapUtilToLoad = new OpenstreetmapRemoteUtil(activity);
 			} else {
 				this.openstreetmapUtilToLoad = openstreetmapUtil;
 			}
 		} else {
-			this.openstreetmapUtil = new OpenstreetmapRemoteUtil(ctx, ctx.getMapView().getView());
+			this.openstreetmapUtil = new OpenstreetmapRemoteUtil(activity);
 			this.openstreetmapUtilToLoad= openstreetmapUtil;
 		}
 	}
@@ -124,7 +125,7 @@ public class EditingPOIActivity implements DialogProvider {
 				if(n != null){
 					showPOIDialog(DIALOG_EDIT_POI, n, editA.getType(), editA.getSubType());
 				} else {
-					AccessibleToast.makeText(ctx, ctx.getString(R.string.poi_error_poi_not_found), Toast.LENGTH_SHORT).show();
+					AccessibleToast.makeText(activity, activity.getString(R.string.poi_error_poi_not_found), Toast.LENGTH_SHORT).show();
 				}
 			};
 			
@@ -141,7 +142,7 @@ public class EditingPOIActivity implements DialogProvider {
 		Amenity a = EntityParser.parseAmenity(n, type, subType, null, MapRenderingTypes.getDefault());
 		dialogBundle.putSerializable(KEY_AMENITY, a);
 		dialogBundle.putSerializable(KEY_AMENITY_NODE, n);
-		ctx.showDialog(dialogID);
+		activity.showDialog(dialogID);
 	}
 	
 	public void showDeleteDialog(final Amenity a){
@@ -152,32 +153,32 @@ public class EditingPOIActivity implements DialogProvider {
 			
 			protected void onPostExecute(Node n) {
 				if(n == null){
-					AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.poi_error_poi_not_found), Toast.LENGTH_LONG).show();
+					AccessibleToast.makeText(activity, activity.getResources().getString(R.string.poi_error_poi_not_found), Toast.LENGTH_LONG).show();
 					return;
 				}
 				dialogBundle.putSerializable(KEY_AMENITY, a);
 				dialogBundle.putSerializable(KEY_AMENITY_NODE, n);
-				ctx.showDialog(DIALOG_DELETE_POI); //TODO from android 2.0 use showDialog(id,bundle)
+				activity.showDialog(DIALOG_DELETE_POI); //TODO from android 2.0 use showDialog(id,bundle)
 			};
 		}.execute(new Void[0]);
 	}
 	
 	private void prepareDeleteDialog(Dialog dlg, Bundle args) {
 		Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
-		dlg.setTitle(MessageFormat.format(this.ctx.getMapView().getResources().getString(R.string.poi_remove_confirm_template), 
+		dlg.setTitle(MessageFormat.format(this.activity.getResources().getString(R.string.poi_remove_confirm_template), 
 				OsmAndFormatter.getPoiStringWithoutType(a, settings.usingEnglishNames())));
 	}
 	
 	private Dialog createDeleteDialog(final Bundle args) {
-		Builder builder = new AlertDialog.Builder(ctx);
+		Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.poi_remove_title);
-		LinearLayout ll = new LinearLayout(ctx);
+		LinearLayout ll = new LinearLayout(activity);
 		ll.setPadding(4, 2, 4, 0);
 		ll.setOrientation(LinearLayout.VERTICAL);
-		final EditText comment = new EditText(ctx);
+		final EditText comment = new EditText(activity);
 		comment.setText(R.string.poi_remove_title);
 		ll.addView(comment);
-		final CheckBox closeChangeset = new CheckBox(ctx);
+		final CheckBox closeChangeset = new CheckBox(activity);
 		closeChangeset.setText(R.string.close_changeset);
 		ll.addView(closeChangeset);
 		builder.setView(ll);
@@ -190,9 +191,9 @@ public class EditingPOIActivity implements DialogProvider {
 				commitNode(OsmPoint.Action.DELETE, n, openstreetmapUtil.getEntityInfo(), c, closeChangeset.isSelected(),  new Runnable(){
 					@Override
 					public void run() {
-						AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.poi_remove_success), Toast.LENGTH_LONG).show();
-						if(ctx.getMapView() != null){
-							ctx.getMapView().refreshMap(true);
+						AccessibleToast.makeText(activity, activity.getResources().getString(R.string.poi_remove_success), Toast.LENGTH_LONG).show();
+						if(activity instanceof MapActivity){
+							((MapActivity) activity).getMapView().refreshMap(true);
 						}						
 					}
 				});
@@ -224,15 +225,15 @@ public class EditingPOIActivity implements DialogProvider {
 	}
 	
 	private void addTagValueRow(final Node n, final TableLayout layout, String tg, String vl) {
-		final TableRow newTagRow = new TableRow(ctx);				            
+		final TableRow newTagRow = new TableRow(activity);				            
         TableRow.LayoutParams tlp = new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT);          
         tlp.leftMargin = 5;
         tlp.gravity = Gravity.CENTER;
         newTagRow.setLayoutParams(tlp);
 
-        final AutoCompleteTextView tag = new AutoCompleteTextView(ctx);
-        final AutoCompleteTextView value = new AutoCompleteTextView(ctx);				            
-        final Button delete = new Button(ctx);
+        final AutoCompleteTextView tag = new AutoCompleteTextView(activity);
+        final AutoCompleteTextView value = new AutoCompleteTextView(activity);				            
+        final Button delete = new Button(activity);
         
         tag.setLayoutParams(tlp);
         if(tg != null) {
@@ -248,13 +249,13 @@ public class EditingPOIActivity implements DialogProvider {
 				tagKeys.add(t.getValue());
 			}
 		}
-		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(ctx, R.layout.list_textview, tagKeys.toArray());
+		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, tagKeys.toArray());
         tag.setAdapter(adapter);
         tag.setThreshold(1);
         tag.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				Builder builder = new AlertDialog.Builder(ctx);
+				Builder builder = new AlertDialog.Builder(activity);
 				final String[] tags = tagKeys.toArray(new String[tagKeys.size()]);
 				builder.setItems(tags, new Dialog.OnClickListener() {
 					@Override
@@ -283,7 +284,7 @@ public class EditingPOIActivity implements DialogProvider {
 //				subCategories.add(s);
 //			}
 //		} ;
-        ArrayAdapter<Object> valueAdapter = new ArrayAdapter<Object>(ctx, R.layout.list_textview, subCategories.toArray());
+        ArrayAdapter<Object> valueAdapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, subCategories.toArray());
         value.setThreshold(1);
         value.setAdapter(valueAdapter);
 		value.addTextChangedListener(new TextWatcher() {
@@ -324,7 +325,7 @@ public class EditingPOIActivity implements DialogProvider {
 	}
 	
 	private Dialog createPOIDialog(final int dialogID, Bundle args) {
-		final Dialog dlg = new Dialog(ctx);
+		final Dialog dlg = new Dialog(activity);
 		dlg.setContentView(R.layout.editing_poi);
 		
 		dlg.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);;
@@ -348,7 +349,7 @@ public class EditingPOIActivity implements DialogProvider {
 
 			@Override
 			public void onClick(View v) {
-				ctx.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
+				activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://wiki.openstreetmap.org/wiki/Map_Features")));
 			}
 		});
 		linkToOsmDoc.setMovementMethod(LinkMovementMethod.getInstance());
@@ -378,7 +379,7 @@ public class EditingPOIActivity implements DialogProvider {
 		openHoursButton.setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
-				ctx.showDialog(DIALOG_OPENING_HOURS);
+				activity.showDialog(DIALOG_OPENING_HOURS);
 			}
 		});
 		typeText.addTextChangedListener(new TextWatcher(){
@@ -408,7 +409,7 @@ public class EditingPOIActivity implements DialogProvider {
 		typeButton.setOnClickListener(new View.OnClickListener(){
 			@Override
 			public void onClick(View v) {
-				ctx.showDialog(DIALOG_POI_TYPES);
+				activity.showDialog(DIALOG_POI_TYPES);
 			}
 		});
 		
@@ -451,7 +452,7 @@ public class EditingPOIActivity implements DialogProvider {
 			@Override
 			public void onClick(View v) {
 				//we must do remove, because there are two dialogs EDIT,CREATE using same variables!!
-				ctx.removeDialog(dialogID);
+				activity.removeDialog(dialogID);
 			}
 		});
 		((Button)dlg.findViewById(R.id.Commit)).setOnClickListener(new View.OnClickListener(){
@@ -508,12 +509,12 @@ public class EditingPOIActivity implements DialogProvider {
 						new Runnable() {
 					@Override
 					public void run() {
-						AccessibleToast.makeText(ctx, MessageFormat.format(ctx.getResources().getString(R.string.poi_action_succeded_template), msg),
+						AccessibleToast.makeText(activity, MessageFormat.format(activity.getResources().getString(R.string.poi_action_succeded_template), msg),
 								Toast.LENGTH_LONG).show();
-						if (ctx.getMapView() != null) {
-							ctx.getMapView().refreshMap(true);
+						if (activity instanceof MapActivity) {
+							((MapActivity) activity).getMapView().refreshMap(true);
 						}
-						ctx.removeDialog(dialogID);
+						activity.removeDialog(dialogID);
 					}
 				});
 			}
@@ -522,7 +523,7 @@ public class EditingPOIActivity implements DialogProvider {
 
 	private void showSubCategory(Amenity a) {
 		if(typeText.getText().length() == 0 && a.getType() != null){
-			ctx.showDialog(DIALOG_SUB_CATEGORIES);
+			activity.showDialog(DIALOG_SUB_CATEGORIES);
 		}
 	}
 
@@ -533,7 +534,7 @@ public class EditingPOIActivity implements DialogProvider {
 				subCategories.add(s);
 			}
 		}
-		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(ctx, R.layout.list_textview, subCategories.toArray());
+		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(activity, R.layout.list_textview, subCategories.toArray());
 		typeText.setAdapter(adapter);
 	}
 	
@@ -547,7 +548,7 @@ public class EditingPOIActivity implements DialogProvider {
 	private Dialog createOpenHoursDlg(){
 		OpeningHours time = OpeningHoursParser.parseOpenedHours(openingHours.getText().toString());
 		if(time == null){
-			AccessibleToast.makeText(ctx, ctx.getString(R.string.opening_hours_not_supported), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(activity, activity.getString(R.string.opening_hours_not_supported), Toast.LENGTH_LONG).show();
 			return null;
 		}
 		
@@ -564,21 +565,21 @@ public class EditingPOIActivity implements DialogProvider {
 			}
 		}
 		
-		Builder builder = new AlertDialog.Builder(ctx);
-		final OpeningHoursView v = new OpeningHoursView(ctx);
+		Builder builder = new AlertDialog.Builder(activity);
+		final OpeningHoursView v = new OpeningHoursView(activity);
 		builder.setView(v.createOpeningHoursEditView(simple));
-		builder.setPositiveButton(ctx.getString(R.string.shared_string_apply), new DialogInterface.OnClickListener(){
+		builder.setPositiveButton(activity.getString(R.string.shared_string_apply), new DialogInterface.OnClickListener(){
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				OpeningHours oh = new OpeningHours((ArrayList<OpeningHoursRule>) v.getTime());
 				openingHours.setText(oh.toString());
-				ctx.removeDialog(DIALOG_OPENING_HOURS);
+				activity.removeDialog(DIALOG_OPENING_HOURS);
 			}
 		});
-		builder.setNegativeButton(ctx.getString(R.string.shared_string_cancel), new DialogInterface.OnClickListener() {
+		builder.setNegativeButton(activity.getString(R.string.shared_string_cancel), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				ctx.removeDialog(DIALOG_OPENING_HOURS);
+				activity.removeDialog(DIALOG_OPENING_HOURS);
 			}
 		});
 		return builder.create();
@@ -589,14 +590,14 @@ public class EditingPOIActivity implements DialogProvider {
 			final boolean closeChangeSet,
 			final Runnable successAction) {
 		if (info == null && OsmPoint.Action.CREATE != action) {
-			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.poi_error_info_not_loaded), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(activity, activity.getResources().getString(R.string.poi_error_info_not_loaded), Toast.LENGTH_LONG).show();
 			return;
 		}
 		new AsyncTask<Void, Void, Node>() {
 			ProgressDialog progress;
 			@Override
 			protected void onPreExecute() {
-				progress = ProgressDialog.show(ctx, ctx.getString(R.string.uploading), ctx.getString(R.string.uploading_data));
+				progress = ProgressDialog.show(activity, activity.getString(R.string.uploading), activity.getString(R.string.uploading_data));
 				super.onPreExecute();
 			}
 			@Override
@@ -625,7 +626,7 @@ public class EditingPOIActivity implements DialogProvider {
 		case DIALOG_DELETE_POI:
 			return createDeleteDialog(args);
 		case DIALOG_SUB_CATEGORIES: {
-			Builder builder = new AlertDialog.Builder(ctx);
+			Builder builder = new AlertDialog.Builder(activity);
 			final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
 			final String[] subCats = poiTypes.getAllTranslatedNames(a.getType()).keySet().toArray(new String[0]);
 			builder.setItems(subCats, new DialogInterface.OnClickListener() {
@@ -633,20 +634,20 @@ public class EditingPOIActivity implements DialogProvider {
 				public void onClick(DialogInterface dialog, int which) {
 					typeText.setText(subCats[which]);
 					a.setSubType(subCats[which]);
-					ctx.removeDialog(DIALOG_SUB_CATEGORIES);
+					activity.removeDialog(DIALOG_SUB_CATEGORIES);
 				}
 			});
 			builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
 				@Override
 				public void onCancel(DialogInterface dialog) {
-					ctx.removeDialog(DIALOG_SUB_CATEGORIES);
+					activity.removeDialog(DIALOG_SUB_CATEGORIES);
 				}
 			});
 			return builder.create();
 		}
 		case DIALOG_POI_TYPES: {
 			final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
-			Builder builder = new AlertDialog.Builder(ctx);
+			Builder builder = new AlertDialog.Builder(activity);
 			final List<PoiCategory> categories = poiTypes.getCategories();
 			String[] vals = new String[categories.size()];
 			for (int i = 0; i < vals.length; i++) {
@@ -661,13 +662,13 @@ public class EditingPOIActivity implements DialogProvider {
 						a.setSubType(""); //$NON-NLS-1$
 						updateType(a);
 					}
-					ctx.removeDialog(DIALOG_POI_TYPES);
+					activity.removeDialog(DIALOG_POI_TYPES);
 				}
 			});
 			builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
 				@Override
 				public void onCancel(DialogInterface dialog) {
-					ctx.removeDialog(DIALOG_POI_TYPES);
+					activity.removeDialog(DIALOG_POI_TYPES);
 				}
 			});
 			return builder.create();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
index 04acfc42d0..d69e2bc6bd 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java
@@ -46,11 +46,10 @@ import android.widget.Toast;
 public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 
 	private static final long NO_CHANGESET_ID = -1;
-	
+
 	private final OsmandApplication ctx;
-	private final View view;
 	private EntityInfo entityInfo;
-	
+
 	// reuse changeset
 	private long changeSetId = NO_CHANGESET_ID;
 	private long changeSetTimeStamp = NO_CHANGESET_ID;
@@ -59,9 +58,8 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 
 	private OsmandSettings settings;
 
-	public OpenstreetmapRemoteUtil(Context uiContext, View view){
+	public OpenstreetmapRemoteUtil(Context uiContext) {
 		this.ctx = ((OsmandApplication) uiContext.getApplicationContext());
-		this.view = view;
 		settings = ctx.getSettings();
 	}
 
@@ -69,42 +67,41 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 	public EntityInfo getEntityInfo() {
 		return entityInfo;
 	}
-	
-	private static String getSiteApi()
-	{
+
+	private static String getSiteApi() {
 		final int deviceApiVersion = android.os.Build.VERSION.SDK_INT;
-		
+
 		String RETURN_API;
-		
+
 		if (deviceApiVersion >= android.os.Build.VERSION_CODES.GINGERBREAD) {
 			RETURN_API = "https://api.openstreetmap.org/";
-		}
-		else {
+		} else {
 			RETURN_API = "http://api.openstreetmap.org/";
 		}
-		
-//		RETURN_API = "http://api06.dev.openstreetmap.org/";
-		
+
+		// RETURN_API = "http://api06.dev.openstreetmap.org/";
+
 		return RETURN_API;
 	}
-	
+
 	private final static String URL_TO_UPLOAD_GPX = getSiteApi() + "api/0.6/gpx/create";
 
 	public String uploadGPXFile(String tagstring, String description, String visibility, File f) {
-		String url = URL_TO_UPLOAD_GPX; 
+		String url = URL_TO_UPLOAD_GPX;
 		Map<String, String> additionalData = new LinkedHashMap<String, String>();
 		additionalData.put("description", description);
 		additionalData.put("tags", tagstring);
 		additionalData.put("visibility", visibility);
-		return NetworkUtils.uploadFile(url, f, settings.USER_NAME.get()+":"+
-				settings.USER_PASSWORD.get(), "file", true, additionalData);
+		return NetworkUtils.uploadFile(url, f, settings.USER_NAME.get() + ":" + settings.USER_PASSWORD.get(), "file",
+				true, additionalData);
 	}
-	
-	private String sendRequest(String url, String requestMethod, String requestBody, String userOperation, boolean doAuthenticate) {
+
+	private String sendRequest(String url, String requestMethod, String requestBody, String userOperation,
+			boolean doAuthenticate) {
 		log.info("Sending request " + url); //$NON-NLS-1$
 		try {
 			HttpURLConnection connection = NetworkUtils.getHttpURLConnection(url);
-			
+
 			connection.setConnectTimeout(15000);
 			connection.setRequestMethod(requestMethod);
 			connection.setRequestProperty("User-Agent", Version.getFullVersion(ctx)); //$NON-NLS-1$
@@ -127,7 +124,8 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			}
 			connection.connect();
 			if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
-				String msg = userOperation + " " + ctx.getString(R.string.failed_op) + " : " +  connection.getResponseMessage();  //$NON-NLS-1$//$NON-NLS-2$
+				String msg = userOperation
+						+ " " + ctx.getString(R.string.failed_op) + " : " + connection.getResponseMessage(); //$NON-NLS-1$//$NON-NLS-2$
 				log.error(msg);
 				showWarning(msg);
 			} else {
@@ -140,7 +138,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 					String s;
 					boolean f = true;
 					while ((s = in.readLine()) != null) {
-						if(!f){
+						if (!f) {
 							responseBody.append("\n"); //$NON-NLS-1$
 						} else {
 							f = false;
@@ -153,20 +151,21 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 		} catch (NullPointerException e) {
 			// that's tricky case why NPE is thrown to fix that problem httpClient could be used
 			String msg = ctx.getString(R.string.auth_failed);
-			log.error(msg , e);
+			log.error(msg, e);
 			showWarning(msg);
 		} catch (MalformedURLException e) {
-			log.error(userOperation + " " + ctx.getString(R.string.failed_op) , e); //$NON-NLS-1$
-			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template) + ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
+			log.error(userOperation + " " + ctx.getString(R.string.failed_op), e); //$NON-NLS-1$
+			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
+					+ ": " + ctx.getResources().getString(R.string.shared_string_unexpected_error), userOperation));
 		} catch (IOException e) {
-			log.error(userOperation + " " + ctx.getString(R.string.failed_op) , e); //$NON-NLS-1$
-			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template) + ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
+			log.error(userOperation + " " + ctx.getString(R.string.failed_op), e); //$NON-NLS-1$
+			showWarning(MessageFormat.format(ctx.getResources().getString(R.string.shared_string_action_template)
+					+ ": " + ctx.getResources().getString(R.string.shared_string_io_error), userOperation));
 		}
 
 		return null;
 	}
 
-	
 	public long openChangeSet(String comment) {
 		long id = -1;
 		StringWriter writer = new StringWriter(256);
@@ -193,19 +192,21 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 		} catch (IOException e) {
 			log.error("Unhandled exception", e); //$NON-NLS-1$
 		}
-		String response = sendRequest(getSiteApi() + "api/0.6/changeset/create/", "PUT", writer.getBuffer().toString(), ctx.getString(R.string.opening_changeset), true); //$NON-NLS-1$ //$NON-NLS-2$
+		String response = sendRequest(
+				getSiteApi() + "api/0.6/changeset/create/", "PUT", writer.getBuffer().toString(), ctx.getString(R.string.opening_changeset), true); //$NON-NLS-1$ //$NON-NLS-2$
 		if (response != null && response.length() > 0) {
 			id = Long.parseLong(response);
 		}
 
 		return id;
 	}
-	
-	private void writeNode(Node n, EntityInfo i, XmlSerializer ser, long changeSetId, String user) throws IllegalArgumentException, IllegalStateException, IOException{
+
+	private void writeNode(Node n, EntityInfo i, XmlSerializer ser, long changeSetId, String user)
+			throws IllegalArgumentException, IllegalStateException, IOException {
 		ser.startTag(null, "node"); //$NON-NLS-1$
-		ser.attribute(null, "id", n.getId()+""); //$NON-NLS-1$ //$NON-NLS-2$
-		ser.attribute(null, "lat", n.getLatitude()+""); //$NON-NLS-1$ //$NON-NLS-2$
-		ser.attribute(null, "lon", n.getLongitude()+""); //$NON-NLS-1$ //$NON-NLS-2$
+		ser.attribute(null, "id", n.getId() + ""); //$NON-NLS-1$ //$NON-NLS-2$
+		ser.attribute(null, "lat", n.getLatitude() + ""); //$NON-NLS-1$ //$NON-NLS-2$
+		ser.attribute(null, "lon", n.getLongitude() + ""); //$NON-NLS-1$ //$NON-NLS-2$
 		if (i != null) {
 			// ser.attribute(null, "timestamp", i.getETimestamp());
 			// ser.attribute(null, "uid", i.getUid());
@@ -213,11 +214,12 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			ser.attribute(null, "visible", i.getVisible()); //$NON-NLS-1$
 			ser.attribute(null, "version", i.getVersion()); //$NON-NLS-1$
 		}
-		ser.attribute(null, "changeset", changeSetId+""); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		for(String k : n.getTagKeySet()){
+		ser.attribute(null, "changeset", changeSetId + ""); //$NON-NLS-1$ //$NON-NLS-2$
+
+		for (String k : n.getTagKeySet()) {
 			String val = n.getTag(k);
-			if (val.length() == 0) continue;
+			if (val.length() == 0)
+				continue;
 			ser.startTag(null, "tag"); //$NON-NLS-1$
 			ser.attribute(null, "k", k); //$NON-NLS-1$
 			ser.attribute(null, "v", val); //$NON-NLS-1$
@@ -228,7 +230,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 
 	private boolean isNewChangesetRequired() {
 		// first commit
-		if (changeSetId == NO_CHANGESET_ID){
+		if (changeSetId == NO_CHANGESET_ID) {
 			return true;
 		}
 
@@ -242,12 +244,13 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 	}
 
 	@Override
-	public Node commitNodeImpl(OsmPoint.Action action, final Node n, EntityInfo info, String comment, boolean closeChangeSet){
-		if (isNewChangesetRequired()){
+	public Node commitNodeImpl(OsmPoint.Action action, final Node n, EntityInfo info, String comment,
+			boolean closeChangeSet) {
+		if (isNewChangesetRequired()) {
 			changeSetId = openChangeSet(comment);
 			changeSetTimeStamp = System.currentTimeMillis();
 		}
-		if(changeSetId < 0){
+		if (changeSetId < 0) {
 			return null;
 		}
 
@@ -259,7 +262,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 				ser.setOutput(writer);
 				ser.startDocument("UTF-8", true); //$NON-NLS-1$
 				ser.startTag(null, "osmChange"); //$NON-NLS-1$
-				ser.attribute(null, "version", "0.6");  //$NON-NLS-1$ //$NON-NLS-2$
+				ser.attribute(null, "version", "0.6"); //$NON-NLS-1$ //$NON-NLS-2$
 				ser.attribute(null, "generator", Version.getAppName(ctx)); //$NON-NLS-1$
 				ser.startTag(null, OsmPoint.stringAction.get(action));
 				ser.attribute(null, "version", "0.6"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -271,9 +274,9 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			} catch (IOException e) {
 				log.error("Unhandled exception", e); //$NON-NLS-1$
 			}
-			String res = sendRequest(getSiteApi() + "api/0.6/changeset/"+changeSetId + "/upload", "POST", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			String res = sendRequest(getSiteApi() + "api/0.6/changeset/" + changeSetId + "/upload", "POST", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 					writer.getBuffer().toString(), ctx.getString(R.string.commiting_node), true);
-			log.debug(res+""); //$NON-NLS-1$
+			log.debug(res + ""); //$NON-NLS-1$
 			if (res != null) {
 				if (OsmPoint.Action.CREATE == action) {
 					long newId = n.getId();
@@ -292,88 +295,94 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil {
 			}
 			return null;
 		} finally {
-			if(closeChangeSet) {
+			if (closeChangeSet) {
 				closeChangeSet();
 			}
 		}
 	}
-	
+
 	@Override
 	public void closeChangeSet() {
 		if (changeSetId != NO_CHANGESET_ID) {
-			String response = sendRequest(getSiteApi() + "api/0.6/changeset/"+changeSetId+"/close", "PUT", "", ctx.getString(R.string.closing_changeset), true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			String response = sendRequest(
+					getSiteApi() + "api/0.6/changeset/" + changeSetId + "/close", "PUT", "", ctx.getString(R.string.closing_changeset), true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 			log.info("Response : " + response); //$NON-NLS-1$
 			changeSetId = NO_CHANGESET_ID;
 		}
 
 	}
-	
+
 	public EntityInfo loadNode(Node n) {
 		long nodeId = n.getId(); // >> 1;
 		try {
-			String res = sendRequest(getSiteApi() + "api/0.6/node/"+nodeId, "GET", null, ctx.getString(R.string.loading_poi_obj) + nodeId, false); //$NON-NLS-1$ //$NON-NLS-2$
-			if(res != null){
+			String res = sendRequest(
+					getSiteApi() + "api/0.6/node/" + nodeId, "GET", null, ctx.getString(R.string.loading_poi_obj) + nodeId, false); //$NON-NLS-1$ //$NON-NLS-2$
+			if (res != null) {
 				OsmBaseStorage st = new OsmBaseStorage();
 				st.parseOSM(new ByteArrayInputStream(res.getBytes("UTF-8")), null, null, true); //$NON-NLS-1$
 				EntityId id = new Entity.EntityId(EntityType.NODE, nodeId);
 				Node entity = (Node) st.getRegisteredEntities().get(id);
 				// merge non existing tags
-				for(String rtag : entity.getTagKeySet()) {
-					if(!n.getTagKeySet().contains(rtag)) {
+				for (String rtag : entity.getTagKeySet()) {
+					if (!n.getTagKeySet().contains(rtag)) {
 						n.putTag(rtag, entity.getTag(rtag));
 					}
 				}
 				entityInfo = st.getRegisteredEntityInfo().get(id);
 				return entityInfo;
 			}
-			
+
 		} catch (IOException e) {
 			log.error("Loading node failed " + nodeId, e); //$NON-NLS-1$
-			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error),
+					Toast.LENGTH_LONG).show();
 		} catch (SAXException e) {
 			log.error("Loading node failed " + nodeId, e); //$NON-NLS-1$
-			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();
+			AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error),
+					Toast.LENGTH_LONG).show();
 		}
 		return null;
 	}
 
 	@Override
 	public Node loadNode(Amenity n) {
-		if(n.getId() % 2 == 1){
+		if (n.getId() % 2 == 1) {
 			// that's way id
 			return null;
 		}
 		long nodeId = n.getId() >> 1;
 		try {
-			String res = sendRequest(getSiteApi() + "api/0.6/node/"+nodeId, "GET", null, ctx.getString(R.string.loading_poi_obj) + nodeId, false); //$NON-NLS-1$ //$NON-NLS-2$
-			if(res != null){
+			String res = sendRequest(
+					getSiteApi() + "api/0.6/node/" + nodeId, "GET", null, ctx.getString(R.string.loading_poi_obj) + nodeId, false); //$NON-NLS-1$ //$NON-NLS-2$
+			if (res != null) {
 				OsmBaseStorage st = new OsmBaseStorage();
 				st.parseOSM(new ByteArrayInputStream(res.getBytes("UTF-8")), null, null, true); //$NON-NLS-1$
 				EntityId id = new Entity.EntityId(EntityType.NODE, nodeId);
 				Node entity = (Node) st.getRegisteredEntities().get(id);
 				entityInfo = st.getRegisteredEntityInfo().get(id);
-				// check whether this is node (because id of node could be the same as relation) 
-				if(entity != null && MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50){
+				// check whether this is node (because id of node could be the same as relation)
+				if (entity != null && MapUtils.getDistance(entity.getLatLon(), n.getLocation()) < 50) {
 					return entity;
 				}
 				return null;
 			}
-			
+
 		} catch (Exception e) {
 			log.error("Loading node failed " + nodeId, e); //$NON-NLS-1$
 			ctx.runInUIThread(new Runnable() {
-				
+
 				@Override
 				public void run() {
-					AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error), Toast.LENGTH_LONG).show();					
+					AccessibleToast.makeText(ctx, ctx.getResources().getString(R.string.shared_string_io_error),
+							Toast.LENGTH_LONG).show();
 				}
 			});
 		}
 		return null;
 	}
-	
-	private void showWarning(final String msg){
-		view.post(new Runnable(){
+
+	private void showWarning(final String msg) {
+		ctx.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
 				AccessibleToast.makeText(ctx, msg, Toast.LENGTH_LONG).show();
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 69cc64dd47..4afcdfb0cd 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -17,7 +17,6 @@ import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.controls.MapControls;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.plus.views.controls.MapRoutePreferencesControl;
 import net.osmand.plus.views.corenative.NativeCoreContext;
@@ -55,8 +54,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 	// private RulerControl rulerControl;
 	// private List<MapControls> allControls = new ArrayList<MapControls>();
 
-	private float scaleCoefficient;
-
 	private SeekBar transparencyBar;
 	private LinearLayout transparencyBarLayout;
 	private static CommonPreference<Integer> settingsToTransparency;
@@ -95,7 +92,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	@Override
 	public void initLayer(final OsmandMapTileView view) {
-		scaleCoefficient = view.getScaleCoefficient();
 		// TODO
 		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
 		// rightGravity);
@@ -415,10 +411,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	}
 
-	protected void notifyClicked(MapControls m) {
-		notifyClicked();
-	}
-
 	protected void notifyClicked() {
 		stopCounter();
 	}
@@ -453,16 +445,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				&& (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
 		// /////////////////////////////////////////////
 		// new update
-
-		boolean enabled = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
-		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
-		if (!enabled) {
-			backToLocationControl.setIconColorId(R.color.icon_color_light);
-		} else if (tracked) {
-			backToLocationControl.setIconColorId(R.color.color_distance);
-		} else {
-			backToLocationControl.setIconColorId(R.color.color_white);
-		}
+		updateMyLocation();
 
 		menuControl.setIconResId(settings.USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark
 				: R.drawable.ic_navigation_drawer);
@@ -527,6 +510,24 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
+	private void updateMyLocation() {
+//		final Drawable backToLoc = map.getResources().getDrawable(R.drawable.back_to_loc);
+//		final Drawable backToLocWhite = map.getResources().getDrawable(R.drawable.back_to_loc_white);
+//		final Drawable backToLocDisabled = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled);
+//		final Drawable backToLocDisabledWhite = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled_white);
+//		final Drawable backToLocTracked = map.getResources().getDrawable(R.drawable.back_to_loc_tracked);
+//		final Drawable backToLocTrackedWhite = map.getResources().getDrawable(R.drawable.back_to_loc_tracked_white);
+		boolean enabled = mapActivity.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
+		boolean tracked = mapActivity.getMapViewTrackingUtilities().isMapLinkedToLocation();
+		if (!enabled) {
+			backToLocationControl.setIconColorId(R.color.icon_color_light);
+		} else if (tracked) {
+			backToLocationControl.setIconColorId(R.color.color_distance);
+		} else {
+			backToLocationControl.setIconColorId(R.color.color_white);
+		}
+	}
+
 
 	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
 		if (mapRouteInfoControlDialog.onSingleTap(point, tileBox)) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 74253ad6a0..77177353fc 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -38,6 +38,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 public class MapInfoLayer extends OsmandMapLayer {
 
@@ -47,19 +48,16 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private final RouteLayer routeLayer;
 	private OsmandMapTileView view;
 	
-	private Paint paintText;
-	private Paint paintSubText;
-	private Paint paintSmallText;
-	private Paint paintSmallSubText;
-	private Paint paintImg;
-	
-	
-	private TopTextView topText;
-	private View progressBar;
-	
+//	private Paint paintText;
+//	private Paint paintSubText;
+//	private Paint paintSmallText;
+//	private Paint paintSmallSubText;
+//	private Paint paintImg;
+//	private View progressBar;
+//	
 	// groups
-	private StackWidgetView rightStack;
-	private StackWidgetView leftStack;
+	private LinearLayout rightStack;
+	private LinearLayout leftStack;
 	private BaseMapWidget lanesControl;
 	private BaseMapWidget alarmControl;
 	private MapWidgetRegistry mapInfoControls;
@@ -71,23 +69,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 		this.routeLayer = layer;
 	}
 	
-	
-	public Paint getPaintSmallSubText() {
-		return paintSmallSubText;
-	}
-	
-	public Paint getPaintText() {
-		return paintText;
-	}
-	
-	public Paint getPaintSmallText() {
-		return paintSmallText;
-	}
-	
-	public Paint getPaintSubText() {
-		return paintSubText;
-	}
-	
 	public MonitoringInfoControl getMonitoringInfoControl() {
 		return monitoringServices;
 	}
@@ -101,33 +82,33 @@ public class MapInfoLayer extends OsmandMapLayer {
 		this.view = view;
 		scaleCoefficient = view.getScaleCoefficient();
 
-		paintText = new Paint();
+		Paint paintText = new Paint();
 		paintText.setStyle(Style.FILL_AND_STROKE);
 		paintText.setColor(Color.BLACK);
 		paintText.setTextSize(23 * scaleCoefficient);
 		paintText.setAntiAlias(true);
 		paintText.setStrokeWidth(4);
 
-		paintSubText = new Paint();
+		Paint paintSubText = new Paint();
 		paintSubText.setStyle(Style.FILL_AND_STROKE);
 		paintSubText.setColor(Color.BLACK);
 		paintSubText.setTextSize(15 * scaleCoefficient);
 		paintSubText.setAntiAlias(true);
 
-		paintSmallText = new Paint();
+		Paint paintSmallText = new Paint();
 		paintSmallText.setStyle(Style.FILL_AND_STROKE);
 		paintSmallText.setColor(Color.BLACK);
 		paintSmallText.setTextSize(19 * scaleCoefficient);
 		paintSmallText.setAntiAlias(true);
 		paintSmallText.setStrokeWidth(4);
 
-		paintSmallSubText = new Paint();
+		Paint paintSmallSubText = new Paint();
 		paintSmallSubText.setStyle(Style.FILL_AND_STROKE);
 		paintSmallSubText.setColor(Color.BLACK);
 		paintSmallSubText.setTextSize(13 * scaleCoefficient);
 		paintSmallSubText.setAntiAlias(true);
 
-		paintImg = new Paint();
+		Paint paintImg = new Paint();
 		paintImg.setDither(true);
 		paintImg.setFilterBitmap(true);
 		paintImg.setAntiAlias(true);
@@ -162,24 +143,22 @@ public class MapInfoLayer extends OsmandMapLayer {
 		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(routingHelper, app, view.getSettings(),
 				paintSmallText, paintSmallSubText, true);
 		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
-		//MiniMapControl miniMap = ric.createMiniMapControl(routingHelper, view);
-		//mapInfoControls.registerSideWidget(miniMap, R.drawable.widget_next_turn, R.string.map_widget_mini_route, "mini_route", true, none, none, 20);
 		// right stack
-		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map, paintText, paintSubText);
+		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
 		mapInfoControls.registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
-		TextInfoWidget dist = ric.createDistanceControl(map, paintText, paintSubText);
+		TextInfoWidget dist = ric.createDistanceControl(map);
 		mapInfoControls.registerSideWidget(dist, R.drawable.widget_target, R.drawable.widget_target, R.string.map_widget_distance, "distance", false, 5);
-		TextInfoWidget time = ric.createTimeControl(map, paintText, paintSubText);
+		TextInfoWidget time = ric.createTimeControl(map);
 		mapInfoControls.registerSideWidget(time, R.drawable.widget_time, R.drawable.widget_time, R.string.map_widget_time, "time", false, 10);
-		TextInfoWidget speed = ric.createSpeedControl(map, paintText, paintSubText);
+		TextInfoWidget speed = ric.createSpeedControl(map);
 		mapInfoControls.registerSideWidget(speed, R.drawable.widget_speed, R.drawable.widget_speed, R.string.map_widget_speed, "speed", false, 15);
-		TextInfoWidget gpsInfo = mic.createGPSInfoControl(map, paintText, paintSubText);
+		TextInfoWidget gpsInfo = mic.createGPSInfoControl(map);
 		mapInfoControls.registerSideWidget(gpsInfo, R.drawable.widget_gps_info,  R.drawable.widget_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
-		TextInfoWidget maxspeed = ric.createMaxSpeedControl(map, paintText, paintSubText);
+		TextInfoWidget maxspeed = ric.createMaxSpeedControl(map);
 		mapInfoControls.registerSideWidget(maxspeed, R.drawable.widget_max_speed, R.drawable.widget_max_speed, R.string.map_widget_max_speed, "max_speed", false,  18);
-		TextInfoWidget alt = mic.createAltitudeControl(map, paintText, paintSubText);
+		TextInfoWidget alt = mic.createAltitudeControl(map);
 		mapInfoControls.registerSideWidget(alt, R.drawable.widget_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
-		TextInfoWidget plainTime = ric.createPlainTimeControl(map, paintText, paintSubText);
+		TextInfoWidget plainTime = ric.createPlainTimeControl(map);
 		mapInfoControls.registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
 
 		// Register appearance widgets
@@ -206,7 +185,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		// form measurement
 		ImageView iv = new ImageView(map);
 		iv.setImageDrawable(map.getResources().getDrawable(R.drawable.la_backtoloc_disabled));
-		rightStack = new StackWidgetView(view.getContext());
+		rightStack = map;
 		leftStack = new StackWidgetView(view.getContext());
 		
 		// 2. Preparations
@@ -409,7 +388,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 			paintSmallText.setColor(textColor);
 			paintSmallSubText.setColor(textColor);
 
-			topText.setShadowColor(textShadowColor);
 			leftStack.setShadowColor(textShadowColor);
 			rightStack.setShadowColor(textShadowColor);
 
@@ -458,21 +436,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 		return progressBar;
 	}
 
-	private static class UpdateFrameLayout extends FrameLayout implements UpdateableWidget {
-		private ImageViewWidget widget;
-
-		private UpdateFrameLayout(Context c, ImageViewWidget widget) {
-			super(c);
-			this.widget = widget;
-		}
-
-		@Override
-		public boolean updateInfo(DrawSettings drawSettings) {
-			return widget.updateInfo(drawSettings);
-		}
-	}
-	
-	
 
 	public static String getStringPropertyName(Context ctx, String propertyName, String defValue) {
 		try {
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 70003988db..21b841584f 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -985,14 +985,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		return view.getResources();
 	}
 
-	public ViewParent getParent() {
-		return view.getParent();
-	}
-
-	public View getView() {
-		return view;
-	}
-
 	public int getHeight() {
 		return view.getHeight();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java b/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java
deleted file mode 100644
index d7403526a7..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapControls.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.PointF;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-
-
-public abstract class MapControls {
-
-	protected MapActivity mapActivity;
-	protected float scaleCoefficient;
-	protected Handler showUIHandler;
-	protected int shadowColor;
-	private boolean visible;
-	private long delayTime;
-
-	protected int gravity = Gravity.BOTTOM | Gravity.RIGHT;
-	protected int margin;
-	protected int vmargin;
-	protected int width;
-	protected int height;
-	protected Runnable notifyClick;
-	private int extraVerticalMargin;
-
-	public MapControls(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		this.mapActivity = mapActivity;
-		this.showUIHandler = showUIHandler;
-		this.scaleCoefficient = scaleCoefficient;
-	}
-
-
-	public void setGravity(int gravity) {
-		this.gravity = gravity;
-	}
-
-	public void setMargin(int margin) {
-		this.margin = margin;
-	}
-	public void setVerticalMargin(int vmargin) {
-		this.vmargin = vmargin;
-	}
-
-	protected ImageButton addImageButton(FrameLayout parent, int stringId, int resourceId) {
-		Context ctx = mapActivity;
-		ImageButton  button = new ImageButton(ctx);
-		applyAttributes(ctx, parent, button, stringId, resourceId, 0);
-		return button;
-	}
-
-	public int getTotalVerticalMargin() {
-		return extraVerticalMargin + vmargin;
-	}
-
-	protected Button addButton(FrameLayout parent, int stringId, int resourceId) {
-		return addButton(parent, stringId, resourceId, 0);
-	}
-
-	protected Button addButton(FrameLayout parent, int stringId, int resourceId, int extraMargin) {
-		Context ctx = mapActivity;
-		Button button = new Button(ctx);
-		applyAttributes(ctx, parent, button, stringId, resourceId, extraMargin);
-		return button;
-	}
-
-	public void setNotifyClick(Runnable notifyClick) {
-		this.notifyClick = notifyClick;
-	}
-
-	protected void notifyClicked() {
-		if(notifyClick != null) {
-			notifyClick.run();
-		}
-	}
-
-
-	private void applyAttributes(Context ctx, FrameLayout parent, View button, int stringId, int resourceId,
-			int extraMargin) {
-		button.setContentDescription(ctx.getString(stringId));
-		button.setBackgroundResource(resourceId);
-		Drawable d = ctx.getResources().getDrawable(resourceId);
-		android.widget.FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(d.getMinimumWidth(), d.getMinimumHeight(),
-				gravity);
-		if((gravity & Gravity.LEFT) == Gravity.LEFT) {
-			params.leftMargin = margin + extraMargin;
-		} else {
-			params.rightMargin = margin + extraMargin;
-		}
-		if((gravity & Gravity.BOTTOM) == Gravity.BOTTOM) {
-			params.bottomMargin = vmargin + extraVerticalMargin;
-		} else {
-			params.topMargin = vmargin + extraVerticalMargin;
-		}
-		button.setLayoutParams(params);
-		parent.addView(button);
-		button.setEnabled(true);
-		mapActivity.accessibleContent.add(button);
-	}
-
-	public int getGravity() {
-		return gravity;
-	}
-
-	protected void removeButton(final FrameLayout layout, final View b) {
-		b.setVisibility(View.GONE);
-
-		if (layout.getHandler() != null){
-			layout.getHandler().post(new Runnable() {
-				@Override
-				public void run() {
-					layout.removeView(b);
-				}
-			});
-		}
-
-		mapActivity.accessibleContent.remove(b);
-	}
-
-	public void updateTextColor(int textColor, int shadowColor) {
-		this.shadowColor = shadowColor;
-	}
-
-	public final void init(FrameLayout layout) {
-		initControls(layout);
-	}
-
-	public final void show(FrameLayout layout) {
-		visible = true;
-		showControls(layout);
-	}
-
-	public final void showWithDelay(final FrameLayout layout, final long delay) {
-		this.delayTime = System.currentTimeMillis() + delay;
-		if(!visible) {
-			visible = true;
-			showControls(layout);
-			runWithDelay(layout, delay);
-			mapActivity.getMapView().refreshMap();
-		}
-	}
-
-	private void runWithDelay(final FrameLayout layout, final long delay) {
-		showUIHandler.postDelayed(new Runnable() {
-			@Override
-			public void run() {
-				long ctime = System.currentTimeMillis();
-				if(MapControls.this.delayTime <= ctime) {
-					if (MapControls.this.delayTime != 0) {
-						MapControls.this.delayTime = 0;
-						visible = false;
-						hideControls(layout);
-						mapActivity.getMapView().refreshMap();
-					}
-				} else {
-					runWithDelay(layout, MapControls.this.delayTime - ctime);
-				}
-			}
-		}, delay);
-	}
-
-	public final void hide(FrameLayout layout) {
-		if(this.delayTime == 0) {
-			visible = false;
-			hideControls(layout);
-		}
-	}
-
-	public final void forceHide(FrameLayout layout) {
-		delayTime = 0;
-		visible = false;
-		hideControls(layout);
-		mapActivity.getMapView().refreshMap();
-	}
-
-	public boolean isVisible() {
-		return visible;
-	}
-
-	protected boolean isLeft() {
-		return (Gravity.LEFT & gravity) == Gravity.LEFT;
-	}
-
-	public boolean isBottom() {
-		return (Gravity.BOTTOM & gravity) == Gravity.BOTTOM;
-	}
-
-
-	protected void initControls(FrameLayout layout) {
-	}
-
-	protected abstract void hideControls(FrameLayout layout);
-
-	protected abstract void showControls(FrameLayout layout);
-
-
-	public abstract void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode);
-
-
-	public boolean onTouchEvent(MotionEvent event, RotatedTileBox tileBox) {
-		return false;
-	}
-
-	public boolean onSingleTap(PointF point, RotatedTileBox tileBox) {
-		return false;
-	}
-
-	public void setExtraVerticalMargin(int extraVerticalMargin) {
-		this.extraVerticalMargin = extraVerticalMargin;
-	}
-
-	public int getExtraVerticalMargin() {
-		return this.extraVerticalMargin;
-	}
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
index 91ea3968b3..5e77207da8 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
@@ -16,7 +16,7 @@ import android.text.TextPaint;
 import android.view.View;
 import android.widget.FrameLayout;
 
-public class RulerControl extends MapControls {
+public class RulerControl  {
 
 	//ruler and ruler label appeareance:
 	//  Day view:   color black, shadowColor white (transpparent skin or not)
@@ -31,30 +31,19 @@ public class RulerControl extends MapControls {
 	TextPaint rulerTextPaint;
 	final static double screenRulerPercent = 0.25;
 	boolean isNightRemembered = false;
+	private MapActivity mapActivity;
+	private float scaleCoefficient;
 
 	public RulerControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-	super(mapActivity, showUIHandler, scaleCoefficient);
+		this.mapActivity = mapActivity;
+		this.scaleCoefficient = scaleCoefficient;
 		rulerTextPaint = new TextPaint();
 		rulerTextPaint.setTextSize(20 * scaleCoefficient);
 		rulerTextPaint.setAntiAlias(true);
 		rulerDrawable = mapActivity.getResources().getDrawable(R.drawable.ruler);
 	}
 
-	@Override
-	protected void hideControls(FrameLayout layout) {
-	}
 
-	@Override
-	public void updateTextColor(int textColor, int shadowColor) {
-		super.updateTextColor(textColor, shadowColor);
-		rulerTextPaint.setColor(textColor);
-	}
-
-	@Override
-	protected void showControls(FrameLayout layout) {
-	}
-
-	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
 		if (!mapActivity.getMyApplication().getSettings().SHOW_RULER.get()) {
 			return;
@@ -93,7 +82,7 @@ public class RulerControl extends MapControls {
 
 		if (cacheRulerText != null) {
 			Rect bounds = rulerDrawable.getBounds();
-			int bottom = (int) (view.getHeight() - vmargin);
+			int bottom = (int) (view.getHeight() );
 			if (bounds.bottom != bottom) {
 				bounds.bottom = bottom;
 				bounds.top = bounds.bottom - rulerDrawable.getMinimumHeight();
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
index bbdbe1656a..ff7f039ec4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
@@ -7,66 +7,57 @@ import net.osmand.plus.views.OsmandMapTileView;
 
 public class AppearanceWidgetsFactory {
 
-    public static AppearanceWidgetsFactory INSTANCE = new AppearanceWidgetsFactory();
-    public static boolean POSITION_ON_THE_MAP = false;
+	public static AppearanceWidgetsFactory INSTANCE = new AppearanceWidgetsFactory();
+	public static boolean POSITION_ON_THE_MAP = false;
 
+	public void registerAppearanceWidgets(final MapActivity map, final MapInfoLayer mapInfoLayer,
+			final MapWidgetRegistry mapInfoControls) {
+		final OsmandMapTileView view = map.getMapView();
 
-    public void registerAppearanceWidgets(final MapActivity map, final MapInfoLayer mapInfoLayer,
-                                          final MapWidgetRegistry mapInfoControls) {
-        final OsmandMapTileView view = map.getMapView();
+		final MapWidgetRegistry.MapWidgetRegInfo showRuler = mapInfoControls.registerAppearanceWidget(0, 0,
+		// R.drawable.widget_ruler, R.drawable.widget_ruler,
+				R.string.map_widget_show_ruler, "showRuler", view.getSettings().SHOW_RULER);
+		showRuler.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				view.getSettings().SHOW_RULER.set(!view.getSettings().SHOW_RULER.get());
+				view.refreshMap();
+			}
+		});
+		final MapWidgetRegistry.MapWidgetRegInfo showDestinationArrow = mapInfoControls.registerAppearanceWidget(0, 0,
+				// R.drawable.widget_ruler, R.drawable.widget_ruler,
+				R.string.map_widget_show_destination_arrow, "show_destination_arrow",
+				view.getSettings().SHOW_DESTINATION_ARROW);
+		showDestinationArrow.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				view.getSettings().SHOW_DESTINATION_ARROW.set(!view.getSettings().SHOW_DESTINATION_ARROW.get());
+				mapInfoLayer.recreateControls();
+			}
+		});
 
+		final MapWidgetRegistry.MapWidgetRegInfo transparent = mapInfoControls.registerAppearanceWidget(0, 0,
+		// R.drawable.widget_ruler, R.drawable.widget_ruler,
+				R.string.map_widget_transparent, "transparent", view.getSettings().TRANSPARENT_MAP_THEME);
+		transparent.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				view.getSettings().TRANSPARENT_MAP_THEME.set(!view.getSettings().TRANSPARENT_MAP_THEME.get());
+				mapInfoLayer.recreateControls();
+			}
+		});
+		final MapWidgetRegistry.MapWidgetRegInfo centerPosition = mapInfoControls.registerAppearanceWidget(0, 0,
+		// R.drawable.widget_position_marker, R.drawable.widget_position_marker
+				R.string.always_center_position_on_map, "centerPosition", view.getSettings().CENTER_POSITION_ON_MAP);
+		centerPosition.setStateChangeListener(new Runnable() {
+			@Override
+			public void run() {
+				view.getSettings().CENTER_POSITION_ON_MAP.set(!view.getSettings().CENTER_POSITION_ON_MAP.get());
+				map.updateApplicationModeSettings();
+				view.refreshMap(true);
+				mapInfoLayer.recreateControls();
+			}
+		});
+	}
 
-//        final MapWidgetRegistry.MapWidgetRegInfo displayViewDirections = mapInfoControls.registerAppearanceWidget(R.drawable.widget_viewing_direction, R.string.map_widget_view_direction,
-//                "viewDirection", view.getSettings().SHOW_VIEW_ANGLE);
-//        displayViewDirections.setStateChangeListener(new Runnable() {
-//            @Override
-//            public void run() {
-//                view.getSettings().SHOW_VIEW_ANGLE.set(!view.getSettings().SHOW_VIEW_ANGLE.get());
-//                map.getMapViewTrackingUtilities().updateSettings();
-//            }
-//        });
-
-            final MapWidgetRegistry.MapWidgetRegInfo showRuler = mapInfoControls.registerAppearanceWidget(0, 0, /*R.drawable.widget_ruler, R.drawable.widget_ruler, */R.string.map_widget_show_ruler,
-                    "showRuler", view.getSettings().SHOW_RULER);
-            showRuler.setStateChangeListener(new Runnable() {
-                @Override
-                public void run() {
-                    view.getSettings().SHOW_RULER.set(!view.getSettings().SHOW_RULER.get());
-                    view.refreshMap();
-                }
-            });
-            final MapWidgetRegistry.MapWidgetRegInfo showDestinationArrow = mapInfoControls.registerAppearanceWidget(0, 0, /*R.drawable.widget_show_destination_arrow, R.drawable.widget_show_destination_arrow, */R.string.map_widget_show_destination_arrow,
-                    "show_destination_arrow", view.getSettings().SHOW_DESTINATION_ARROW);
-            showDestinationArrow.setStateChangeListener(new Runnable() {
-                @Override
-                public void run() {
-                    view.getSettings().SHOW_DESTINATION_ARROW.set(!view.getSettings().SHOW_DESTINATION_ARROW.get());
-                    mapInfoLayer.recreateControls();
-                }
-            });
-
-            final MapWidgetRegistry.MapWidgetRegInfo transparent = mapInfoControls.registerAppearanceWidget(0, 0, /*R.drawable.widget_transparent_skin, R.drawable.widget_transparent_skin, */R.string.map_widget_transparent,
-                    "transparent", view.getSettings().TRANSPARENT_MAP_THEME);
-            transparent.setStateChangeListener(new Runnable() {
-                @Override
-                public void run() {
-                    view.getSettings().TRANSPARENT_MAP_THEME.set(!view.getSettings().TRANSPARENT_MAP_THEME.get());
-                    mapInfoLayer.recreateControls();
-                }
-            });
-            final MapWidgetRegistry.MapWidgetRegInfo centerPosition = mapInfoControls.registerAppearanceWidget(0, 0, /*R.drawable.widget_position_marker, R.drawable.widget_position_marker,*/
-            		R.string.always_center_position_on_map,
-                    "centerPosition", view.getSettings().CENTER_POSITION_ON_MAP);
-            centerPosition.setStateChangeListener(new Runnable() {
-                @Override
-                public void run() {
-                    view.getSettings().CENTER_POSITION_ON_MAP.set(!view.getSettings().CENTER_POSITION_ON_MAP.get());
-                    map.updateApplicationModeSettings();
-					view.refreshMap(true);
-                    mapInfoLayer.recreateControls();
-                }
-            });
-        }
-
-    
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 499b27e25c..9229d4073c 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -8,7 +8,6 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmAndLocationProvider.GPSInfo;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
@@ -53,8 +52,8 @@ public class MapInfoWidgetsFactory {
 		this.scaleCoefficient = scaleCoefficient;
 	}
 
-	public TextInfoWidget createAltitudeControl(final MapActivity map, Paint paintText, Paint paintSubText) {
-		final TextInfoWidget altitudeControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+	public TextInfoWidget createAltitudeControl(final MapActivity map) {
+		final TextInfoWidget altitudeControl = new TextInfoWidget(map) {
 			private int cachedAlt = 0;
 
 			@Override
@@ -87,10 +86,10 @@ public class MapInfoWidgetsFactory {
 		return altitudeControl;
 	}
 	
-	public TextInfoWidget createGPSInfoControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+	public TextInfoWidget createGPSInfoControl(final MapActivity map) {
 		final OsmandApplication app = map.getMyApplication();
 		final OsmAndLocationProvider loc = app.getLocationProvider();
-		final TextInfoWidget gpsInfoControl = new TextInfoWidget(map, 3, paintText, paintSubText) {
+		final TextInfoWidget gpsInfoControl = new TextInfoWidget(map) {
 			private int u = -1;
 			private int f = -1;
 
@@ -178,46 +177,6 @@ public class MapInfoWidgetsFactory {
 
 
 
-	public ImageViewWidget createBackToLocation(final MapActivity map){
-		final Drawable backToLoc = map.getResources().getDrawable(R.drawable.back_to_loc);
-		final Drawable backToLocWhite = map.getResources().getDrawable(R.drawable.back_to_loc_white);
-		final Drawable backToLocDisabled = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled);
-		final Drawable backToLocDisabledWhite = map.getResources().getDrawable(R.drawable.la_backtoloc_disabled_white);
-		final Drawable backToLocTracked = map.getResources().getDrawable(R.drawable.back_to_loc_tracked);
-		final Drawable backToLocTrackedWhite = map.getResources().getDrawable(R.drawable.back_to_loc_tracked_white);
-		ImageViewWidget backToLocation = new ImageViewWidget(map) {
-			Drawable lastDrawable = null;
-			
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
-				boolean enabled = map.getMyApplication().getLocationProvider().getLastKnownLocation() != null;
-				boolean tracked = map.getMapViewTrackingUtilities().isMapLinkedToLocation();
-				Drawable d;
-				if(!enabled) {
-					d = nightMode ? backToLocDisabledWhite : backToLocDisabled; 
-				} else if(tracked) {
-					d = nightMode ? backToLocTrackedWhite : backToLocTracked;
-				} else {
-					d = nightMode ? backToLocWhite : backToLoc;
-				}
-				if(d != lastDrawable) {
-					lastDrawable = d;
-					setImageDrawable(d);
-				}
-				return true;
-			}
-		};
-		backToLocation.setPadding((int) (5 * scaleCoefficient), 0, (int) (5 * scaleCoefficient), 0);
-		backToLocation.setImageDrawable(map.getResources().getDrawable(R.drawable.back_to_loc));
-		backToLocation.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				map.getMapViewTrackingUtilities().backToLocationImpl();
-			}
-		});
-		return backToLocation;
-	}
 	
 	private static boolean isScreenLocked = false;
 	private Drawable lockEnabled;
@@ -279,16 +238,17 @@ public class MapInfoWidgetsFactory {
 
 			private void blinkIcon() {
 				lockView.setBackgroundDrawable(lockDisabled);
-				view.getView().postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						lockView.setBackgroundDrawable(lockEnabled);
-					}
-				}, 300);
+				// TODO!
+//				map.postDelayed(new Runnable() {
+//					@Override
+//					public void run() {
+//						lockView.setBackgroundDrawable(lockEnabled);
+//					}
+//				}, 300);
 			}
 
 		});
-		final FrameLayout parent = (FrameLayout) view.getParent();
+		final FrameLayout parent = null; // TODO 
 		lockView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 195ecc0d76..9f207dbdd8 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -64,7 +64,8 @@ public class MapWidgetRegistry {
 	
 	
 	
-	public void registerSideWidget(BaseMapWidget m, int drawableDark,int drawableLight, int messageId, String key, boolean left, int priorityOrder) {
+	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
+			int messageId, String key, boolean left, int priorityOrder) {
 		MapWidgetRegInfo ii = new MapWidgetRegInfo();
 		ii.key = key;
 		ii.visibleModes = new LinkedHashSet<ApplicationMode>(); 
@@ -91,12 +92,12 @@ public class MapWidgetRegistry {
 				ii.visibleCollapsible.add(ms);
 			}
 		}
-		if (m != null)
-			m.setContentTitle(m.getContext().getString(messageId));
+		if (widget != null)
+			widget.setContentTitle(widget.getContext().getString(messageId));
 		ii.drawableDark = drawableDark;
 		ii.drawableLight = drawableLight;
 		ii.messageId = messageId;
-		ii.m = m;
+		ii.widget = widget;
 		ii.priorityOrder = priorityOrder;
 		if(left) {
 			this.left.add(ii);
@@ -179,9 +180,9 @@ public class MapWidgetRegistry {
 		Set<MapWidgetRegInfo> st = left ? this.left : this.right;
 		for (MapWidgetRegInfo r : st) {
 			if (r.visibleCollapsible != null && r.visibleCollapsible.contains(appMode)) {
-				stack.addCollapsedView((BaseMapWidget) r.m);
+				stack.addCollapsedView((BaseMapWidget) r.widget);
 			} else if (r.visibleModes.contains(appMode)) {
-				stack.addStackView((BaseMapWidget) r.m);
+				stack.addStackView((BaseMapWidget) r.widget);
 			}
 		}
 	}
@@ -224,7 +225,7 @@ public class MapWidgetRegistry {
 	
 	
 	public static class MapWidgetRegInfo implements Comparable<MapWidgetRegInfo>  {
-		public View m;
+		public TextInfoWidget widget;
 		public int drawableDark;
 		public int drawableLight;
 		public int messageId;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 0b3a78f220..f29cab3356 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -226,13 +226,13 @@ public class RouteInfoWidgetsFactory {
 		return nextTurnInfo;
 	}
 	
-	public TextInfoWidget createTimeControl(final MapActivity map, Paint paintText, Paint paintSubText){
+	public TextInfoWidget createTimeControl(final MapActivity map){
 		final RoutingHelper routingHelper = map.getRoutingHelper();
 		final Drawable time = map.getResources().getDrawable(R.drawable.widget_time);
 		final Drawable timeToGo = map.getResources().getDrawable(R.drawable.widget_time_to_distance);
 		final OsmandApplication ctx = map.getMyApplication();
 		final OsmandPreference<Boolean> showArrival = ctx.getSettings().SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME;
-		final TextInfoWidget leftTimeControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+		final TextInfoWidget leftTimeControl = new TextInfoWidget(map) {
 			private long cachedLeftTime = 0;
 			
 			@Override
@@ -246,7 +246,7 @@ public class RouteInfoWidgetsFactory {
 							long toFindTime = time * 1000 + System.currentTimeMillis();
 							if (Math.abs(toFindTime - cachedLeftTime) > 30000) {
 								cachedLeftTime = toFindTime;
-								setContentTitle(getContext().getString(R.string.access_arrival_time));
+								setContentTitle(map.getString(R.string.access_arrival_time));
 								if (DateFormat.is24HourFormat(ctx)) {
 									setText(DateFormat.format("k:mm", toFindTime).toString(), null); //$NON-NLS-1$
 								} else {
@@ -260,7 +260,7 @@ public class RouteInfoWidgetsFactory {
 								cachedLeftTime = time;
 								int hours = time / (60 * 60);
 								int minutes = (time / 60) % 60;
-								setContentTitle(getContext().getString(R.string.map_widget_time));
+								setContentTitle(map.getString(R.string.map_widget_time));
 								setText(String.format("%d:%02d", hours, minutes), null); //$NON-NLS-1$
 								return true;
 							}
@@ -281,7 +281,6 @@ public class RouteInfoWidgetsFactory {
 			public void onClick(View v) {
 				showArrival.set(!showArrival.get());
 				leftTimeControl.setImageDrawable(showArrival.get()? time : timeToGo);
-				leftTimeControl.requestLayout();
 				map.getMapView().refreshMap();
 			}
 			
@@ -292,10 +291,10 @@ public class RouteInfoWidgetsFactory {
 	}
 	
 	
-	public TextInfoWidget createPlainTimeControl(final MapActivity map, Paint paintText, Paint paintSubText){
+	public TextInfoWidget createPlainTimeControl(final MapActivity map){
 		final Drawable timeToGo = map.getResources().getDrawable(R.drawable.widget_time_to_distance);
 		final OsmandApplication ctx = map.getMyApplication();
-		final TextInfoWidget plainTimeControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+		final TextInfoWidget plainTimeControl = new TextInfoWidget(map) {
 			private long cachedLeftTime = 0;
 			
 			@Override
@@ -319,11 +318,11 @@ public class RouteInfoWidgetsFactory {
 	}
 	
 	
-	public TextInfoWidget createMaxSpeedControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+	public TextInfoWidget createMaxSpeedControl(final MapActivity map) {
 		final RoutingHelper rh = map.getMyApplication().getRoutingHelper();
 		final OsmAndLocationProvider locationProvider = map.getMyApplication().getLocationProvider();
 		final MapViewTrackingUtilities trackingUtilities = map.getMapViewTrackingUtilities();
-		final TextInfoWidget speedControl = new TextInfoWidget(map, 3, paintText, paintSubText) {
+		final TextInfoWidget speedControl = new TextInfoWidget(map) {
 			private float cachedSpeed = 0;
 
 			@Override
@@ -365,9 +364,9 @@ public class RouteInfoWidgetsFactory {
 	
 	
 	
-	public TextInfoWidget createSpeedControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+	public TextInfoWidget createSpeedControl(final MapActivity map) {
 		final OsmandApplication app = map.getMyApplication();
-		final TextInfoWidget speedControl = new TextInfoWidget(map, 3, paintText, paintSubText) {
+		final TextInfoWidget speedControl = new TextInfoWidget(map) {
 			private float cachedSpeed = 0;
 
 			@Override
@@ -412,13 +411,12 @@ public class RouteInfoWidgetsFactory {
 		private float[] calculations = new float[1];
 		private int cachedMeters;
 
-		public DistanceToPointInfoControl(Context ctx, int leftMargin, Paint textPaint, Paint subtextPaint, Drawable d,
-				final OsmandMapTileView view) {
-			super(ctx, leftMargin, textPaint, subtextPaint);
-			this.view = view;
+		public DistanceToPointInfoControl(MapActivity ma, Drawable d) {
+			super(ma);
+			this.view = ma.getMapView();
 			setImageDrawable(d);
 			setText(null, null);
-			setOnClickListener(new OnClickListener() {
+			setOnClickListener(new View.OnClickListener() {
 
 				@Override
 				public void onClick(View v) {
@@ -471,10 +469,9 @@ public class RouteInfoWidgetsFactory {
 		}
 	}
 	
-	public TextInfoWidget createDistanceControl(final MapActivity map, Paint paintText, Paint paintSubText) {
-		final OsmandMapTileView view = map.getMapView();
-		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map, 0, paintText, paintSubText, map.getResources()
-				.getDrawable(R.drawable.widget_target), view) {
+	public TextInfoWidget createDistanceControl(final MapActivity map) {
+		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map,map.getResources()
+				.getDrawable(R.drawable.widget_target)) {
 			@Override
 			public LatLon getPointToNavigate() {
 				TargetPoint p = map.getPointToNavigate();
@@ -492,11 +489,10 @@ public class RouteInfoWidgetsFactory {
 		return distanceControl;
 	}
 	
-	public TextInfoWidget createIntermediateDistanceControl(final MapActivity map, Paint paintText, Paint paintSubText) {
-		final OsmandMapTileView view = map.getMapView();
+	public TextInfoWidget createIntermediateDistanceControl(final MapActivity map) {
 		final TargetPointsHelper targets = map.getMyApplication().getTargetPointsHelper();
-		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map, 0, paintText, paintSubText, map.getResources()
-				.getDrawable(R.drawable.widget_intermediate), view) {
+		DistanceToPointInfoControl distanceControl = new DistanceToPointInfoControl(map, map.getResources()
+				.getDrawable(R.drawable.widget_intermediate)) {
 
 			@Override
 			protected void click(OsmandMapTileView view) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index d323b52f57..fe2ce87d8f 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -1,115 +1,101 @@
 package net.osmand.plus.views.mapwidgets;
 
-import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.R;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
+import android.app.Activity;
 import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.TextView;
 
-public class TextInfoWidget extends BaseMapWidget {
+public class TextInfoWidget  {
 
-	String text;
-	Paint textPaint;
-	String subtext;
-	Paint subtextPaint;
-	int leftMargin = 0;
-	private Drawable imageDrawable;
-	private float scaleCoefficient;
+	private String contentTitle;
+	
+	private View view;
+	private ImageView imageView;
+	private TextView textView;
+	private TextView smallTextView;
 
-	public TextInfoWidget(Context ctx, int leftMargin, Paint textPaint, Paint subtextPaint) {
-		super(ctx);
-		scaleCoefficient = MapInfoLayer.scaleCoefficient;
-		this.leftMargin = leftMargin;
-		this.textPaint = textPaint;
-		this.subtextPaint = subtextPaint;
+	public TextInfoWidget(Activity activity) {
+		view = activity.getLayoutInflater().inflate(R.layout.map_hud_widget, null);
+		imageView = (ImageView) view.findViewById(R.id.widget_icon);
+		textView = (TextView) view.findViewById(R.id.widget_text);
+		smallTextView = (TextView) view.findViewById(R.id.widget_text_small);
 	}
 	
 	public void setImageDrawable(Drawable imageDrawable) {
-		this.imageDrawable = imageDrawable;
-	}
-	
-	public Drawable getImageDrawable() {
-		return imageDrawable;
-	}
-
-	@Override
-	protected void onWLayout(int w, int h) {
-		if (imageDrawable != null) {
-			// Unknown reason to add 3*scaleCoefficient
-			imageDrawable.setBounds(0, (int) (3 * scaleCoefficient), imageDrawable.getMinimumWidth(), imageDrawable.getMinimumHeight()
-					+ (int) (3 * scaleCoefficient));
+		if(imageDrawable != null) {
+			imageView.setImageDrawable(imageDrawable);
+			imageView.setVisibility(View.VISIBLE);
+		} else {
+			imageView.setVisibility(View.INVISIBLE);
 		}
 	}
 	
+	public void setContentDescription(CharSequence text) {
+		if (contentTitle != null) {
+			view.setContentDescription(contentTitle + " " + text); //$NON-NLS-1$
+		} else { 
+			view.setContentDescription(text);
+		}
+	}
 
+	public void setContentTitle(String text) {
+		contentTitle = text;
+		view.setContentDescription(text);
+	}
+	
 	public void setText(String text, String subtext) {
-		this.text = text;
-		this.subtext = subtext;
 		if (text != null) {
-			if (subtext != null)
+			if (subtext != null) {
 				setContentDescription(text + " " + subtext); //$NON-NLS-1$
-			else setContentDescription(text);
-		} else {
+			} else {
+				setContentDescription(text);
+			}
+		} else if(subtext != null){
 			setContentDescription(subtext);
 		}
-		if(this.text != null && this.text.length() > 7) {
-			this.text = this.text.substring(0, 6) +"..";
+//		if(this.text != null && this.text.length() > 7) {
+//			this.text = this.text.substring(0, 6) +"..";
+//		}
+		if(text == null) {
+			textView.setText("");
+		} else {
+			textView.setText(text);
+		}
+		if(subtext == null) {
+			smallTextView.setText("");
+		} else {
+			smallTextView.setText(subtext);
 		}
 		updateVisibility(text != null);
-		requestLayout();
-		invalidate();
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		// ignore attributes
-		int w = 0;
-		int h = 0;
-		if (text != null) {
-			if (imageDrawable != null) {
-				w += imageDrawable.getMinimumWidth() + 2 * scaleCoefficient;
-			}
-			w += leftMargin;
-			w += textPaint.measureText(text);
-			if (subtext != null) {
-				w += subtextPaint.measureText(subtext) + 2 * scaleCoefficient;
-			}
-
-			h = (int) (5 * scaleCoefficient + Math.max(textPaint.getTextSize(), subtextPaint.getTextSize()));
-			if (imageDrawable != null) {
-				h = Math.max(h, (int) (imageDrawable.getMinimumHeight()));
-			}
-		}
-		setWDimensions(w, h);
-	}
-
-	@Override
-	protected void onDraw(Canvas cv) {
-		super.onDraw(cv);
-		if (isVisible()) {
-			int margin = 0;
-			if (imageDrawable != null) {
-				imageDrawable.draw(cv);
-				margin = (int) (imageDrawable.getBounds().width() + 2 * scaleCoefficient);
-			}
-			margin += leftMargin;
-			drawShadowText(cv, text, margin, getWHeight() - 3 * scaleCoefficient, textPaint);
-			if (subtext != null) {
-				drawShadowText(cv, subtext, margin + 2 * scaleCoefficient + textPaint.measureText(text), getWHeight() - 3
-						* scaleCoefficient, subtextPaint);
-			}
-		}
 	}
 	
-
-	public boolean isVisible() {
-		return text != null && (text.length() > 0 || subtext != null);
-	}
-
-	@Override
-	public boolean updateInfo(DrawSettings drawSettings) {
+	protected boolean updateVisibility(boolean visible) {
+		if (visible != (view.getVisibility() == View.VISIBLE)) {
+			if (visible) {
+				view.setVisibility(View.VISIBLE);
+			} else {
+				view.setVisibility(View.GONE);
+			}
+			view.invalidate();
+			return true;
+		}
 		return false;
 	}
 	
+	public boolean isVisible() {
+		return view.getVisibility() == View.VISIBLE;
+	}
+
+	public boolean updateInfo(DrawSettings drawSettings) {
+		return false;
+	}
+
+	public void setOnClickListener(OnClickListener onClickListener) {
+		view.setOnClickListener(onClickListener);
+	}
+	
 }
\ No newline at end of file

From 55163b7a60f810b102651f638a2e92753bf475d8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 20:37:51 +0100
Subject: [PATCH 11/23] Add lib for eclipse compile

---
 .../DistanceCalculatorPlugin.java             |    8 +-
 .../parkingpoint/ParkingPositionPlugin.java   |   10 +-
 eclipse-compile/fab/.classpath                |    9 +
 eclipse-compile/fab/.gitignore                |    2 +
 eclipse-compile/fab/.project                  |   39 +
 eclipse-compile/fab/AndroidManifest.xml       |   21 +
 .../com/software/shell/fab/ActionButton.java  | 1432 +++++++++++++++++
 .../fab/ActionButtonOutlineProvider.java      |   74 +
 .../shell/fab/FloatingActionButton.java       |  198 +++
 .../software/shell/fab/MetricsConverter.java  |   50 +
 eclipse-compile/fab/project.properties        |   15 +
 .../fab/res/anim-v11/fab_jump_from_down.xml   |   37 +
 .../fab/res/anim-v11/fab_jump_from_right.xml  |   38 +
 .../fab/res/anim-v11/fab_jump_to_down.xml     |   38 +
 .../fab/res/anim-v11/fab_jump_to_right.xml    |   38 +
 .../fab/res/anim-v11/fab_roll_from_down.xml   |   35 +
 .../fab/res/anim-v11/fab_roll_from_right.xml  |   35 +
 .../fab/res/anim-v11/fab_roll_to_down.xml     |   36 +
 .../fab/res/anim-v11/fab_roll_to_right.xml    |   36 +
 .../fab/res/anim-v11/fab_scale_down.xml       |   30 +
 .../fab/res/anim-v11/fab_scale_up.xml         |   29 +
 eclipse-compile/fab/res/anim/fab_fade_in.xml  |   25 +
 eclipse-compile/fab/res/anim/fab_fade_out.xml |   25 +
 .../fab/res/anim/fab_jump_from_down.xml       |   36 +
 .../fab/res/anim/fab_jump_from_right.xml      |   37 +
 .../fab/res/anim/fab_jump_to_down.xml         |   37 +
 .../fab/res/anim/fab_jump_to_right.xml        |   37 +
 .../fab/res/anim/fab_roll_from_down.xml       |   48 +
 .../fab/res/anim/fab_roll_from_right.xml      |   48 +
 .../fab/res/anim/fab_roll_to_down.xml         |   48 +
 .../fab/res/anim/fab_roll_to_right.xml        |   48 +
 .../fab/res/anim/fab_scale_down.xml           |   41 +
 eclipse-compile/fab/res/anim/fab_scale_up.xml |   42 +
 .../fab/res/drawable-hdpi/fab_plus_icon.png   |  Bin 0 -> 1104 bytes
 .../fab/res/drawable-mdpi/fab_plus_icon.png   |  Bin 0 -> 1055 bytes
 .../fab/res/drawable-xhdpi/fab_plus_icon.png  |  Bin 0 -> 1113 bytes
 .../fab/res/drawable-xxhdpi/fab_plus_icon.png |  Bin 0 -> 1182 bytes
 .../res/drawable-xxxhdpi/fab_plus_icon.png    |  Bin 0 -> 1105 bytes
 .../fab/res/values-sw600dp/dimens.xml         |   23 +
 eclipse-compile/fab/res/values/attrs.xml      |   47 +
 eclipse-compile/fab/res/values/colors.xml     |   86 +
 eclipse-compile/fab/res/values/dimens.xml     |   24 +
 42 files changed, 2851 insertions(+), 11 deletions(-)
 create mode 100644 eclipse-compile/fab/.classpath
 create mode 100644 eclipse-compile/fab/.gitignore
 create mode 100644 eclipse-compile/fab/.project
 create mode 100644 eclipse-compile/fab/AndroidManifest.xml
 create mode 100644 eclipse-compile/fab/java/com/software/shell/fab/ActionButton.java
 create mode 100644 eclipse-compile/fab/java/com/software/shell/fab/ActionButtonOutlineProvider.java
 create mode 100644 eclipse-compile/fab/java/com/software/shell/fab/FloatingActionButton.java
 create mode 100644 eclipse-compile/fab/java/com/software/shell/fab/MetricsConverter.java
 create mode 100644 eclipse-compile/fab/project.properties
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_jump_from_down.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_jump_from_right.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_jump_to_down.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_jump_to_right.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_roll_from_down.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_roll_from_right.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_roll_to_down.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_roll_to_right.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_scale_down.xml
 create mode 100644 eclipse-compile/fab/res/anim-v11/fab_scale_up.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_fade_in.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_fade_out.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_jump_from_down.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_jump_from_right.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_jump_to_down.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_jump_to_right.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_roll_from_down.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_roll_from_right.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_roll_to_down.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_roll_to_right.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_scale_down.xml
 create mode 100644 eclipse-compile/fab/res/anim/fab_scale_up.xml
 create mode 100644 eclipse-compile/fab/res/drawable-hdpi/fab_plus_icon.png
 create mode 100644 eclipse-compile/fab/res/drawable-mdpi/fab_plus_icon.png
 create mode 100644 eclipse-compile/fab/res/drawable-xhdpi/fab_plus_icon.png
 create mode 100644 eclipse-compile/fab/res/drawable-xxhdpi/fab_plus_icon.png
 create mode 100644 eclipse-compile/fab/res/drawable-xxxhdpi/fab_plus_icon.png
 create mode 100644 eclipse-compile/fab/res/values-sw600dp/dimens.xml
 create mode 100644 eclipse-compile/fab/res/values/attrs.xml
 create mode 100644 eclipse-compile/fab/res/values/colors.xml
 create mode 100644 eclipse-compile/fab/res/values/dimens.xml

diff --git a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
index 25ade182d4..3de17feeec 100644
--- a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
@@ -31,7 +31,6 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.views.ContextMenuLayer;
 import net.osmand.plus.views.MapInfoLayer;
@@ -56,7 +55,6 @@ import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.PointF;
 import android.os.AsyncTask;
-import android.preference.PreferenceScreen;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
@@ -118,7 +116,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 	private void registerWidget(MapActivity activity) {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null ) {
-			distanceControl = createDistanceControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
+			distanceControl = createDistanceControl(activity);
 			mapInfoLayer.getMapInfoControls().registerSideWidget(distanceControl,
 					R.drawable.widget_distance, R.drawable.widget_distance, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21);
 			mapInfoLayer.recreateControls();
@@ -371,8 +369,8 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 		
 	}
 	
-	private TextInfoWidget createDistanceControl(final MapActivity activity, Paint paintText, Paint paintSubText) {
-		final TextInfoWidget distanceControl = new TextInfoWidget(activity, 0, paintText, paintSubText);
+	private TextInfoWidget createDistanceControl(final MapActivity activity) {
+		final TextInfoWidget distanceControl = new TextInfoWidget(activity);
 		distanceControl.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 45756c8f2b..bdc556a6e1 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -18,7 +18,6 @@ import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -26,7 +25,6 @@ import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Paint;
 import android.text.format.DateFormat;
 import android.text.format.Time;
 import android.view.View;
@@ -56,7 +54,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
     private OsmandApplication app;
 
 	private ParkingPositionLayer parkingLayer;
-	private BaseMapWidget parkingPlaceControl;
+	private TextInfoWidget parkingPlaceControl;
 	private final CommonPreference<Float> parkingLat;
 	private final CommonPreference<Float> parkingLon;
 	private CommonPreference<Boolean> parkingType;
@@ -191,7 +189,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 	private void registerWidget(MapActivity activity) {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null) {
-			parkingPlaceControl = createParkingPlaceInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
+			parkingPlaceControl = createParkingPlaceInfoControl(activity);
 			mapInfoLayer.getMapInfoControls().registerSideWidget(parkingPlaceControl,
 					R.drawable.widget_parking, R.drawable.widget_parking, R.string.map_widget_parking, "parking", false, 8);
 			mapInfoLayer.recreateControls();
@@ -443,8 +441,8 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 	 * the current position on the map 
 	 * and the location of the parked car
 	 */
-	private TextInfoWidget createParkingPlaceInfoControl(final MapActivity map, Paint paintText, Paint paintSubText) {
-		TextInfoWidget parkingPlaceControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+	private TextInfoWidget createParkingPlaceInfoControl(final MapActivity map) {
+		TextInfoWidget parkingPlaceControl = new TextInfoWidget(map) {
 			private float[] calculations = new float[1];
 			private int cachedMeters = 0;			
 			
diff --git a/eclipse-compile/fab/.classpath b/eclipse-compile/fab/.classpath
new file mode 100644
index 0000000000..c6e9dc9f1d
--- /dev/null
+++ b/eclipse-compile/fab/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="java"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/eclipse-compile/fab/.gitignore b/eclipse-compile/fab/.gitignore
new file mode 100644
index 0000000000..e614fbbef9
--- /dev/null
+++ b/eclipse-compile/fab/.gitignore
@@ -0,0 +1,2 @@
+bin
+gen
diff --git a/eclipse-compile/fab/.project b/eclipse-compile/fab/.project
new file mode 100644
index 0000000000..b53f0578e5
--- /dev/null
+++ b/eclipse-compile/fab/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ShellFab</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse-compile/fab/AndroidManifest.xml b/eclipse-compile/fab/AndroidManifest.xml
new file mode 100644
index 0000000000..7e0d38def5
--- /dev/null
+++ b/eclipse-compile/fab/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:10:53
+-->
+<manifest 
+		package="com.software.shell.fab"
+		/>
diff --git a/eclipse-compile/fab/java/com/software/shell/fab/ActionButton.java b/eclipse-compile/fab/java/com/software/shell/fab/ActionButton.java
new file mode 100644
index 0000000000..0da0da5d0c
--- /dev/null
+++ b/eclipse-compile/fab/java/com/software/shell/fab/ActionButton.java
@@ -0,0 +1,1432 @@
+/*
+ * Copyright 2015 Shell Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * File created: 2015-01-17 10:39:13
+ */
+
+package com.software.shell.fab;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.*;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+/**
+ * This class represents a <b>Action Button</b>, which is used in 
+ * <a href="http://www.google.com.ua/design/spec/components/buttons.html">Material Design</a>
+ *
+ * @author Vladislav
+ * @version 1.0.3
+ * @since 1.0.0
+ */
+public class ActionButton extends View {
+
+	/**
+	 * Logging tag
+	 */
+	private static final String LOG_TAG = "FAB";
+
+	/**
+	 * <b>Action Button</b> type
+	 */
+	private Type type = Type.DEFAULT;
+
+	/**
+	 * <b>Action Button</b> state
+	 */
+	private State state = State.NORMAL;
+
+	/**
+	 * <b>Action Button</b> color in {@link State#NORMAL} state 
+	 */
+	private int buttonColor = Color.LTGRAY;
+
+	/**
+	 * <b>Action Button</b> color in {@link State#PRESSED} state 
+	 */
+	private int buttonColorPressed = Color.DKGRAY;
+
+	/**
+	 * Shadow radius expressed in actual pixels
+	 */
+	private float shadowRadius = MetricsConverter.dpToPx(getContext(), 2.0f);
+
+	/**
+	 * Shadow X-axis offset expressed in actual pixels
+	 */
+	private float shadowXOffset = MetricsConverter.dpToPx(getContext(), 1.0f);
+
+	/**
+	 * Shadow Y-axis offset expressed in actual pixels 
+	 */
+	private float shadowYOffset = MetricsConverter.dpToPx(getContext(), 1.5f);
+
+	/**
+	 * Shadow color 
+	 */
+	private int shadowColor = Color.parseColor("#757575");
+
+	/**
+	 * Stroke width 
+	 */
+	private float strokeWidth = 0.0f;
+
+	/**
+	 * Stroke color 
+	 */
+	private int strokeColor = Color.BLACK;
+
+	/**
+	 * <b>Action Button</b> image drawable centered inside the view  
+	 */
+	private Drawable image;
+
+	/**
+	 * Size of the <b>Action Button</b> image inside the view
+	 */
+	private float imageSize = MetricsConverter.dpToPx(getContext(), 24.0f);
+
+	/**
+	 * Animation, which is used while showing <b>Action Button</b>
+	 */
+	private Animation showAnimation;
+
+	/**
+	 * Animation, which is used while hiding or dismissing <b>Action Button</b> 
+	 */
+	private Animation hideAnimation;
+
+	/**
+	 * {@link android.graphics.Paint}, which is used for drawing the elements of
+	 * <b>Action Button</b>
+	 */
+	protected final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+	/**
+	 * Creates an instance of the <b>Action Button</b>
+	 * <p> 
+	 * Used when instantiating <b>Action Button</b> programmatically
+	 *  
+	 * @param context context the view is running in
+	 */
+	public ActionButton(Context context) {
+		super(context);
+		initActionButton();
+	}
+
+	/**
+	 * Creates an instance of the <b>Action Button</b>
+	 * <p> 
+	 * Used when inflating the declared <b>Action Button</b> 
+	 * within XML resource
+	 *
+	 * @param context context the view is running in
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	public ActionButton(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initActionButton(context, attrs, 0, 0);
+	}
+
+	/**
+	 * Creates an instance of the <b>Action Button</b>
+	 * <p> 
+	 * Used when inflating the declared <b>Action Button</b> 
+	 * within XML resource
+	 *
+	 * @param context context the view is running in
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 * @param defStyleAttr attribute in the current theme that contains a
+	 *        reference to a style resource that supplies default values for
+	 *        the view. Can be 0 to not look for defaults
+	 */
+	public ActionButton(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		initActionButton(context, attrs, defStyleAttr, 0);
+	}
+
+	/**
+	 * Creates an instance of the <b>Action Button</b>
+	 * <p>
+	 * Used when inflating the declared <b>Action Button</b> 
+	 * within XML resource
+	 * <p>
+	 * Might be called if target API is LOLLIPOP (21) and higher
+	 *  
+	 * @param context context the view is running in
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 * @param defStyleAttr attribute in the current theme that contains a
+	 *        reference to a style resource that supplies default values for
+	 *        the view. Can be 0 to not look for defaults
+	 * @param defStyleRes resource identifier of a style resource that
+	 *        supplies default values for the view, used only if
+	 *        defStyleAttr is 0 or can not be found in the theme. Can be 0
+	 *        to not look for defaults
+	 */
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public ActionButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+		initActionButton(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	/**
+	 * Initializes the <b>Action Button</b>, which is created programmatically 
+	 */
+	private void initActionButton() {
+		initLayerType();
+		Log.v(LOG_TAG, "Action Button initialized");
+	}
+
+	/**
+	 * Initializes the <b>Action Button</b>, which is declared within XML resource
+	 * <p>
+	 * Makes calls to different initialization methods for parameters initialization.
+	 * For those parameters, which are not declared in the XML resource, 
+	 * the default value will be used 
+	 *
+	 * @param context context the view is running in
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 * @param defStyleAttr attribute in the current theme that contains a
+	 *        reference to a style resource that supplies default values for
+	 *        the view. Can be 0 to not look for defaults
+	 * @param defStyleRes resource identifier of a style resource that
+	 *        supplies default values for the view, used only if
+	 *        defStyleAttr is 0 or can not be found in the theme. Can be 0
+	 *        to not look for defaults
+	 */
+	private void initActionButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		initLayerType();
+		TypedArray attributes = context.getTheme().obtainStyledAttributes(attrs, R.styleable.ActionButton,
+				defStyleAttr, defStyleRes);
+		try {
+			initType(attributes);
+			initButtonColor(attributes);
+			initButtonColorPressed(attributes);
+			initShadowRadius(attributes);
+			initShadowXOffset(attributes);
+			initShadowYOffset(attributes);
+			initShadowColor(attributes);
+			initStrokeWidth(attributes);
+			initStrokeColor(attributes);
+			initImage(attributes);
+			initImageSize(attributes);
+			initShowAnimation(attributes);
+			initHideAnimation(attributes);
+		} catch (Exception e) {
+			Log.e(LOG_TAG, "Unable to read attr", e);
+		} finally {
+			attributes.recycle();
+		}
+		Log.v(LOG_TAG, "Action Button initialized");
+	}
+
+	/**
+	 * Initializes the layer type needed for shadows drawing
+	 * <p>
+	 * Might be called if target API is HONEYCOMB (11) and higher
+	 */
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	private void initLayerType() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			setLayerType(LAYER_TYPE_SOFTWARE, paint);
+			Log.v(LOG_TAG, "Layer type initialized");
+		}
+	}
+
+	/**
+	 * Initializes the {@link Type} of <b>Action Button</b>
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initType(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_type)) {
+			final int id = attrs.getInteger(R.styleable.ActionButton_type, type.getId());
+			type = Type.forId(id);
+			Log.v(LOG_TAG, "Initialized type: " + getType());
+		}
+	}
+
+	/**
+	 * Initializes the <b>Action Button</b> color for 
+	 * {@link #state} set to {@link State#NORMAL} 
+	 *  
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initButtonColor(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_button_color)) {
+			buttonColor = attrs.getColor(R.styleable.ActionButton_button_color, buttonColor);
+			Log.v(LOG_TAG, "Initialized button color: " + getButtonColor());
+		}
+	}
+
+	/**
+	 * Initializes the <b>Action Button</b> color for
+	 * {@link #state} set to {@link State#PRESSED}
+	 * 
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initButtonColorPressed(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_button_colorPressed)) {
+			buttonColorPressed = attrs.getColor(R.styleable.ActionButton_button_colorPressed,
+					buttonColorPressed);
+			Log.v(LOG_TAG, "Initialized button color pressed: " + getButtonColorPressed());
+		}
+	}
+
+	/**
+	 * Initializes the shadow radius
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initShadowRadius(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_shadow_radius)) {
+			shadowRadius = attrs.getDimension(R.styleable.ActionButton_shadow_radius, shadowRadius);
+			Log.v(LOG_TAG, "Initialized shadow radius: " + getShadowRadius());
+		}
+	}
+
+	/**
+	 * Initializes the shadow X-axis offset
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initShadowXOffset(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_shadow_xOffset)) {
+			shadowXOffset = attrs.getDimension(R.styleable.ActionButton_shadow_xOffset, shadowXOffset);
+			Log.v(LOG_TAG, "Initialized shadow X-axis offset: " + getShadowXOffset());
+		}
+	}
+
+	/**
+	 * Initializes the shadow Y-axis offset
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initShadowYOffset(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_shadow_yOffset)) {
+			shadowYOffset = attrs.getDimension(R.styleable.ActionButton_shadow_yOffset, shadowYOffset);
+			Log.v(LOG_TAG, "Initialized shadow Y-axis offset: " + getShadowYOffset());
+		}
+	}
+
+	/**
+	 * Initializes the shadow color
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initShadowColor(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_shadow_color)) {
+			shadowColor = attrs.getColor(R.styleable.ActionButton_shadow_color, shadowColor);
+			Log.v(LOG_TAG, "Initialized shadow color: " + getShadowColor());
+		}
+	}
+
+	/**
+	 * Initializes the stroke width
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initStrokeWidth(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_stroke_width)) {
+			strokeWidth = attrs.getDimension(R.styleable.ActionButton_stroke_width, strokeWidth);
+			Log.v(LOG_TAG, "Initialized stroke width: " + getStrokeWidth());
+		}
+	}
+
+	/**
+	 * Initializes the stroke color
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initStrokeColor(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_stroke_color)) {
+			strokeColor = attrs.getColor(R.styleable.ActionButton_stroke_color, strokeColor);
+			Log.v(LOG_TAG, "Initialized stroke color: " + getStrokeColor());
+		}
+	}
+
+	/**
+	 * Initializes the animation, which is used while showing 
+	 * <b>Action Button</b>
+	 *  
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initShowAnimation(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_show_animation)) {
+			final int animResId = attrs.getResourceId(R.styleable.ActionButton_show_animation,
+					Animations.NONE.animResId);
+			showAnimation = Animations.load(getContext(), animResId);
+			Log.v(LOG_TAG, "Initialized animation on show");
+		}
+	}
+
+	/**
+	 * Initializes the animation, which is used while hiding or dismissing
+	 * <b>Action Button</b>
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initHideAnimation(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_hide_animation)) {
+			final int animResId = attrs.getResourceId(R.styleable.ActionButton_hide_animation,
+					Animations.NONE.animResId);
+			hideAnimation = Animations.load(getContext(), animResId);
+			Log.v(LOG_TAG, "Initialized animation on hide");
+		}
+	}
+
+	/**
+	 * Initializes the image inside <b>Action Button</b>
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initImage(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_image)) {
+			image = attrs.getDrawable(R.styleable.ActionButton_image);
+			Log.v(LOG_TAG, "Initialized image");
+		}
+	}
+
+	/**
+	 * Initializes the image size inside <b>Action Button</b>
+	 * <p>
+	 * Changing the default size of the image breaks the rules of 
+	 * <a href="http://www.google.com/design/spec/components/buttons.html">Material Design</a>
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	private void initImageSize(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_image_size)) {
+			imageSize = attrs.getDimension(R.styleable.ActionButton_image_size, imageSize);
+			Log.v(LOG_TAG, "Initialized image size: " + getImageSize());
+		}
+	}
+
+	/**
+	 * Plays the {@link #showAnimation} if set
+	 */
+	public void playShowAnimation() {
+		startAnimation(getShowAnimation());
+	}
+
+	/**
+	 * Plays the {@link #hideAnimation} if set
+	 */
+	public void playHideAnimation() {
+		startAnimation(getHideAnimation());
+	}
+
+	/**
+	 * Makes the <b>Action Button</b> to appear and 
+	 * sets its visibility to {@link #VISIBLE}
+	 * <p>
+	 * {@link #showAnimation} is played if set
+	 */
+	public void show() {
+		if (isHidden()) {
+			playShowAnimation();
+			setVisibility(VISIBLE);
+			Log.v(LOG_TAG, "Action Button shown");
+		}
+	}
+
+	/**
+	 * Makes the <b>Action Button</b> to disappear and
+	 * sets its visibility to {@link #INVISIBLE}
+	 * <p>
+	 * {@link #hideAnimation} is played if set
+	 */
+	public void hide() {
+		if (!isHidden() && !isDismissed()) {
+			playHideAnimation();
+			setVisibility(INVISIBLE);
+			Log.v(LOG_TAG, "Action Button hidden");
+		}
+	}
+
+	/**
+	 * Completely dismisses the <b>Action Button</b>,
+	 * sets its visibility to {@link #GONE} and removes it from the parent view
+	 * <p>
+	 * After calling this method any calls to {@link #show()} won't result in showing
+	 * the <b>Action Button</b> so far as it is removed from the parent View
+	 * <p> 
+	 * {@link #hideAnimation} is played if set
+	 */
+	public void dismiss() {
+		if (!isDismissed()) {
+			if (!isHidden()) {
+				playHideAnimation();
+			}
+			setVisibility(GONE);
+			ViewGroup parent = (ViewGroup) getParent();
+			parent.removeView(this);
+			Log.v(LOG_TAG, "Action Button dismissed");
+		}
+	}
+
+	/**
+	 * Checks whether <b>Action Button</b> is hidden
+	 *  
+	 * @return true if <b>Action Button</b> is hidden, otherwise false
+	 */
+	public boolean isHidden() {
+		return getVisibility() == INVISIBLE;
+	}
+
+	/**
+	 * Checks whether <b>Action Button</b> is dismissed
+	 *
+	 * @return true if <b>Action Button</b> is dismissed, otherwise false
+	 */
+	public boolean isDismissed() {
+		ViewGroup parent = (ViewGroup) getParent();
+		return parent == null;
+	}
+
+	/**
+	 * Returns the size of the <b>Action Button</b> in actual pixels (px).
+	 * Size of the <b>Action Button</b> is the diameter of the main circle
+	 *  
+	 * @return size of the <b>Action Button</b> in actual pixels (px)
+	 */
+	public int getButtonSize() {
+		final int buttonSize = (int) type.getSize(getContext());
+		Log.v(LOG_TAG, "Button size is: " + buttonSize);
+		return buttonSize;
+	}
+
+	/**
+	 * Returns the type of the <b>Action Button</b>
+	 *  
+	 * @return type of the <b>Action Button</b>
+	 */
+	public Type getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the type of the <b>Action Button</b> and 
+	 * invalidates the layout of the view
+	 *
+	 * @param type type of the <b>Action Button</b>
+	 */
+	public void setType(Type type) {
+		this.type = type;
+		requestLayout();
+		Log.v(LOG_TAG, "Type changed to: " + getType());
+	}
+
+	/**
+	 * Returns the current state of the <b>Action Button</b> 
+	 *  
+	 * @return current state of the <b>Action Button</b>
+	 */
+	public State getState() {
+		return state;
+	}
+
+	/**
+	 * Sets the current state of the <b>Action Button</b> and 
+	 * invalidates the view
+	 *  
+	 * @param state new state of the <b>Action Button</b>
+	 */
+	public void setState(State state) {
+		this.state = state;
+		invalidate();
+		Log.v(LOG_TAG, "State changed to: " + getState());
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> color when in 
+	 * {@link State#NORMAL} state
+	 * 
+	 * @return <b>Action Button</b> color when in 
+	 * {@link State#NORMAL} state 
+	 */
+	public int getButtonColor() {
+		return buttonColor;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> color when in 
+	 * {@link State#NORMAL} state and invalidates the view
+	 *  
+	 * @param buttonColor <b>Action Button</b> color 
+	 *                    when in {@link State#NORMAL} state
+	 */
+	public void setButtonColor(int buttonColor) {
+		this.buttonColor = buttonColor;
+		invalidate();
+		Log.v(LOG_TAG, "Color changed to: " + getButtonColor());
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> color when in
+	 * {@link State#PRESSED} state
+	 *  
+	 * @return <b>Action Button</b> color when in
+	 * {@link State#PRESSED} state 
+	 */
+	public int getButtonColorPressed() {
+		return buttonColorPressed;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> color when in
+	 * {@link State#PRESSED} state and invalidates the view
+	 * 
+	 * @param buttonColorPressed <b>Action Button</b> color
+	 *                           when in {@link State#PRESSED} state                              
+	 */
+	public void setButtonColorPressed(int buttonColorPressed) {
+		this.buttonColorPressed = buttonColorPressed;
+		invalidate();
+		Log.v(LOG_TAG, "Pressed color changed to: " + getButtonColorPressed());
+	}
+
+	/**
+	 * Checks whether <b>Action Button</b> has shadow by determining shadow radius
+	 * <p>
+	 * Shadow is disabled if elevation is set API level is {@code 21 Lollipop} and higher     
+	 *  
+	 * @return true if <b>Action Button</b> has radius, otherwise false
+	 */
+	public boolean hasShadow() {
+		return !hasElevation() && getShadowRadius() > 0.0f;
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> shadow radius in actual 
+	 * pixels (px)
+	 *  
+	 * @return <b>Action Button</b> shadow radius in actual pixels (px)
+	 */
+	public float getShadowRadius() {
+		return shadowRadius;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> shadow radius and 
+	 * invalidates the layout of the view
+	 * <p>
+	 * Must be specified in density-independent (dp) pixels, which are
+	 * then converted into actual pixels (px). If shadow radius is set to 0, 
+	 * shadow is removed
+	 *
+	 * @param shadowRadius shadow radius specified in density-independent 
+	 *                     (dp) pixels
+	 */
+	public void setShadowRadius(float shadowRadius) {
+		this.shadowRadius = MetricsConverter.dpToPx(getContext(), shadowRadius);
+		requestLayout();
+		Log.v(LOG_TAG, "Shadow radius changed to:" + getShadowRadius());
+	}
+
+	/**
+	 * Removes the <b>Action Button</b> shadow by setting its radius to 0
+	 */
+	public void removeShadow() {
+		if (hasShadow()) {
+			setShadowRadius(0.0f);
+		}
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> shadow X-axis offset 
+	 * in actual pixels (px)
+	 * <p>
+	 * If X-axis offset is greater than 0 shadow is shifted right. 
+	 * If X-axis offset is lesser than 0 shadow is shifted left.
+	 * 0 X-axis offset means that shadow is not X-axis shifted at all
+	 *  
+	 * @return <b>Action Button</b> shadow X-axis offset 
+	 * in actual pixels (px)
+	 */
+	public float getShadowXOffset() {
+		return shadowXOffset;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> shadow X-axis offset and 
+	 * invalidates the layout of the view
+	 * <p>
+	 * If X-axis offset is greater than 0 shadow is shifted right. 
+	 * If X-axis offset is lesser than 0 shadow is shifted left.
+	 * 0 X-axis offset means that shadow is not shifted at all
+	 * <p>
+	 * Must be specified in density-independent (dp) pixels, which are
+	 * then converted into actual pixels (px)
+	 *      
+	 * @param shadowXOffset shadow X-axis offset specified in density-independent
+	 *                      (dp) pixels                         
+	 */
+	public void setShadowXOffset(float shadowXOffset) {
+		this.shadowXOffset = MetricsConverter.dpToPx(getContext(), shadowXOffset);
+		requestLayout();
+		Log.v(LOG_TAG, "Shadow X offset changed to: " + getShadowXOffset());
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> shadow Y-axis offset 
+	 * in actual pixels (px)
+	 * <p>
+	 * If Y-axis offset is greater than 0 shadow is shifted down.
+	 * If Y-axis offset is lesser than 0 shadow is shifted up.
+	 * 0 Y-axis offset means that shadow is not Y-axis shifted at all
+	 *  
+	 * @return <b>Action Button</b> shadow Y-axis offset 
+	 * in actual pixels (px)
+	 */
+	public float getShadowYOffset() {
+		return shadowYOffset;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> shadow Y-axis offset and
+	 * invalidates the layout of the view
+	 * <p>
+	 * If Y-axis offset is greater than 0 shadow is shifted down.
+	 * If Y-axis offset is lesser than 0 shadow is shifted up.
+	 * 0 Y-axis offset means that shadow is not Y-axis shifted at all
+	 * <p>
+	 * Must be specified in density-independent (dp) pixels, which are
+	 * then converted into actual pixels (px)
+	 *  
+	 * @param shadowYOffset shadow Y-axis offset specified in density-independent
+	 *                      (dp) pixels                         
+	 */
+	public void setShadowYOffset(float shadowYOffset) {
+		this.shadowYOffset = MetricsConverter.dpToPx(getContext(), shadowYOffset);
+		requestLayout();
+		Log.v(LOG_TAG, "Shadow Y offset changed to:" + getShadowYOffset());
+	}
+
+	/**
+	 * Returns <b>Action Button</b> shadow color
+	 *  
+	 * @return <b>Action Button</b> shadow color
+	 */
+	public int getShadowColor() {
+		return shadowColor;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> shadow color and
+	 * invalidates the view
+	 *  
+	 * @param shadowColor <b>Action Button</b> color
+	 */
+	public void setShadowColor(int shadowColor) {
+		this.shadowColor = shadowColor;
+		invalidate();
+		Log.v(LOG_TAG, "Shadow color changed to: " + getShadowColor());
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> stroke width in actual 
+	 * pixels (px)
+	 *  
+	 * @return <b>Action Button</b> stroke width in actual 
+	 * pixels (px)
+	 */
+	public float getStrokeWidth() {
+		return strokeWidth;
+	}
+
+	/**
+	 * Checks whether <b>Action Button</b> has stroke by checking 
+	 * stroke width
+	 *  
+	 * @return true if <b>Action Button</b> has stroke, otherwise false
+	 */
+	public boolean hasStroke() {
+		return getStrokeWidth() > 0.0f;		
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> stroke width and
+	 * invalidates the layout of the view
+	 * <p>
+	 * Stroke width value must be greater than 0. If stroke width is 
+	 * set to 0 stroke is removed     
+	 * <p>
+	 * Must be specified in density-independent (dp) pixels, which are
+	 * then converted into actual pixels (px)
+	 *  
+	 * @param strokeWidth stroke width specified in density-independent
+	 *                    (dp) pixels                       
+	 */
+	public void setStrokeWidth(float strokeWidth) {
+		this.strokeWidth = MetricsConverter.dpToPx(getContext(), strokeWidth);
+		requestLayout();
+		Log.v(LOG_TAG, "Stroke width changed to: " + getStrokeWidth());
+	}
+
+	/**
+	 * Removes the <b>Action Button</b> stroke by setting its width to 0 
+	 */
+	public void removeStroke() {
+		if (hasStroke()) {
+			setStrokeWidth(0.0f);
+		}
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> stroke color
+	 *
+	 * @return <b>Action Button</b> stroke color
+	 */
+	public int getStrokeColor() {
+		return strokeColor;
+	}
+
+	/**
+	 * Sets the <b>Action Button</b> stroke color and 
+	 * invalidates the view
+	 *  
+	 * @param strokeColor <b>Action Button</b> stroke color
+	 */
+	public void setStrokeColor(int strokeColor) {
+		this.strokeColor = strokeColor;
+		invalidate();
+		Log.v(LOG_TAG, "Stroke color changed to: " + getStrokeColor());
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> image drawable centered 
+	 * inside the view
+	 *  
+	 * @return <b>Action Button</b> image drawable centered 
+	 * inside the view
+	 */
+	public Drawable getImage() {
+		return image;
+	}
+
+	/**
+	 * Checks whether <b>Action Button</b> has an image centered 
+	 * inside the view
+	 *  
+	 * @return true if <b>Action Button</b> has an image centered 
+	 * inside the view, otherwise false 
+	 */
+	public boolean hasImage() {
+		return getImage() != null;
+	}
+
+	/**
+	 * Places the image drawable centered inside the view and
+	 * invalidates the view 
+	 * <p>
+	 * Size of the image while drawing is fit to {@link #imageSize}     
+	 *     
+	 * @param image image drawable, which will be placed centered 
+	 *              inside the view                 
+	 */
+	public void setImageDrawable(Drawable image) {
+		this.image = image;
+		invalidate();
+		Log.v(LOG_TAG, "Image drawable set");
+	}
+
+	/**
+	 * Resolves the drawable resource id and places the resolved image drawable
+	 * centered inside the view
+	 * 
+	 * @param resId drawable resource id, which is to be resolved to 
+	 *              image drawable and used as parameter when calling
+	 *              {@link #setImageDrawable(android.graphics.drawable.Drawable)}              
+	 */
+	public void setImageResource(int resId) {
+		setImageDrawable(getResources().getDrawable(resId));
+	}
+
+	/**
+	 * Creates the {@link android.graphics.drawable.BitmapDrawable} from the given
+	 * {@link android.graphics.Bitmap} and places it centered inside the view 
+	 *  
+	 * @param bitmap bitmap, from which {@link android.graphics.drawable.BitmapDrawable}
+	 *               is created and used as parameter when calling
+	 *               {@link #setImageDrawable(android.graphics.drawable.Drawable)}               
+	 */
+	public void setImageBitmap(Bitmap bitmap) {
+		setImageDrawable(new BitmapDrawable(getResources(), bitmap));
+	}
+
+	/**
+	 * Removes the <b>Action Button</b> image by setting its value to null 
+	 */
+	public void removeImage() {
+		if (hasImage()) {
+			setImageDrawable(null);
+		}
+	}
+
+	/**
+	 * Returns the <b>Action Button</b> image size in actual pixels (px).
+	 * If <b>Action Button</b> image is not set returns 0 
+	 *   
+	 * @return <b>Action Button</b> image size in actual pixels (px), 
+	 * 0 if image is not set
+	 */
+	public float getImageSize() {
+		return getImage() != null ? imageSize : 0.0f;
+	}
+
+	/**
+	 * Sets the size of the <b>Action Button</b> image
+	 * <p>
+	 * Changing the default size of the image breaks the rules of 
+	 * <a href="http://www.google.com/design/spec/components/buttons.html">Material Design</a>
+	 * <p>
+	 * Must be specified in density-independent (dp) pixels, which are
+	 * then converted into actual pixels (px)     
+	 *
+	 * @param size size of the <b>Action Button</b> image
+	 *             specified in density-independent (dp) pixels                
+	 */
+	public void setImageSize(float size) {
+		this.imageSize = MetricsConverter.dpToPx(getContext(), size);
+		Log.v(LOG_TAG, "Image size changed to: " + getImageSize());
+	}
+
+	/**
+	 * Returns an animation, which is used while showing <b>Action Button</b>
+	 *
+	 * @return animation, which is used while showing <b>Action Button</b>
+	 */
+	public Animation getShowAnimation() {
+		return showAnimation;
+	}
+
+	/**
+	 * Sets the animation, which is used while showing <b>Action Button</b>
+	 *
+	 * @param animation animation, which is to be used while showing 
+	 *                  <b>Action Button</b>
+	 */
+	public void setShowAnimation(Animation animation) {
+		this.showAnimation = animation;
+		Log.v(LOG_TAG, "Show animation set");
+	}
+
+	/**
+	 * Sets one of the {@link Animations} as animation, which is used while showing
+	 * <b>Action Button</b>
+	 *
+	 * @param animation one of the {@link Animations}, which is to be used while
+	 *                  showing <b>Action Button</b>                     
+	 */
+	public void setShowAnimation(Animations animation) {
+		setShowAnimation(Animations.load(getContext(), animation.animResId));
+	}
+
+	/**
+	 * Removes the animation, which is used while showing <b>Action Button</b> 
+	 */
+	public void removeShowAnimation() {
+		setShowAnimation(Animations.NONE);
+		Log.v(LOG_TAG, "Show animation removed");
+	}
+
+	/**
+	 * Returns an animation, which is used while hiding <b>Action Button</b>
+	 *
+	 * @return animation, which is used while hiding <b>Action Button</b>
+	 */
+	public Animation getHideAnimation() {
+		return hideAnimation;
+	}
+
+	/**
+	 * Sets the animation, which is used while hiding <b>Action Button</b>
+	 *
+	 * @param animation animation, which is to be used while hiding 
+	 *                  <b>Action Button</b>
+	 */
+	public void setHideAnimation(Animation animation) {
+		this.hideAnimation = animation;
+		Log.v(LOG_TAG, "Hide animation set");
+	}
+
+	/**
+	 * Sets one of the {@link Animations} as animation, which is used while hiding
+	 * <b>Action Button</b>
+	 *
+	 * @param animation one of the {@link Animations}, which is to be used while
+	 *                  hiding <b>Action Button</b>                     
+	 */
+	public void setHideAnimation(Animations animation) {
+		setHideAnimation(Animations.load(getContext(), animation.animResId));
+	}
+	
+	public void removeHideAnimation() {
+		setHideAnimation(Animations.NONE);
+		Log.v(LOG_TAG, "Hide animation removed");
+	}
+	
+	/**
+	 * Adds additional actions on motion events:
+	 * 1. Changes the <b>Action Button</b> {@link #state} to {@link State#PRESSED}
+	 *    on {@link android.view.MotionEvent#ACTION_DOWN}
+	 * 2. Changes the <b>Action Button</b> {@link #state} to {@link State#NORMAL}
+	 *    on {@link android.view.MotionEvent#ACTION_UP}
+	 *        
+	 * @param event motion event
+	 * @return true if event was handled, otherwise false
+	 */
+	@SuppressWarnings("all")
+	@SuppressLint("ClickableViewAccessibility")
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		super.onTouchEvent(event);
+		final int action = event.getAction();
+		switch (action) {
+			case MotionEvent.ACTION_DOWN:
+				Log.v(LOG_TAG, "Motion event action down detected");
+				setState(State.PRESSED);
+				return true;
+			case MotionEvent.ACTION_UP:
+				Log.v(LOG_TAG, "Motion event action up detected");
+				setState(State.NORMAL);
+				return true;
+			default:
+				Log.v(LOG_TAG, "Unrecognized motion event detected");
+				return false;
+		}
+	}
+
+	/**
+	 * Adds additional checking whether animation is null before starting to play it
+	 *  
+	 * @param animation animation to play
+	 */
+	@SuppressWarnings("all")
+	@Override
+	public void startAnimation(Animation animation) {
+		if (animation != null) {
+			super.startAnimation(animation);
+		}
+	}
+
+	/**
+	 * Resets the paint to its default values and sets initial flags to it
+	 * <p>
+	 * Use this method before drawing the new element of the view     
+	 */
+	protected final void resetPaint() {
+		paint.reset();
+		paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+		Log.v(LOG_TAG, "Paint reset");
+	}
+
+	/**
+	 * Draws the elements of the <b>Action Button</b>
+	 *  
+	 * @param canvas canvas, on which the drawing is to be performed
+	 */
+	@SuppressWarnings("all")
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		Log.v(LOG_TAG, "Action Button onDraw called");
+		drawCircle(canvas);
+		if (hasElevation()) {
+			drawElevation();
+		}
+		if (hasStroke()) {
+			drawStroke(canvas);
+		}
+		if (hasImage()) {
+			drawImage(canvas);
+		}
+	}
+
+	/**
+	 * Draws the main circle of the <b>Action Button</b> and calls
+	 * {@link #drawShadow()} to draw the shadow if present
+	 *  
+	 * @param canvas canvas, on which circle is to be drawn
+	 */
+	protected void drawCircle(Canvas canvas) {
+		resetPaint();
+		if (hasShadow()) {
+			drawShadow();
+		}
+		paint.setStyle(Paint.Style.FILL);
+		paint.setColor(getState() == State.PRESSED ? getButtonColorPressed() : getButtonColor());
+		canvas.drawCircle(calculateCenterX(), calculateCenterY(), calculateCircleRadius(), paint);
+		Log.v(LOG_TAG, "Circle drawn");
+	}
+
+	/**
+	 * Calculates the X-axis center coordinate of the entire view
+	 *
+	 * @return X-axis center coordinate of the entire view
+	 */
+	protected float calculateCenterX() {
+		final float centerX = getMeasuredWidth() / 2;
+		Log.v(LOG_TAG, "Calculated center X = " + centerX);
+		return centerX;
+	}
+
+	/**
+	 * Calculates the Y-axis center coordinate of the entire view
+	 *
+	 * @return Y-axis center coordinate of the entire view
+	 */
+	protected float calculateCenterY() {
+		final float centerY = getMeasuredHeight() / 2;
+		Log.v(LOG_TAG, "Calculated center Y = " + centerY);
+		return centerY;
+	}
+
+	/**
+	 * Calculates the radius of the main circle
+	 *
+	 * @return radius of the main circle
+	 */
+	protected final float calculateCircleRadius() {
+		final float circleRadius = getButtonSize() / 2;
+		Log.v(LOG_TAG, "Calculated circle circleRadius = " + circleRadius);
+		return circleRadius;
+	}	
+
+	/**
+	 * Draws the shadow if view elevation is not enabled
+	 */
+	protected void drawShadow() {
+		paint.setShadowLayer(getShadowRadius(), getShadowXOffset(), getShadowYOffset(), getShadowColor());
+		Log.v(LOG_TAG, "Shadow drawn");
+	}
+	
+	/**
+	 * Draws the elevation around the main circle
+	 * <p>
+	 * Uses the stroke corrective, which helps to avoid the elevation overlapping issue     
+	 */
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	protected void drawElevation() {
+		final int strokeWeightCorrective = (int) (getStrokeWidth() / 1.5f);
+		final int width = getWidth() - strokeWeightCorrective;
+		final int height = getHeight() - strokeWeightCorrective;
+		final ViewOutlineProvider outlineProvider = new ActionButtonOutlineProvider(width, height);
+		setOutlineProvider(outlineProvider);
+		Log.v(LOG_TAG, "Elevation drawn");
+	}
+
+	/**
+	 * Checks whether view elevation is enabled
+	 *  
+	 * @return true if view elevation enabled, otherwise false
+	 */
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	private boolean hasElevation() {
+		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && getElevation() > 0.0f;
+	}
+
+	/**
+	 * Draws stroke around the main circle
+	 *
+	 * @param canvas canvas, on which circle is to be drawn
+	 */
+	protected void drawStroke(Canvas canvas) {
+		resetPaint();
+		paint.setStyle(Paint.Style.STROKE);
+		paint.setStrokeWidth(getStrokeWidth());
+		paint.setColor(getStrokeColor());
+		canvas.drawCircle(calculateCenterX(), calculateCenterY(), calculateCircleRadius(), paint);
+		Log.v(LOG_TAG, "Stroke drawn");
+	}
+
+	/**
+	 * Draws the image centered inside the view
+	 *
+	 * @param canvas canvas, on which circle is to be drawn
+	 */
+	protected void drawImage(Canvas canvas) {
+		final int startPointX = (int) (calculateCenterX() - getImageSize() / 2);
+		final int startPointY = (int) (calculateCenterY() - getImageSize() / 2);
+		final int endPointX = (int) (startPointX + getImageSize());
+		final int endPointY = (int) (startPointY + getImageSize());
+		getImage().setBounds(startPointX, startPointY, endPointX, endPointY);
+		getImage().draw(canvas);
+		Log.v(LOG_TAG, String.format("Image drawn on canvas with coordinates: startPointX = %s, startPointY = %s, " +
+				"endPointX = %s, endPointY = %s", startPointX, startPointY, endPointX, endPointY));
+	}
+
+	/**
+	 * Sets the measured dimension for the entire view
+	 *
+	 * @param widthMeasureSpec horizontal space requirements as imposed by the parent.
+	 *                         The requirements are encoded with
+	 *                         {@link android.view.View.MeasureSpec}
+	 * @param heightMeasureSpec vertical space requirements as imposed by the parent.
+	 *                         The requirements are encoded with
+	 *                         {@link android.view.View.MeasureSpec}
+	 */
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		Log.v(LOG_TAG, "Action Button onMeasure called");
+		setMeasuredDimension(calculateMeasuredWidth(), calculateMeasuredHeight());
+		Log.v(LOG_TAG, String.format("View size measured with: height = %s, width = %s", getHeight(), getWidth()));
+	}
+
+	/**
+	 * Calculates the measured width in actual pixels for the entire view
+	 *  
+	 * @return measured width in actual pixels for the entire view
+	 */
+	private int calculateMeasuredWidth() {
+		final int measuredWidth = getButtonSize() + calculateShadowWidth() + calculateStrokeWeight();
+		Log.v(LOG_TAG, "Calculated measured width = " + measuredWidth);
+		return measuredWidth;
+	}
+
+	/**
+	 * Calculates the measured height in actual pixels for the entire view
+	 *  
+	 * @return measured width in actual pixels for the entire view
+	 */
+	private int calculateMeasuredHeight() {
+		final int measuredHeight = getButtonSize() + calculateShadowHeight() + calculateStrokeWeight();
+		Log.v(LOG_TAG, "Calculated measured height = " + measuredHeight);
+		return measuredHeight;
+	}
+
+	/**
+	 * Calculates shadow width in actual pixels
+	 *  
+	 * @return shadow width in actual pixels
+	 */
+	private int calculateShadowWidth() {
+		final int shadowWidth = hasShadow() ? (int) ((getShadowRadius() + Math.abs(getShadowXOffset())) * 2) : 0;
+		Log.v(LOG_TAG, "Calculated shadow width = " + shadowWidth);
+		return shadowWidth;
+	}
+
+	/**
+	 * Calculates shadow height in actual pixels
+	 *  
+	 * @return shadow height in actual pixels
+	 */
+	private int calculateShadowHeight() {
+		final int shadowHeight = hasShadow() ? (int) ((getShadowRadius() + Math.abs(getShadowYOffset())) * 2) : 0;
+		Log.v(LOG_TAG, "Calculated shadow height = " + shadowHeight);
+		return shadowHeight;
+	}
+
+	/**
+	 * Calculates the stroke weight in actual pixels
+	 * *
+	 * @return stroke weight in actual pixels
+	 */
+	private int calculateStrokeWeight() {
+		final int strokeWeight = (int) (getStrokeWidth() * 2.0f);
+		Log.v(LOG_TAG, "Calculated stroke weight is: " + strokeWeight);
+		return strokeWeight;
+	}
+
+	/**
+	 * Determines the <b>Action Button</b> types 
+	 */
+	public enum Type {
+
+		/**
+		 * <b>Action Button</b> default (56dp) type
+		 */
+		DEFAULT {
+			@Override
+			int getId() {
+				return 0;
+			}
+		
+			@Override
+			float getSize(Context context) {
+				return MetricsConverter.dpToPx(context, 56.0f);
+			}
+		},
+
+		/**
+		 * <b>Action Button</b> mini (40dp) type 
+		 */
+		MINI {
+			@Override
+			int getId() {
+				return 1;
+			}
+
+			@Override
+			float getSize(Context context) {
+				return MetricsConverter.dpToPx(context, 40.0f);
+			}
+		};
+
+		/**
+		 * Returns an {@code id} for specific <b>Action Button</b> 
+		 * type, which is defined in attributes  
+		 *  
+		 * @return {@code id} for particular <b>Action Button</b> type,
+		 * which is defined in attributes 
+		 */
+		abstract int getId();
+
+		/**
+		 * Returns the size of the specific type of the <b>Action Button</b>
+		 *
+		 * @param context context the view is running in
+		 * @return size of the particular type of the <b>Action Button</b>
+		 */
+		abstract float getSize(Context context);
+
+		/**
+		 * Returns the <b>Action Button</b> type for a specific {@code id}
+		 *  
+		 * @param id an {@code id}, for which <b>Action Button</b> type required
+		 * @return <b>Action Button</b> type
+		 */
+		static Type forId(int id) {
+			for (Type type : values()) {
+				if (type.getId() == id) {
+					return type;
+				}
+			}
+			return DEFAULT;
+		}
+		
+	}
+
+	/**
+	 * Determines the <b>Action Button</b> states 
+	 */
+	public enum State {
+
+		/**
+		 * <b>Action Button</b> normal state  
+		 */
+		NORMAL,
+
+		/**
+		 * <b>Action Button</b> pressed state 
+		 */
+		PRESSED
+		
+	}
+	
+	public enum Animations {
+
+		/**
+		 * None. Animation absent 
+		 */
+		NONE                (0),
+
+		/**
+		 * Fade in animation 
+		 */
+		FADE_IN             (R.anim.fab_fade_in),
+
+		/**
+		 * Fade out animation 
+		 */
+		FADE_OUT            (R.anim.fab_fade_out),
+
+		/**
+		 * Scale up animation 
+		 */
+		SCALE_UP            (R.anim.fab_scale_up),
+
+		/**
+		 * Scale down animation 
+		 */
+		SCALE_DOWN          (R.anim.fab_scale_down),
+
+		/**
+		 * Roll from down animation 
+		 */
+		ROLL_FROM_DOWN      (R.anim.fab_roll_from_down),
+
+		/**
+		 * Roll to down animation 
+		 */
+		ROLL_TO_DOWN        (R.anim.fab_roll_to_down),
+
+		/**
+		 * Roll from right animation 
+		 */
+		ROLL_FROM_RIGHT     (R.anim.fab_roll_from_right),
+
+		/**
+		 * Roll to right animation 
+		 */
+		ROLL_TO_RIGHT       (R.anim.fab_roll_to_right),
+
+		/**
+		 * Jump from down animation 
+		 */
+		JUMP_FROM_DOWN      (R.anim.fab_jump_from_down),
+
+		/**
+		 * Jump to down animation 
+		 */
+		JUMP_TO_DOWN        (R.anim.fab_jump_to_down),
+
+		/**
+		 * Jump from right animation 
+		 */
+		JUMP_FROM_RIGHT     (R.anim.fab_jump_from_right),
+
+		/**
+		 * Jump to right animation 
+		 */
+		JUMP_TO_RIGHT       (R.anim.fab_jump_to_right);
+
+		/**
+		 * Correspondent animation resource id 
+		 */
+		final int animResId;
+		
+		private Animations(int animResId) {
+			this.animResId = animResId;
+		}
+
+		/**
+		 * Loads an animation from animation resource id
+		 *
+		 * @param context context the view is running in
+		 * @param animResId resource id of the animation, which is to be loaded
+		 * @return loaded animation
+		 */
+		protected static Animation load(Context context, int animResId) {
+			return animResId == NONE.animResId ? null : AnimationUtils.loadAnimation(context, animResId);
+		}
+
+	}
+
+}
diff --git a/eclipse-compile/fab/java/com/software/shell/fab/ActionButtonOutlineProvider.java b/eclipse-compile/fab/java/com/software/shell/fab/ActionButtonOutlineProvider.java
new file mode 100644
index 0000000000..d154c3998f
--- /dev/null
+++ b/eclipse-compile/fab/java/com/software/shell/fab/ActionButtonOutlineProvider.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015 Shell Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * File created: 2015-02-25 19:54:28
+ */
+
+package com.software.shell.fab;
+
+import android.annotation.TargetApi;
+import android.graphics.Outline;
+import android.os.Build;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+
+/**
+ * An implementation of the {@link android.view.ViewOutlineProvider}
+ * for <b>Action Button</b>
+ * 
+ * Used for drawing the elevation shadow for {@code API 21 Lollipop} and higher 
+ *
+ * @author Vladislav
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+class ActionButtonOutlineProvider extends ViewOutlineProvider {
+	
+	/**
+	 * Outline provider width 
+	 */
+	private int width;
+
+	/**
+	 * Outline provider height
+	 */
+	private int height;
+
+	/**
+	 * Creates an instance of the {@link com.software.shell.fab.ActionButtonOutlineProvider}
+	 *  
+	 * @param width initial outline provider width
+	 * @param height initial outline provider height
+	 */
+	ActionButtonOutlineProvider(int width, int height) {
+		this.width = width;
+		this.height = height;
+	}
+
+	/**
+	 * Called to get the provider to populate the Outline. This method will be called by a View 
+	 * when its owned Drawables are invalidated, when the View's size changes, or if invalidateOutline()
+	 * is called explicitly. The input outline is empty and has an alpha of 1.0f
+	 *
+	 * @param view a view, which builds the outline
+	 * @param outline an empty outline, which is to be populated
+	 */
+	@Override
+	public void getOutline(View view, Outline outline) {
+		outline.setOval(0, 0, width, height);
+	}
+	
+}
diff --git a/eclipse-compile/fab/java/com/software/shell/fab/FloatingActionButton.java b/eclipse-compile/fab/java/com/software/shell/fab/FloatingActionButton.java
new file mode 100644
index 0000000000..196c8e7ad5
--- /dev/null
+++ b/eclipse-compile/fab/java/com/software/shell/fab/FloatingActionButton.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2015 Shell Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * File created: 2015-02-16 10:56:57
+ */
+
+package com.software.shell.fab;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.animation.Animation;
+
+/**
+ * Deprecated since version <b>1.0.2</b>. Use {@link com.software.shell.fab.ActionButton}
+ * class instead.
+ * The reason is the rename of base class name from <b>FloatingActionButton</b> to
+ * <b>ActionButton</b> and some of the methods, which are present in this class. 
+ * <p>
+ * Will be removed in version 2.0.0. Please use {@link com.software.shell.fab.ActionButton} and
+ * methods declared there instead
+ *
+ * @author Vladislav
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+@Deprecated
+public class FloatingActionButton extends ActionButton{
+	
+	private static final String LOG_TAG = "FAB";
+	
+	public FloatingActionButton(Context context) {
+		super(context);
+	}
+
+	public FloatingActionButton(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		initActionButton(context, attrs, 0, 0);
+	}
+
+	public FloatingActionButton(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		initActionButton(context, attrs, defStyleAttr, 0);
+	}
+
+	public FloatingActionButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+		initActionButton(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	/**
+	 * Returns an animation, which is used while showing <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use {@link #getShowAnimation()} instead
+	 *
+	 * @return animation, which is used while showing <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public Animation getAnimationOnShow() {
+		return getShowAnimation();
+	}
+
+	/**
+	 * Sets the animation, which is used while showing <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use
+	 * {@link #setShowAnimation(android.view.animation.Animation)} instead
+	 *
+	 * @param animation animation, which is to be used while showing
+	 *                  <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public void setAnimationOnShow(Animation animation) {
+		setShowAnimation(animation);
+	}
+
+	/**
+	 * Sets one of the {@link Animations} as animation, which is used while showing
+	 * <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use
+	 * {@link #setShowAnimation(com.software.shell.fab.ActionButton.Animations)} instead
+	 *
+	 * @param animation one of the {@link Animations}, which is to be used while
+	 *                  showing <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public void setAnimationOnShow(Animations animation) {
+		setShowAnimation(animation);
+	}
+
+	/**
+	 * Returns an animation, which is used while hiding <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use {@link #getHideAnimation()}
+	 * instead
+	 *
+	 * @return animation, which is used while hiding <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public Animation getAnimationOnHide() {
+		return getHideAnimation();
+	}
+
+	/**
+	 * Sets the animation, which is used while hiding <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use
+	 * {@link #setHideAnimation(android.view.animation.Animation)} instead
+	 *
+	 * @param animation animation, which is to be used while hiding
+	 *                  <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public void setAnimationOnHide(Animation animation) {
+		setHideAnimation(animation);
+	}
+
+	/**
+	 * Sets one of the {@link Animations} as animation, which is used while hiding
+	 * <b>Floating Action Button</b>
+	 * @deprecated since version <b>1.0.2</b>. Please use
+	 * {@link #setHideAnimation(com.software.shell.fab.ActionButton.Animations)} )} instead
+	 *
+	 * @param animation one of the {@link Animations}, which is to be used while
+	 *                  hiding <b>Floating Action Button</b>
+	 */
+	@Deprecated
+	public void setAnimationOnHide(Animations animation) {
+		setHideAnimation(animation);
+	}
+	
+	private void initActionButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		TypedArray attributes = context.getTheme().obtainStyledAttributes(attrs, R.styleable.ActionButton, 
+				defStyleAttr, defStyleRes);
+		try {
+			initType(attributes);
+			initShowAnimation(attributes);
+			initHideAnimation(attributes);
+		} catch (Exception e) {
+			Log.e(LOG_TAG, "Unable to read attr", e);
+		} finally {
+			attributes.recycle();
+		}
+		Log.v(LOG_TAG, "Floating Action Button initialized");
+	}
+
+	private void initType(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_type)) {
+			final int id = attrs.getInteger(R.styleable.ActionButton_type, 0);
+			setType(Type.forId(id));
+			Log.v(LOG_TAG, "Initialized type: " + getType());
+		}
+	}
+
+	/**
+	 * Initializes the animation, which is used while showing 
+	 * <b>Action Button</b>
+	 * @deprecated since 1.0.2 and will be removed in version 2.0.0.
+	 * Use <b>show_animation</b> and <b>hide_animation</b> in XML instead 
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	@Deprecated
+	private void initShowAnimation(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_animation_onShow)) {
+			final int animResId = attrs.getResourceId(R.styleable.ActionButton_animation_onShow,
+					Animations.NONE.animResId);
+			setShowAnimation(Animations.load(getContext(), animResId));
+		}
+	}
+
+	/**
+	 * Initializes the animation, which is used while hiding or dismissing
+	 * <b>Action Button</b>
+	 * @deprecated since 1.0.2 and will be removed in version 2.0.0
+	 * Use <b>show_animation</b> and <b>hide_animation</b> in XML instead 
+	 *
+	 * @param attrs attributes of the XML tag that is inflating the view
+	 */
+	@Deprecated
+	private void initHideAnimation(TypedArray attrs) {
+		if (attrs.hasValue(R.styleable.ActionButton_animation_onHide)) {
+			final int animResId = attrs.getResourceId(R.styleable.ActionButton_animation_onHide,
+					Animations.NONE.animResId);
+			setHideAnimation(Animations.load(getContext(), animResId));
+		}
+	}
+	
+}
diff --git a/eclipse-compile/fab/java/com/software/shell/fab/MetricsConverter.java b/eclipse-compile/fab/java/com/software/shell/fab/MetricsConverter.java
new file mode 100644
index 0000000000..c4770449c4
--- /dev/null
+++ b/eclipse-compile/fab/java/com/software/shell/fab/MetricsConverter.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Shell Software Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * File created: 2015-01-30 22:55:44
+ */
+
+package com.software.shell.fab;
+
+import android.content.Context;
+
+/**
+ * Contains utility methods for metrics conversion
+ *
+ * @author Vladislav
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+public final class MetricsConverter {
+
+	/**
+	 * Prevents from creating {@link com.software.shell.fab.MetricsConverter} instances 
+	 */
+	private MetricsConverter() {
+	}
+
+	/**
+	 * Converts the density-independent value into real pixel value based on display metrics
+	 *
+	 * @param context application context
+	 * @param dp density-independent value
+	 * @return converted real pixel value
+	 */
+	public static float dpToPx(Context context, float dp) {
+		final float scale = context.getResources().getDisplayMetrics().density;
+		return dp * scale;
+	}
+	
+}
diff --git a/eclipse-compile/fab/project.properties b/eclipse-compile/fab/project.properties
new file mode 100644
index 0000000000..17b8e6b92f
--- /dev/null
+++ b/eclipse-compile/fab/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-21
+dex.force.jumbo=true
+android.library=true
diff --git a/eclipse-compile/fab/res/anim-v11/fab_jump_from_down.xml b/eclipse-compile/fab/res/anim-v11/fab_jump_from_down.xml
new file mode 100644
index 0000000000..87095c9bc7
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_jump_from_down.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:12
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/decelerate_cubic">
+	<scale
+		android:fromXScale="0.0"
+	    android:toXScale="1.0"
+	    android:fromYScale="0.0"
+	    android:toYScale="1.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="500"
+	    />
+	<translate
+		android:fromYDelta="30%p"
+	    android:toYDelta="0"
+	    android:duration="500"
+	    />
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_jump_from_right.xml b/eclipse-compile/fab/res/anim-v11/fab_jump_from_right.xml
new file mode 100644
index 0000000000..9db4bf984f
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_jump_from_right.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:38
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/decelerate_cubic">
+	<scale
+		android:fromXScale="0.0"
+		android:toXScale="1.0"
+		android:fromYScale="0.0"
+	    android:toYScale="1.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="500"
+	    />
+	<translate
+		android:fromXDelta="30%p"
+	    android:toXDelta="0"
+	    android:duration="500"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_jump_to_down.xml b/eclipse-compile/fab/res/anim-v11/fab_jump_to_down.xml
new file mode 100644
index 0000000000..ca59b72de1
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_jump_to_down.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:42
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/accelerate_cubic">
+	<scale
+		android:fromXScale="1.0"
+	    android:toXScale="0.0"
+	    android:fromYScale="1.0"
+	    android:toYScale="0.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="300"
+	    />
+	<translate
+		android:fromYDelta="0"
+	    android:toYDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_jump_to_right.xml b/eclipse-compile/fab/res/anim-v11/fab_jump_to_right.xml
new file mode 100644
index 0000000000..d4287e6264
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_jump_to_right.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:45
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/accelerate_cubic">
+	<scale
+		android:fromXScale="1.0"
+		android:toXScale="0.0"
+		android:fromYScale="1.0"
+	    android:toYScale="0.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="300"
+	    />
+	<translate
+		android:fromXDelta="0"
+	    android:toXDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_roll_from_down.xml b/eclipse-compile/fab/res/anim-v11/fab_roll_from_down.xml
new file mode 100644
index 0000000000..438160f361
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_roll_from_down.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:49
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/overshoot">
+	<rotate
+		android:duration="500"
+		android:pivotX="50%"
+		android:pivotY="50%"
+	    android:fromDegrees="360"
+	    android:toDegrees="0"
+	    />
+	<translate
+		android:fromYDelta="30%p"
+		android:toYDelta="0"
+		android:duration="500"
+	    />
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_roll_from_right.xml b/eclipse-compile/fab/res/anim-v11/fab_roll_from_right.xml
new file mode 100644
index 0000000000..0ef84e389b
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_roll_from_right.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:53
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/overshoot">
+	<rotate
+		android:duration="500"
+		android:pivotX="50%"
+		android:pivotY="50%"
+	    android:fromDegrees="360"
+	    android:toDegrees="0"
+	    />
+	<translate
+		android:fromXDelta="30%p"
+		android:toXDelta="0"
+		android:duration="500"
+	    />
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_roll_to_down.xml b/eclipse-compile/fab/res/anim-v11/fab_roll_to_down.xml
new file mode 100644
index 0000000000..8e8140cf93
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_roll_to_down.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:56
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/anticipate">
+	<rotate
+	    android:fromDegrees="0"
+	    android:toDegrees="360"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+		android:duration="300"
+	    />
+	<translate
+		android:fromYDelta="0"
+	    android:toYDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_roll_to_right.xml b/eclipse-compile/fab/res/anim-v11/fab_roll_to_right.xml
new file mode 100644
index 0000000000..22915225a9
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_roll_to_right.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:00
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/anticipate">
+	<rotate
+	    android:fromDegrees="0"
+	    android:toDegrees="360"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+		android:duration="300"
+	    />
+	<translate
+		android:fromXDelta="0"
+	    android:toXDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_scale_down.xml b/eclipse-compile/fab/res/anim-v11/fab_scale_down.xml
new file mode 100644
index 0000000000..ce63f0fd5f
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_scale_down.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:04
+  -->
+
+<scale
+		xmlns:android="http://schemas.android.com/apk/res/android"
+        android:interpolator="@android:interpolator/anticipate"
+        android:fromXScale="1.0"
+        android:toXScale="0.0"
+        android:fromYScale="1.0"
+        android:toYScale="0.0"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="300"
+		/>
diff --git a/eclipse-compile/fab/res/anim-v11/fab_scale_up.xml b/eclipse-compile/fab/res/anim-v11/fab_scale_up.xml
new file mode 100644
index 0000000000..1d18f40544
--- /dev/null
+++ b/eclipse-compile/fab/res/anim-v11/fab_scale_up.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:09
+  -->
+<scale
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:interpolator="@android:interpolator/overshoot"
+		android:fromXScale="0.0"
+		android:toXScale="1.0"
+		android:fromYScale="0.0"
+		android:toYScale="1.0"
+		android:pivotX="50%"
+		android:pivotY="50%"
+		android:duration="500"
+		/>
diff --git a/eclipse-compile/fab/res/anim/fab_fade_in.xml b/eclipse-compile/fab/res/anim/fab_fade_in.xml
new file mode 100644
index 0000000000..2b0ebedb7f
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_fade_in.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:24:57
+  -->
+
+<alpha
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="500"
+        />
diff --git a/eclipse-compile/fab/res/anim/fab_fade_out.xml b/eclipse-compile/fab/res/anim/fab_fade_out.xml
new file mode 100644
index 0000000000..064ff9e45b
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_fade_out.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:06
+  -->
+
+<alpha
+		xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:duration="300"
+		/>
diff --git a/eclipse-compile/fab/res/anim/fab_jump_from_down.xml b/eclipse-compile/fab/res/anim/fab_jump_from_down.xml
new file mode 100644
index 0000000000..f41e38317f
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_jump_from_down.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:12
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<scale
+		android:fromXScale="0.0"
+	    android:toXScale="1.0"
+	    android:fromYScale="0.0"
+	    android:toYScale="1.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="500"
+	    />
+	<translate
+		android:fromYDelta="30%p"
+	    android:toYDelta="0"
+	    android:duration="500"
+	    />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_jump_from_right.xml b/eclipse-compile/fab/res/anim/fab_jump_from_right.xml
new file mode 100644
index 0000000000..c9bdc0da7a
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_jump_from_right.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:38
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<scale
+		android:fromXScale="0.0"
+		android:toXScale="1.0"
+		android:fromYScale="0.0"
+	    android:toYScale="1.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="500"
+	    />
+	<translate
+		android:fromXDelta="30%p"
+	    android:toXDelta="0"
+	    android:duration="500"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_jump_to_down.xml b/eclipse-compile/fab/res/anim/fab_jump_to_down.xml
new file mode 100644
index 0000000000..0649c71a04
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_jump_to_down.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:42
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<scale
+		android:fromXScale="1.0"
+	    android:toXScale="0.0"
+	    android:fromYScale="1.0"
+	    android:toYScale="0.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="300"
+	    />
+	<translate
+		android:fromYDelta="0"
+	    android:toYDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_jump_to_right.xml b/eclipse-compile/fab/res/anim/fab_jump_to_right.xml
new file mode 100644
index 0000000000..8ea8b69a3a
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_jump_to_right.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:45
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<scale
+		android:fromXScale="1.0"
+		android:toXScale="0.0"
+		android:fromYScale="1.0"
+	    android:toYScale="0.0"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    android:duration="300"
+	    />
+	<translate
+		android:fromXDelta="0"
+	    android:toXDelta="30%p"
+	    android:duration="300"
+	    />
+
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_roll_from_down.xml b/eclipse-compile/fab/res/anim/fab_roll_from_down.xml
new file mode 100644
index 0000000000..66a284f25d
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_roll_from_down.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:49
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<rotate
+		android:duration="400"
+		android:pivotX="50%"
+		android:pivotY="50%"
+	    android:fromDegrees="360"
+	    android:toDegrees="-30"
+	    />
+    <rotate
+        android:duration="100"
+        android:startOffset="400"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fromDegrees="0"
+        android:toDegrees="30"
+        />
+	<translate
+		android:duration="400"
+		android:fromYDelta="30%p"
+		android:toYDelta="-20"
+	    />
+    <translate
+        android:duration="100"
+        android:startOffset="400"
+        android:fromYDelta="0"
+        android:toYDelta="20"
+        />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_roll_from_right.xml b/eclipse-compile/fab/res/anim/fab_roll_from_right.xml
new file mode 100644
index 0000000000..3c38343fcd
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_roll_from_right.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:53
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<rotate
+		android:duration="400"
+		android:pivotX="50%"
+		android:pivotY="50%"
+	    android:fromDegrees="360"
+	    android:toDegrees="-30"
+	    />
+    <rotate
+        android:duration="100"
+        android:startOffset="400"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fromDegrees="0"
+        android:toDegrees="30"
+        />
+	<translate
+		android:duration="400"
+		android:fromXDelta="30%p"
+		android:toXDelta="-20"
+	    />
+    <translate
+        android:duration="100"
+        android:startOffset="400"
+        android:fromXDelta="0"
+        android:toXDelta="20"
+        />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_roll_to_down.xml b/eclipse-compile/fab/res/anim/fab_roll_to_down.xml
new file mode 100644
index 0000000000..16a6946ea9
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_roll_to_down.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:25:56
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<rotate
+		android:duration="100"
+	    android:fromDegrees="0"
+	    android:toDegrees="-30"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+	    />
+    <rotate
+        android:duration="200"
+        android:startOffset="100"
+        android:fromDegrees="0"
+        android:toDegrees="390"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        />
+	<translate
+		android:fromYDelta="0"
+	    android:toYDelta="-20"
+	    android:duration="100"
+	    />
+    <translate
+        android:duration="200"
+        android:startOffset="100"
+        android:fromYDelta="0"
+        android:toYDelta="30%p"
+        />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_roll_to_right.xml b/eclipse-compile/fab/res/anim/fab_roll_to_right.xml
new file mode 100644
index 0000000000..420734f2b8
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_roll_to_right.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:00
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+	<rotate
+	    android:fromDegrees="0"
+	    android:toDegrees="-30"
+	    android:pivotX="50%"
+	    android:pivotY="50%"
+		android:duration="100"
+	    />
+    <rotate
+        android:duration="200"
+        android:startOffset="100"
+        android:fromDegrees="0"
+        android:toDegrees="390"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        />
+	<translate
+		android:fromXDelta="0"
+	    android:toXDelta="-20"
+	    android:duration="100"
+	    />
+    <translate
+        android:duration="200"
+        android:startOffset="100"
+        android:fromXDelta="0"
+        android:toXDelta="30%p"
+        />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_scale_down.xml b/eclipse-compile/fab/res/anim/fab_scale_down.xml
new file mode 100644
index 0000000000..e0dd6bea64
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_scale_down.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:04
+  -->
+
+<set
+		xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale
+        android:duration="200"
+        android:fromXScale="1.0"
+        android:toXScale="1.1"
+        android:fromYScale="1.0"
+        android:toYScale="1.1"
+        android:pivotX="50%"
+        android:pivotY="50%"
+		/>
+    <scale
+        android:duration="100"
+        android:startOffset="200"
+        android:fromXScale="1.1"
+        android:toXScale="0.9"
+        android:fromYScale="1.1"
+        android:toYScale="0.9"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        />
+</set>
diff --git a/eclipse-compile/fab/res/anim/fab_scale_up.xml b/eclipse-compile/fab/res/anim/fab_scale_up.xml
new file mode 100644
index 0000000000..956f6ed79d
--- /dev/null
+++ b/eclipse-compile/fab/res/anim/fab_scale_up.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:26:09
+  -->
+<set
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <scale
+		android:duration="400"
+		android:fromXScale="0.0"
+		android:toXScale="1.1"
+		android:fromYScale="0.0"
+		android:toYScale="1.1"
+		android:pivotX="50%"
+		android:pivotY="50%"
+		/>
+    <scale
+        android:duration="100"
+        android:startOffset="400"
+        android:fromXScale="1.1"
+        android:toXScale="0.9"
+        android:fromYScale="1.1"
+        android:toYScale="0.9"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        />
+
+</set>
\ No newline at end of file
diff --git a/eclipse-compile/fab/res/drawable-hdpi/fab_plus_icon.png b/eclipse-compile/fab/res/drawable-hdpi/fab_plus_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4358ce2015d3f303e8f27927b607723cdb56368
GIT binary patch
literal 1104
zcmaJ=TWHfz7*4%SywnP!%o}If9CNHqlU}yQ)vjw=Et)yI!sgr3<aCWQIWak1y9rX=
zgPZ6S+{4fpVIV4~>{)RP2cl0RBAZWMUSx>AsfaL7<~n__h9u|0_kI6&{{KItogIfZ
zZ`iqkqNvTu!$OLTb@sP@9r?ebCML*GjpIGI3uSRZG9eXJPzHjeCiTG-l$62K&tNM>
zt)|s<5AG3<@-osql8x~cHG{Azsx?wHB)K1Akb!-w9;UxMoTh=Qgz4^p=oO6^%&CWm
zOxQKlk(P)0<&Z*04uaMqPXsiGB~a8(=@wrM(@VNMncLe84VECdKTQ8N)gyL-7&0LU
zczkZz%d#LC^sxRwFvvCm&dYL)m%KqY>*oVOo@)ln4^5((N|sLviRD;i6{d3-8$81l
z3I$KW=Rsy4!-hg3TZ7}=1mU&@bu1O#x>Z|N5TGTSs)1Fc16xtbpga!K#Od!NXvT`H
zZY`&YB#bFa2E%&1_L0g!QT#tt(^k+HPQgEZ|0!&x2Mx%ipoQ|LObVB+wL=+v%!Cp~
zW*VVW<t%pQ5JpxG86egb1P$G)uAqXoe+e&&d{Vctq{}cVglVGSQB{TaCz^eMsNWxL
z@g-O`?hnNS&G7`+BD6=N%>oxMa|I;lHK^k<SNX#YROH&Npcy2x08MoODhU&5VCl%b
zTG<O%QE!>6RQBSl$YqEb#xCq%g)VQA?y;vUZA%s_jSqFw?Ivk!SKWLgxe~KUA(}3}
z$^2Ygj6CUGb!pPMGymfDu-8%L+8CQh=e}3PZ=KsM)O=n0{!8blBX<Uy((B>&T*J)V
zHb;G9%g2cGYbi8xxA#?)FgH1Wj17we)#o3q8CaXiuF6i-PVFg8Tr2&UZhN$=dvxr<
z!d1unr~Zr8C%{>*?xpLoi{AIV@#ZHdIG9Y1AD=Yyi&v=6<JS*eZul@ev)6qgvB$pv
zPKHLdR^3?0S5Lj&lB)UEH<uqyoVjm1b=`Bcl^j(4ftuGlwmXm6cRU&I5bn44p8o|7
CEM-#w

literal 0
HcmV?d00001

diff --git a/eclipse-compile/fab/res/drawable-mdpi/fab_plus_icon.png b/eclipse-compile/fab/res/drawable-mdpi/fab_plus_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a320898584c4fdc4bf394f75f746f2f6f06ac28
GIT binary patch
literal 1055
zcmaJ=TWHfz7|vXsvWqAVnNu)kGUu>K(@WNd)vj$?SG8qyg%w{kP0qH^B_}3lHk*P|
z6y|Wqm`{6DK?PA!#0NncOk{8BUZzi?FFwr6gUAGNo@{OBgEb^M7ryWN|MUOfx!jXF
z+)&$GOAtguqFYGgvB~~6*WmyALU0)mJ5el)dSO2*hz20SGRy%op^5__4Mch5)I8`U
zh-ym7WKlMGjF+HFi#CR~R2{PkqBCUaqLc@S%z*(#3sPU7KBq`U4pM!-q${aM!JyJT
zYJlF+R7M)jO97b*9U?m|9t)@diKL|tX(n$4sa0Jb&+To7B3B_OAEefj$|ifrC^P`+
zqdiW^#j+&F(X7|UaqL0T?PA@G3%{I`_3}QBcXyD*hr-bext~u9@nS5z3Q~gz={&;}
z3I)30p`kIruz^6p)^NL>7~wQWG$dM1&1@+t2*8vKMMnzMNLx|N!C@4naHeZVQ1!B`
zW){nY3&vQY&akx0K2iyoO#UCLs%5l^(qKK`e+rwK5gjmTV8UTT!j0>1u|w&6)Bqxa
zMh3#6QWbj!A%f;0)X8WsN4E7TnhXo(fmM7m$tN@uiJAlwLXg4=w4%toFW}`O9iEP`
z-xFuqnAacmxP&OnMSSsiG!hG!xB`@hRiL2~S6=7(D{^fss5*`;07E$q<hTJ<a`ni(
zQaKl2MZF?duAB>3k;~v@7`w55HM+Eg-D6M7w#AFG@qvcjZeUwe^Rp>@C8iTXIAgub
z{aRTGRXeM;S5MBqdNOv&@%T#D?s{;4W9~Y2b?Rbw&CegcYtGuamD``Iw=Q?iOnf_k
z&cC?tWmQY#N3*_e%hBIAZqY+`+8pC&bbojAk<g31CpOIGKQ(V!JUhmWf9ZPLK3B7?
zj-7ZQEbTddlWH}-Pu_jg=&%%}s_nzV)S|q9;dT4;vmJz^iI{)XI`MF6W|w_s6S0(V
IFLLt29~$&k3;+NC

literal 0
HcmV?d00001

diff --git a/eclipse-compile/fab/res/drawable-xhdpi/fab_plus_icon.png b/eclipse-compile/fab/res/drawable-xhdpi/fab_plus_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a92d0a8f341bee64d0491227021a13839a30c4e8
GIT binary patch
literal 1113
zcmaJ=U2F_d7`-%v;)zHQF$M`?{<gbgciOFNced?fSF>GOm0&t^w>znsJ3Di0rwt-#
z#0x?s8c%*6Jg5pG5osGDgs31Ysd%U+ctG$XJV@Nx?v@8@GBfw@ob#P~zwaJvN;b@^
zTwDnNm=|x9Q>5j+Z`MrmZ<+q{C}|eqSSxNu8Jt&a2qGG4hg959I$#PaT6gXdtO1~c
z*3+%HHL+Pzk-;h+hII{#umPyq;982>2{F|UJ9INlf4MVEQ@R$WTLK9_VMSq9Z|t#Q
zb5Am@_H?Qtjowg8)wmK7Fd$Ya*Vtn^k{hNAx)SMo(;Q6|Ah<J3Pnv2?G*MAxLn^>l
zF)A+zlqj--KOl<2I?BfjK8`1^$OwKZAWFXVRPmunG+WC^DY?EFi;Ti_7Gq1|xO_g(
z=Brp_cW^=|6!J8DK87F|r`yDe%b3oJl7b8!)z&SnBa`wJm3GvH!!&U^xdp?Tk~N*;
zF_8n~T*cx9miM+)0wxmwhZ@Ed+QBLK$L~LdopiSaxfFCzm#vb-Wmb5hEGcS31tU9+
z(4NvMHf0e;P8L~Iv{|H9x9FyZ^3Iw9K9P{(rh^qzg>gAd69rb+HOcP}iFJZ67713>
z3qs5v6zcd$P?W{s`j{9B@FlK{)Gh;>xWv`|aO=x*y;3kN5?O|}z87lsHZrKfmL<Ks
zmuOkNB3CQ#MJ~(bh#AgH>|cp4O_A#Hx>IFK22+I(O;YVPDeGhV#)rt27>Ub~wEOx~
z-(clEenIb&kEcc&a%;^)LnpUP%o!cKd1B)IN};z}oBihgCF@(YH9q&(+l#k9pU*8n
za`*b)!?|gNi}m&N_oV~-Pt<PQc>%ow$>*mvl$$+R)wigy3cx`I)b_neCx5okOs1{>
z;j)#(m!6$z+zM_&mdOO#B2Rli{1`qv?elzhoB#2`O_#^!zRVsUYCItC>L2WVu=#y;
zQ3&h+KVD?UZaf)X%^ch`a4vXj`=o<wR|Y@@*tv|lJ)_~>Di0lxCFQGiyAS;aN*rrr

literal 0
HcmV?d00001

diff --git a/eclipse-compile/fab/res/drawable-xxhdpi/fab_plus_icon.png b/eclipse-compile/fab/res/drawable-xxhdpi/fab_plus_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..569b089f47cef2be0b82fdfe7a4ad516515e61d5
GIT binary patch
literal 1182
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUS}H#V;r8ce_d)2~P@&^OdG0C@?f(AO8g(%f9Q>f(~1RD^r68eAMwS&*t9
zlv<o$T9gcoxHM&uRRvbgMX8A;`9&f5`8lvq49LhY$uG{xFHmp}HdD|D&&*57FE7>v
ztM~P_^2{qPNz6-5^>ndS0-B(gnVDkc=4#+-Vq)g(XkqMXXy|I<1m>8TSejY7IGQ+F
z!t}c2Czs}?=9R$orXcjX;M5CB3b_S9n_W_iGRsm^+=}vZ6~JD$%Eav!N1WzC^`_u<
zixW=0`as9%gCZ6wqG3Y7)B|F|lP!<~Pxz^Mz|>v@Ox7I!_g^wFFba9PIEGZ*dUIz#
z=OG6X_5@`{X>aulhB5Bq1p?gBZ|58}yu!MssaN5cFsq_Mi?ST&&$<t@u2=j#VcY*h
zUHf#A!hT~H1`YuQhXw{lCKVvzHE)mV>lrOl;Z@fI#LF*O&klI*m7B9M|D9=d+5|;j
zpi)K_sCprwrmsvd!ZuI0iF_iyBJTWz>%8ld<+7q)&UKQNs_DI|@JO;;=fdlxKH1y4
zoB69I>3)0hz@js1v*KU%1&Q(NOuscBR=Tn;*?E`8PrYj;+ZKvVy{C8OlI4rJfoJDU
z-ZI$)=qeVd(^x!!?z_UhU{9KU<*iRAwr;ggJNd`7RT9}Pj9Jn1n0Oc*Om&xV3MXs?
Ol^C9`elF{r5}E*keu5YP

literal 0
HcmV?d00001

diff --git a/eclipse-compile/fab/res/drawable-xxxhdpi/fab_plus_icon.png b/eclipse-compile/fab/res/drawable-xxxhdpi/fab_plus_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..90a1d16dcf5922b85e7d4067a3c7c297a73e7ee3
GIT binary patch
literal 1105
zcmaJ=PiWIn7=N3cZo`2GK^zE=45orjnzYT@ux{;|)>TZIZDG9#OOv-Xbjgd!o6UOA
zAqskNc+-;u58ieY1P_8RVJA;R(OujSFTzgFiw9r2{@GzQBzf<B@AvzC-}k=nJ(<g2
z9~mAU1^|rYX5|7M7yNJVH2v>AugB<ckz~rGh!;s+br4ADxPoBLRF_Zzsru@jZ8QnM
zDaI(3Nm;omY1m{{AH#a4P1yiUPJ6bh)ewOdv}9Nb=HT6X1{!*TnU5+V#ZIHDG23uZ
zv5_xnjhYtMndvDw=}A<;L_~$2xoo+TmtdN@5}o^Ij)6@GsU?`BpvuY|Ok)SZC>suH
zA)be#$nue>DDu~!5aI<cL|-w;N2I7I2@|mOFw~o)FG>YD+ww(M38qSjEpc4EUT5oJ
z7CTEEACJd<4M7M}M9^Kei0TC`cdV@-BUf__n;6)FzM@*eD<r|tNRLu5?T)PFwvLG&
z80V=r$Fm_nr8ZDe{tq?H4%#IJ)Q$H<VYjquBd&m4yy9rIaEoKUD_crCNF~@QVZ7Wv
z#kndb*sWq4ri&uHGH+NquDe&8ctw$NmP=GiLpeFYPzBa7bZI6khr*FaI5m-t@q8u{
z<7dQ-9LtJ=kV;R4(rvDcwG|Utq|Md4+(=KZ-wLKpJ<G^3?jk+wU=ub|mW<x9@ICcf
zT)lTJLQgJ7gW>$b9xHU)M7zhIcG{LMI*pGk+U*W)>(~3|EA&ci<>XY!`}%A5+sGO`
zo4i%~a{q_WcW?XE_uZk#m!so@&t9w_{%!;S7zCgXKmY<@4S;h1^n;{Z8~FV9&7%wB
z$rHD`M)u&-^nU&=sqBn?2zUcSzSKr>Dm{Pcshv!BamTc~#>nR0&X(GL;$C3m#_hE}
Y@bJ%>kLxcFf6|0NE|ZrxXBHm(1D7{KjsO4v

literal 0
HcmV?d00001

diff --git a/eclipse-compile/fab/res/values-sw600dp/dimens.xml b/eclipse-compile/fab/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000000..3ca9bdfce2
--- /dev/null
+++ b/eclipse-compile/fab/res/values-sw600dp/dimens.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:17:21
+  -->
+
+<!--Used for tablet devices-->
+<resources>
+	<dimen name="fab_margin">24dp</dimen>
+</resources>
diff --git a/eclipse-compile/fab/res/values/attrs.xml b/eclipse-compile/fab/res/values/attrs.xml
new file mode 100644
index 0000000000..bdd08225a7
--- /dev/null
+++ b/eclipse-compile/fab/res/values/attrs.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:10:53
+  -->
+
+<resources>
+	<declare-styleable name="ActionButton">
+		<attr name="type" format="enum">
+			<enum name="DEFAULT" value="0" />
+			<enum name="MINI" value="1" />
+			
+			<!--Deprecated and will be removed in version 2.0.0. Use DEFAULT and MINI instead-->
+			<enum name="normal" value="0" />
+			<enum name="mini" value="1" />
+		</attr>
+		<attr name="button_color" format="color" />
+		<attr name="button_colorPressed" format="color" />
+		<attr name="shadow_radius" format="dimension" />
+		<attr name="shadow_xOffset" format="dimension" />
+		<attr name="shadow_yOffset" format="dimension" />
+		<attr name="shadow_color" format="color" />
+		<attr name="stroke_width" format="dimension" />
+		<attr name="stroke_color" format="color" />
+		<attr name="show_animation" format="reference" />
+		<attr name="hide_animation" format="reference" />
+        <attr name="image" format="reference" />
+		<attr name="image_size" format="dimension" />
+		
+		<!--Deprecated and will be removed in version 2.0.0. Use show_animation and hide_animation instead-->
+		<attr name="animation_onShow" format="reference" />
+		<attr name="animation_onHide" format="reference" />
+	</declare-styleable>
+</resources>
diff --git a/eclipse-compile/fab/res/values/colors.xml b/eclipse-compile/fab/res/values/colors.xml
new file mode 100644
index 0000000000..60ca1a0bbb
--- /dev/null
+++ b/eclipse-compile/fab/res/values/colors.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-18 14:16:05
+  -->
+
+<resources>
+	<!--
+		Material 500 colors are for normal button state
+		Material 900 colors are for pressed button state
+	-->
+	<!--Material Red-->
+	<color name="fab_material_red_500">#f44336</color>
+	<color name="fab_material_red_900">#b71c1c</color>
+	<!--Material Pink-->
+	<color name="fab_material_pink_500">#e91e63</color>
+	<color name="fab_material_pink_900">#880e4f</color>
+	<!--Material Purple-->
+	<color name="fab_material_purple_500">#9c27b0</color>
+	<color name="fab_material_purple_900">#4a148c</color>
+	<!--Material Deep Purple-->
+	<color name="fab_material_deep_purple_500">#673ab7</color>
+	<color name="fab_material_deep_purple_900">#311b92</color>
+	<!--Material Indigo-->
+	<color name="fab_material_indigo_500">#3f51b5</color>
+	<color name="fab_material_indigo_900">#1a237e</color>
+	<!--Material Blue-->
+	<color name="fab_material_blue_500">#2196f3</color>
+	<color name="fab_material_blue_900">#0d47a1</color>
+	<!--Material Light Blue-->
+	<color name="fab_material_light_blue_500">#03a9f4</color>
+	<color name="fab_material_light_blue_900">#01579b</color>
+	<!--Material Cyan-->
+	<color name="fab_material_cyan_500">#00bcd4</color>
+	<color name="fab_material_cyan_900">#006064</color>
+	<!--Material Teal-->
+	<color name="fab_material_teal_500">#009688</color>
+	<color name="fab_material_teal_900">#004d40</color>
+	<!--Material Green-->
+	<color name="fab_material_green_500">#4caf50</color>
+	<color name="fab_material_green_900">#1b5e20</color>
+	<!--Material Light Green-->
+	<color name="fab_material_light_green_500">#8bc34a</color>
+	<color name="fab_material_light_green_900">#33691e</color>
+	<!--Material Lime-->
+	<color name="fab_material_lime_500">#cddc39</color>
+	<color name="fab_material_lime_900">#827717</color>
+	<!--Material Yellow-->
+	<color name="fab_material_yellow_500">#ffeb3b</color>
+	<color name="fab_material_yellow_900">#f57f17</color>
+	<!--Material Amber-->
+	<color name="fab_material_amber_500">#ffc107</color>
+	<color name="fab_material_amber_900">#ff6f00</color>
+	<!--Material Orange-->
+	<color name="fab_material_orange_500">#ff9800</color>
+	<color name="fab_material_orange_900">#e65100</color>
+	<!--Material Deep Orange-->
+	<color name="fab_material_deep_orange_500">#ff5722</color>
+	<color name="fab_material_deep_orange_900">#bf360c</color>
+	<!--Material Brown-->
+	<color name="fab_material_brown_500">#795548</color>
+	<color name="fab_material_brown_900">#3e2723</color>
+	<!--Material Grey-->
+	<color name="fab_material_grey_500">#9e9e9e</color>
+	<color name="fab_material_grey_900">#212121</color>
+	<!--Material Blue Grey-->
+	<color name="fab_material_blue_grey_500">#607d8b</color>
+	<color name="fab_material_blue_grey_900">#263238</color>
+	<!--Material Black-->
+	<color name="fab_material_black">#000000</color>
+	<!--Material White-->
+	<color name="fab_material_white">#ffffff</color>
+</resources>
diff --git a/eclipse-compile/fab/res/values/dimens.xml b/eclipse-compile/fab/res/values/dimens.xml
new file mode 100644
index 0000000000..06d5dccfcd
--- /dev/null
+++ b/eclipse-compile/fab/res/values/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 Shell Software Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ File created: 2015-01-17 10:15:16
+-->
+<resources>
+
+    <!-- Used for mobile (non-tablet) devices -->
+    <dimen name="fab_margin">16dp</dimen>
+
+</resources>

From 91944cbd777af9c61867f8bd86e06d5682c6be33 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 20:51:16 +0100
Subject: [PATCH 12/23] Update widgets

---
 .../plus/audionotes/AudioVideoNotesPlugin.java    | 12 +++++-------
 .../plus/development/OsmandDevelopmentPlugin.java |  2 +-
 .../plus/monitoring/OsmandMonitoringPlugin.java   | 12 +++++-------
 .../osmand/plus/osmedit/DashOsmEditsFragment.java |  2 +-
 .../plus/osmedit/LocalOpenstreetmapActivity.java  |  2 +-
 .../net/osmand/plus/osmedit/OsmEditsFragment.java |  2 +-
 .../osmand/plus/osmedit/UploadGPXFilesTask.java   |  2 +-
 OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java   | 15 +++++----------
 .../routepointsnavigation/RoutePointsPlugin.java  |  6 +++---
 .../sherpafy/SherpafyStageItineraryFragment.java  |  1 -
 .../src/net/osmand/plus/views/MapInfoLayer.java   |  4 ++--
 .../views/mapwidgets/MapInfoWidgetsFactory.java   |  3 ++-
 .../plus/views/mapwidgets/MapWidgetRegistry.java  |  4 ++--
 .../plus/views/mapwidgets/TextInfoWidget.java     |  6 ++++++
 14 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 78932c7b2c..b2ed7f56da 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -31,14 +31,13 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
-import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.activities.TabActivity.TabItem;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.StackWidgetView;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import net.osmand.util.Algorithms;
 import net.osmand.util.GeoPointParserUtil.GeoParsedPoint;
@@ -518,7 +517,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	private void registerWidget(MapActivity activity) {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null) {
-			recordControl = new TextInfoWidget(activity, 0, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
+			recordControl = new TextInfoWidget(activity);
 			recordControl.setImageDrawable(activity.getResources().getDrawable(R.drawable.monitoring_rec_inactive));
 			setRecordListener(recordControl, activity);
 			mapInfoLayer.getMapInfoControls().registerSideWidget(recordControl, R.drawable.widget_icon_av_inactive, R.drawable.widget_icon_av_inactive,
@@ -948,10 +947,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		recordControl.setText(app.getString(R.string.shared_string_control_stop), "");
 		recordControl.setImageDrawable(activity.getResources().getDrawable(R.drawable.widget_icon_av_active));
 		final MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
-		final StackWidgetView par = mil.getRightStack();
-		final boolean contains = par.getAllViews().contains(recordControl);
+		final boolean contains = recordControl.isVisible();
 		if (!contains) {
-			par.addStackView(recordControl);
+			recordControl.setVisible(true);
 			mapActivity.getMapView().refreshMap(true);
 		}
 		AccessibleToast.makeText(mapActivity, R.string.recording_is_recorded, Toast.LENGTH_LONG).show();
@@ -959,7 +957,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			@Override
 			public void onClick(View v) {
 				if (!contains) {
-					par.removeView(recordControl);
+					recordControl.setVisible(false);
 				}
 				stopRecording(mapActivity);
 				SHOW_RECORDINGS.set(true);
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index 211783c83a..1e3b96839b 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -53,7 +53,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		final OsmandMapTileView mv = activity.getMapView();
 		if (mapInfoLayer != null) {
-			fps = new TextInfoWidget(activity, 0, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText()) {
+			fps = new TextInfoWidget(activity) {
 				@Override
 				public boolean updateInfo(DrawSettings drawSettings) {
 					if(!mv.isMeasureFPS()) {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index a6a1fcb6a8..0f499d49fb 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -51,7 +51,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 	private static final String ID = "osmand.monitoring";
 	private OsmandSettings settings;
 	private OsmandApplication app;
-	private BaseMapWidget monitoringControl;
+	private TextInfoWidget monitoringControl;
 	private LiveMonitoringHelper liveMonitoringHelper;
 	private boolean ADD_BG_TO_ACTION = true;
 	private boolean isSaving;
@@ -103,7 +103,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 	@Override
 	public void registerLayers(MapActivity activity) {
 		MapInfoLayer layer = activity.getMapLayers().getMapInfoLayer();
-		monitoringControl = createMonitoringControl(activity, layer.getPaintText(), layer.getPaintSubText());
+		monitoringControl = createMonitoringControl(activity);
 		
 		layer.getMapInfoControls().registerSideWidget(monitoringControl,
 				R.drawable.monitoring_rec_big, R.drawable.monitoring_rec_big, R.string.map_widget_monitoring, "monitoring", false, 18);
@@ -151,11 +151,11 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 	/**
 	 * creates (if it wasn't created previously) the control to be added on a MapInfoLayer that shows a monitoring state (recorded/stopped)
 	 */
-	private BaseMapWidget createMonitoringControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+	private TextInfoWidget createMonitoringControl(final MapActivity map) {
 		final Drawable monitoringBig = map.getResources().getDrawable(R.drawable.monitoring_rec_big);
 		final Drawable monitoringSmall = map.getResources().getDrawable(R.drawable.monitoring_rec_small);
 		final Drawable monitoringInactive = map.getResources().getDrawable(R.drawable.monitoring_rec_inactive);
-		monitoringControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+		monitoringControl = new TextInfoWidget(map) {
 			long lastUpdateTime;
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {
@@ -202,8 +202,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 					lastUpdateTime = last;
 					//blink implementation with 2 indicator states (global logging + profile/navigation logging)
 					setImageDrawable(monitoringInactive);
-					invalidate();
-					postDelayed(new Runnable() {
+					map.getMyApplication().runInUIThread(new Runnable() {
 						@Override
 						public void run() {
 							if (globalRecord) {
@@ -211,7 +210,6 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 							} else {
 								setImageDrawable(monitoringSmall);
 							}
-							invalidate();
 						}
 					}, 500);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
index 54b98eef4c..b6f3442e39 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
@@ -95,7 +95,7 @@ public class DashOsmEditsFragment extends DashBaseFragment implements OsmEditsUp
 			send.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					OpenstreetmapRemoteUtil remotepoi = new OpenstreetmapRemoteUtil(getActivity(), getActivity().getWindow().getDecorView());
+					OpenstreetmapRemoteUtil remotepoi = new OpenstreetmapRemoteUtil(getActivity());
 					OsmPoint[] toUpload = new OsmPoint[]{point};
 					OsmBugsRemoteUtil remotebug = new OsmBugsRemoteUtil(getMyApplication());
 					ProgressDialog dialog = ProgressImplementation.createProgressDialog(
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
index 242c7daaaa..ed21d8a3d1 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java
@@ -81,7 +81,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity {
 		dbpoi = new OpenstreetmapsDbHelper(this);
 		dbbug = new OsmBugsDbHelper(this);
 
-		remotepoi = new OpenstreetmapRemoteUtil(this, this.getWindow().getDecorView());
+		remotepoi = new OpenstreetmapRemoteUtil(this);
 		remotebug = new OsmBugsRemoteUtil(getMyApplication());
 
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
index c0d3ec1f49..1bf2b4bf61 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
@@ -72,7 +72,7 @@ public class OsmEditsFragment extends ListFragment implements OsmEditsUploadList
 		dbpoi = new OpenstreetmapsDbHelper(getActivity());
 		dbbug = new OsmBugsDbHelper(getActivity());
 
-		remotepoi = new OpenstreetmapRemoteUtil(getActivity(), getActivity().getWindow().getDecorView());
+		remotepoi = new OpenstreetmapRemoteUtil(getActivity());
 		remotebug = new OsmBugsRemoteUtil(getMyApplication());
 
 		return view;
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/UploadGPXFilesTask.java b/OsmAnd/src/net/osmand/plus/osmedit/UploadGPXFilesTask.java
index efbf65e3e1..0dfcd0c60b 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/UploadGPXFilesTask.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/UploadGPXFilesTask.java
@@ -34,7 +34,7 @@ public class UploadGPXFilesTask extends AsyncTask<GpxInfo, String, String> {
 			if (!isCancelled() && info.file != null) {
 				String warning = null;
 				File file = info.file;
-				warning = new OpenstreetmapRemoteUtil(la, null).uploadGPXFile(tagstring, description, visibility,
+				warning = new OpenstreetmapRemoteUtil(la).uploadGPXFile(tagstring, description, visibility,
 						file);
 				total++;
 				if (warning == null) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index ba96fef3ab..5c1df6364c 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -32,7 +32,6 @@ import net.osmand.plus.views.MonitoringInfoControl;
 import net.osmand.plus.views.MonitoringInfoControl.MonitoringInfoControlServices;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import net.osmand.util.Algorithms;
 
@@ -42,7 +41,6 @@ import org.json.JSONObject;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.view.View;
@@ -55,7 +53,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 	private OsMoService service;
 	private OsMoTracker tracker;
 	private OsMoGroups groups;
-	private BaseMapWidget osmoControl;
+	private TextInfoWidget osmoControl;
 	private OsMoPositionLayer olayer;
 	protected MapActivity mapActivity;
 	protected OsMoGroupsActivity groupsActivity;
@@ -189,7 +187,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 	public void registerLayers(MapActivity activity) {
 		super.registerLayers(activity);
 		MapInfoLayer layer = activity.getMapLayers().getMapInfoLayer();
-		osmoControl = createOsMoControl(activity, layer.getPaintText(), layer.getPaintSubText());
+		osmoControl = createOsMoControl(activity);
 		layer.getMapInfoControls().registerSideWidget(osmoControl,
 				R.drawable.mon_osmo_signal_inactive, R.drawable.mon_osmo_signal_inactive, R.string.osmo_control, "osmo_control", false, 18);
 		layer.recreateControls();
@@ -218,7 +216,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 	/**
 	 * creates (if it wasn't created previously) the control to be added on a MapInfoLayer that shows a monitoring state (recorded/stopped)
 	 */
-	private BaseMapWidget createOsMoControl(final MapActivity map, Paint paintText, Paint paintSubText) {
+	private TextInfoWidget createOsMoControl(final MapActivity map) {
 		
 		final Drawable srcSmall = map.getResources().getDrawable(R.drawable.mon_osmo_conn_small);
 		final Drawable srcSignalSmall = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small);
@@ -226,7 +224,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 		final Drawable srcSignalBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big);
 //		final Drawable srcinactive = map.getResources().getDrawable(R.drawable.mon_osmo_inactive);
 		final Drawable srcSignalinactive = map.getResources().getDrawable(R.drawable.mon_osmo_signal_inactive);
-		final TextInfoWidget osmoControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+		final TextInfoWidget osmoControl = new TextInfoWidget(map) {
 			long lastUpdateTime;
 			private Drawable blinkImg;
 			@Override
@@ -281,14 +279,11 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 			private void blink(Drawable bigger, final Drawable smaller ) {
 				blinkImg = smaller;
 				setImageDrawable(bigger);
-				invalidate();
-				postDelayed(new Runnable() {
+				map.getMyApplication().runInUIThread(new Runnable() {
 					@Override
 					public void run() {
 						blinkImg = null;
 						setImageDrawable(smaller);
-						requestLayout();
-						invalidate();
 					}
 				}, 500);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
index 3da4230985..c0ab056f56 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
@@ -199,7 +199,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 	private void registerWidget(MapActivity activity) {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null) {
-			routeStepsControl = createRouteStepsInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
+			routeStepsControl = createRouteStepsInfoControl(activity);
 			mapInfoLayer.getMapInfoControls().registerSideWidget(routeStepsControl,
 					R.drawable.widget_signpost, R.drawable.widget_signpost, R.string.map_widget_route_points, "route_steps", false, 8);
 			mapInfoLayer.recreateControls();
@@ -245,8 +245,8 @@ public class RoutePointsPlugin extends OsmandPlugin {
 		}
 	}
 
-	private TextInfoWidget createRouteStepsInfoControl(final MapActivity map, Paint paintText, Paint paintSubText) {
-		TextInfoWidget routeStepsControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
+	private TextInfoWidget createRouteStepsInfoControl(final MapActivity map) {
+		TextInfoWidget routeStepsControl = new TextInfoWidget(map) {
 
 			@Override()
 			public boolean updateInfo(OsmandMapLayer.DrawSettings drawSettings) {
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageItineraryFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageItineraryFragment.java
index 5679b266cc..79052ecd66 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageItineraryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageItineraryFragment.java
@@ -32,7 +32,6 @@ public class SherpafyStageItineraryFragment extends SherpafyStageInfoFragment im
 	
 	protected void updateView(WebView description, ImageView icon, TextView additional, TextView text, TextView header) {
 		app.getResourceManager().getMapTileDownloader().addDownloaderCallback(this);
-		osmandMapTileView.getView().setVisibility(View.VISIBLE);
 		osmandMapTileView.removeAllLayers();
 		MapVectorLayer mapVectorLayer = new MapVectorLayer(null, true);
 		MapTextLayer mapTextLayer = new MapTextLayer();
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 77177353fc..ead88e1037 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -413,11 +413,11 @@ public class MapInfoLayer extends OsmandMapLayer {
 		
 	}
 	
-	public StackWidgetView getRightStack() {
+	public LinearLayout getRightStack() {
 		return rightStack;
 	}
 	
-	public StackWidgetView getLeftStack() {
+	public LinearLayout getLeftStack() {
 		return leftStack;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 9229d4073c..fc3a80c1ee 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -266,7 +266,8 @@ public class MapInfoWidgetsFactory {
 			}
 		});
 		if(isScreenLocked){
-			map.addLockView(transparentLockView);
+			// TODO
+//			map.addLockView(transparentLockView);
 		}
 		return lockView;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 9f207dbdd8..402a15ba9a 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -180,9 +180,9 @@ public class MapWidgetRegistry {
 		Set<MapWidgetRegInfo> st = left ? this.left : this.right;
 		for (MapWidgetRegInfo r : st) {
 			if (r.visibleCollapsible != null && r.visibleCollapsible.contains(appMode)) {
-				stack.addCollapsedView((BaseMapWidget) r.widget);
+				stack.addCollapsedView(r.widget);
 			} else if (r.visibleModes.contains(appMode)) {
-				stack.addStackView((BaseMapWidget) r.widget);
+				stack.addStackView(r.widget);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index fe2ce87d8f..c8721bbab0 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -32,6 +32,7 @@ public class TextInfoWidget  {
 		} else {
 			imageView.setVisibility(View.INVISIBLE);
 		}
+		imageView.invalidate();
 	}
 	
 	public void setContentDescription(CharSequence text) {
@@ -97,5 +98,10 @@ public class TextInfoWidget  {
 	public void setOnClickListener(OnClickListener onClickListener) {
 		view.setOnClickListener(onClickListener);
 	}
+
+	public void setVisible(boolean b) {
+		// TODO Auto-generated method stub
+		
+	}
 	
 }
\ No newline at end of file

From 1bfaf5e1c65385c700b73aa42e9ba9b726d197bc Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 14 Mar 2015 23:30:53 +0100
Subject: [PATCH 13/23] Clear from errors

---
 OsmAnd/res/drawable/btn_flat_trans.xml        |  13 +
 OsmAnd/res/drawable/btn_inset_circle.xml      |   7 +-
 .../res/drawable/btn_inset_circle_trans.xml   |  19 +
 OsmAnd/res/drawable/btn_left_round_night.xml  |  15 +
 OsmAnd/res/drawable/btn_left_round_trans.xml  |  15 +
 OsmAnd/res/drawable/btn_right_round_night.xml |  18 +
 OsmAnd/res/drawable/btn_right_round_trans.xml |  18 +
 OsmAnd/res/layout/map_hud_top.xml             |   1 +
 OsmAnd/res/layout/map_hud_widget.xml          |   1 +
 .../audionotes/AudioVideoNotesPlugin.java     |   6 +-
 .../monitoring/OsmandMonitoringPlugin.java    |  46 +-
 .../osmand/plus/monitoring/ValueHolder.java   |   6 +
 .../src/net/osmand/plus/osmo/OsMoPlugin.java  |  31 +-
 .../net/osmand/plus/views/MapInfoLayer.java   | 475 +++++++-----------
 .../plus/views/MonitoringInfoControl.java     | 101 ----
 .../mapwidgets/AppearanceWidgetsFactory.java  |  63 ---
 .../mapwidgets/MapInfoWidgetsFactory.java     |   4 +-
 .../views/mapwidgets/MapWidgetRegistry.java   | 344 +++++++------
 .../views/mapwidgets/StackWidgetView.java     | 261 ----------
 .../plus/views/mapwidgets/TextInfoWidget.java |  23 +-
 20 files changed, 505 insertions(+), 962 deletions(-)
 create mode 100644 OsmAnd/res/drawable/btn_flat_trans.xml
 create mode 100644 OsmAnd/res/drawable/btn_inset_circle_trans.xml
 create mode 100644 OsmAnd/res/drawable/btn_left_round_night.xml
 create mode 100644 OsmAnd/res/drawable/btn_left_round_trans.xml
 create mode 100644 OsmAnd/res/drawable/btn_right_round_night.xml
 create mode 100644 OsmAnd/res/drawable/btn_right_round_trans.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/monitoring/ValueHolder.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java

diff --git a/OsmAnd/res/drawable/btn_flat_trans.xml b/OsmAnd/res/drawable/btn_flat_trans.xml
new file mode 100644
index 0000000000..331c6c033c
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_flat_trans.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+            <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle.xml b/OsmAnd/res/drawable/btn_inset_circle.xml
index d08b764287..722a79f782 100644
--- a/OsmAnd/res/drawable/btn_inset_circle.xml
+++ b/OsmAnd/res/drawable/btn_inset_circle.xml
@@ -4,13 +4,16 @@
     <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
             <shape android:shape="oval">
                 <solid android:color="@color/map_widget_light_pressed" />
-                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+
+                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
             </shape>
         </inset></item>
     <item><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
             <shape android:shape="oval">
                 <solid android:color="@color/map_widget_light" />
-                <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+
+                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
             </shape>
         </inset></item>
+
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_inset_circle_trans.xml b/OsmAnd/res/drawable/btn_inset_circle_trans.xml
new file mode 100644
index 0000000000..c5456783aa
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_inset_circle_trans.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_light_pressed" />
+
+                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+            </shape>
+        </inset></item>
+    <item><inset android:insetBottom="@dimen/map_button_inset" android:insetLeft="@dimen/map_button_inset" android:insetRight="@dimen/map_button_inset" android:insetTop="@dimen/map_button_inset">
+            <shape android:shape="oval">
+                <solid android:color="@color/map_widget_light_trans" />
+
+                <stroke android:width="@dimen/map_button_stroke" android:color="@color/map_widget_stroke" />
+            </shape>
+        </inset></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round_night.xml b/OsmAnd/res/drawable/btn_left_round_night.xml
new file mode 100644
index 0000000000..7315a889fb
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_left_round_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark" />
+            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_left_round_trans.xml b/OsmAnd/res/drawable/btn_left_round_trans.xml
new file mode 100644
index 0000000000..9bdcdad3a8
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_left_round_trans.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+            <corners android:topLeftRadius="@dimen/map_button_rect_rad" android:bottomLeftRadius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_right_round_night.xml b/OsmAnd/res/drawable/btn_right_round_night.xml
new file mode 100644
index 0000000000..5ad2fbe093
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_right_round_night.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_dark" />
+            <corners
+                android:topRightRadius="@dimen/map_button_rect_rad"
+                android:bottomRightRadius="@dimen/map_button_rect_rad" 
+                />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_right_round_trans.xml b/OsmAnd/res/drawable/btn_right_round_trans.xml
new file mode 100644
index 0000000000..4ecd18b23c
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_right_round_trans.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_pressed" />
+            <corners android:radius="@dimen/map_button_rect_rad" />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+    <item><shape android:shape="rectangle">
+            <solid android:color="@color/map_widget_light_trans" />
+            <corners
+                android:topRightRadius="@dimen/map_button_rect_rad"
+                android:bottomRightRadius="@dimen/map_button_rect_rad" 
+                />
+            <stroke android:color="@color/map_widget_stroke" android:width="@dimen/map_button_stroke"/>
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index fd1b10fd52..8c8bc8f46b 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="@dimen/map_address_height"
+        android:id="@+id/map_top_bar"
         android:background="@drawable/btn_flat"
         android:orientation="horizontal" >
 
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 25698ef3c0..ae0e21b680 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:id="@+id/widget_bg"
     android:minWidth="100dp"
     android:layout_height="wrap_content"
     android:background="@drawable/btn_left_round"
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index b2ed7f56da..16afde15db 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -949,7 +949,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		final MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
 		final boolean contains = recordControl.isVisible();
 		if (!contains) {
-			recordControl.setVisible(true);
+			recordControl.setExplicitlyVisible(true);
+			mil.recreateControls();
 			mapActivity.getMapView().refreshMap(true);
 		}
 		AccessibleToast.makeText(mapActivity, R.string.recording_is_recorded, Toast.LENGTH_LONG).show();
@@ -957,7 +958,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			@Override
 			public void onClick(View v) {
 				if (!contains) {
-					recordControl.setVisible(false);
+					recordControl.setExplicitlyVisible(false);
+					mil.recreateControls();
 				}
 				stopRecording(mapActivity);
 				SHOW_RECORDINGS.set(true);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 0f499d49fb..051476dc96 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -18,12 +18,8 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.views.MapInfoLayer;
-import net.osmand.plus.views.MonitoringInfoControl;
-import net.osmand.plus.views.MonitoringInfoControl.MonitoringInfoControlServices;
-import net.osmand.plus.views.MonitoringInfoControl.ValueHolder;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -31,8 +27,6 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -47,7 +41,7 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
-public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringInfoControlServices {
+public class OsmandMonitoringPlugin extends OsmandPlugin {
 	private static final String ID = "osmand.monitoring";
 	private OsmandSettings settings;
 	private OsmandApplication app;
@@ -115,10 +109,6 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		if(monitoringControl == null) {
 			registerLayers(activity);
 		}
-		MonitoringInfoControl lock = activity.getMapLayers().getMapInfoLayer().getMonitoringInfoControl();
-		if(lock != null && !lock.getMonitorActions().contains(this)) {
-			lock.addMonitorActions(this);
-		}
 	}
 
 	@Override
@@ -456,38 +446,4 @@ public class OsmandMonitoringPlugin extends OsmandPlugin implements MonitoringIn
 		return ll;
 	}
 	
-	
-	@Override
-	public void addMonitorActions(final ContextMenuAdapter qa, final MonitoringInfoControl li, final OsmandMapTileView view) {
-		if (ADD_BG_TO_ACTION) {
-			final Intent serviceIntent = new Intent(view.getContext(), NavigationService.class);
-			final boolean bgoff = view.getApplication().getNavigationService() == null;
-			int msgId = !bgoff ? R.string.bg_service_sleep_mode_on : R.string.bg_service_sleep_mode_off;
-			int draw = !bgoff ? R.drawable.monitoring_rec_big : R.drawable.monitoring_rec_inactive;
-			qa.item(msgId).icon(draw).listen(new OnContextMenuClick() {
-				@Override
-				public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-					if (view.getApplication().getNavigationService() == null) {
-						final ValueHolder<Integer> vs = new ValueHolder<Integer>();
-						final ValueHolder<Boolean> choice = new ValueHolder<Boolean>();
-						vs.value = view.getSettings().SERVICE_OFF_INTERVAL.get();
-						showIntervalChooseDialog(view.getContext(), app.getString(R.string.gps_wakeup_interval),
-								app.getString(R.string.background_router_service),
-								SettingsMonitoringActivity.BG_SECONDS, SettingsMonitoringActivity.BG_MINUTES, choice, vs,
-								new OnClickListener() {
-									@Override
-									public void onClick(DialogInterface dialog, int which) {
-										view.getSettings().SERVICE_OFF_INTERVAL.set(vs.value);
-										view.getContext().startService(serviceIntent);
-									}
-								});
-					} else {
-						view.getContext().stopService(serviceIntent);
-					}
-					return true;
-				}
-			}).position(0).reg();
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/ValueHolder.java b/OsmAnd/src/net/osmand/plus/monitoring/ValueHolder.java
new file mode 100644
index 0000000000..de2f833fe3
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/monitoring/ValueHolder.java
@@ -0,0 +1,6 @@
+package net.osmand.plus.monitoring;
+
+public class ValueHolder<T> {
+
+	public T value;
+}
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index 5c1df6364c..f8d9cd147b 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -28,10 +28,7 @@ import net.osmand.plus.download.DownloadFileHelper;
 import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoDevice;
 import net.osmand.plus.osmo.OsMoService.SessionInfo;
 import net.osmand.plus.views.MapInfoLayer;
-import net.osmand.plus.views.MonitoringInfoControl;
-import net.osmand.plus.views.MonitoringInfoControl.MonitoringInfoControlServices;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import net.osmand.util.Algorithms;
 
@@ -46,7 +43,7 @@ import android.os.AsyncTask;
 import android.view.View;
 import android.widget.ArrayAdapter;
 
-public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlServices, OsMoReactor {
+public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 
 	private OsmandApplication app;
 	public static final String ID = "osmand.osmo";
@@ -123,17 +120,6 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 		return R.drawable.ic_osmo_dark;
 	}
 
-	@Override
-	public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
-		// registerLayers(activity);
-		super.updateLayers(mapView, activity);
-		MonitoringInfoControl lock = activity.getMapLayers().getMapInfoLayer().getMonitoringInfoControl();
-		if (lock != null && !lock.getMonitorActions().contains(this)) {
-			lock.addMonitorActions(this);
-		}
-		
-		
-	}
 	
 	@Override
 	public void registerMapContextMenuActions(final MapActivity mapActivity, final double latitude, final double longitude,
@@ -300,21 +286,6 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 		return osmoControl;
 	}
 
-	@Override
-	public void addMonitorActions(ContextMenuAdapter qa, MonitoringInfoControl li, final OsmandMapTileView view) {
-		qa.item("Test (send)").icons(R.drawable.ic_action_grefresh_dark, R.drawable.ic_action_grefresh_light)
-				.listen(new OnContextMenuClick() {
-
-					@Override
-					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						final double lat = view.getLatitude();
-						final double lon = view.getLongitude();
-						tracker.sendCoordinate(lat, lon);
-						return true;
-					}
-				}).reg();
-	}
-
 	@Override
 	public Class<? extends Activity> getSettingsActivity() {
 		return SettingsOsMoActivity.class;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index ead88e1037..8a1094e4f2 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -2,7 +2,6 @@ package net.osmand.plus.views;
 
 
 import java.lang.reflect.Field;
-import java.util.Set;
 
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.ApplicationMode;
@@ -13,32 +12,22 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
-import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.mapwidgets.AppearanceWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.BaseMapWidget;
-import net.osmand.plus.views.mapwidgets.ImageViewWidget;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
-import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopTextView;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
-import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
-import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory;
-import net.osmand.plus.views.mapwidgets.StackWidgetView;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
-import net.osmand.plus.views.mapwidgets.UpdateableWidget;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.view.Gravity;
+import android.graphics.Typeface;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class MapInfoLayer extends OsmandMapLayer {
 
@@ -48,34 +37,32 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private final RouteLayer routeLayer;
 	private OsmandMapTileView view;
 	
-//	private Paint paintText;
-//	private Paint paintSubText;
-//	private Paint paintSmallText;
-//	private Paint paintSmallSubText;
-//	private Paint paintImg;
-//	private View progressBar;
-//	
 	// groups
+	private View topBar;
 	private LinearLayout rightStack;
 	private LinearLayout leftStack;
+	private ImageButton  expand;
+	private static boolean expanded = false;
 	private BaseMapWidget lanesControl;
 	private BaseMapWidget alarmControl;
 	private MapWidgetRegistry mapInfoControls;
 
-	private MonitoringInfoControl monitoringServices;
+	private OsmandSettings settings;
+
 
 	public MapInfoLayer(MapActivity map, RouteLayer layer){
 		this.map = map;
+		settings = map.getMyApplication().getSettings();
 		this.routeLayer = layer;
 	}
 	
-	public MonitoringInfoControl getMonitoringInfoControl() {
-		return monitoringServices;
-	}
-	
 	public MapWidgetRegistry getMapInfoControls() {
 		return mapInfoControls;
 	}
+	
+	public MapActivity getMapActivity() {
+		return map;
+	}
 
 	@Override
 	public void initLayer(final OsmandMapTileView view) {
@@ -115,11 +102,17 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 
 		mapInfoControls = new MapWidgetRegistry(map.getMyApplication().getSettings());
-		monitoringServices = new MonitoringInfoControl();
-
+		topBar = map.findViewById(R.id.map_top_bar);
+		leftStack = (LinearLayout) map.findViewById(R.id.map_left_widgets_panel);
+		rightStack = (LinearLayout) map.findViewById(R.id.map_right_widgets_panel);
+		expand = (ImageButton) map.findViewById(R.id.map_collapse_button);
 
+		
+		// update and create controls
 		registerAllControls();
-		createControls();
+		alarmControl.setVisibility(View.GONE);
+		lanesControl.setVisibility(View.GONE);
+		recreateControls();
 	}
 	
 	public void registerAllControls(){
@@ -130,19 +123,18 @@ public class MapInfoLayer extends OsmandMapLayer {
 		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
 		
 		alarmControl = ric.createAlarmInfoControl(app, map);
-		// register right stack
-		
-		RoutingHelper routingHelper = app.getRoutingHelper();
-		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(), paintText,
-				paintSubText, false);
-		mapInfoControls.registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
-		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(),
-				paintSmallText, paintSmallSubText, true);
-		mapInfoControls.registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
-				10);
-		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(routingHelper, app, view.getSettings(),
-				paintSmallText, paintSmallSubText, true);
-		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
+		// register left stack
+		// FIXME TODO LEFT STACK
+//		RoutingHelper routingHelper = app.getRoutingHelper();
+//		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(), false);
+//		mapInfoControls.registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
+//		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(),
+//				paintSmallText, paintSmallSubText, true);
+//		mapInfoControls.registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
+//				10);
+//		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(routingHelper, app, view.getSettings(),
+//				paintSmallText, paintSmallSubText, true);
+//		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
 		// right stack
 		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
 		mapInfoControls.registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
@@ -160,88 +152,159 @@ public class MapInfoLayer extends OsmandMapLayer {
 		mapInfoControls.registerSideWidget(alt, R.drawable.widget_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
 		TextInfoWidget plainTime = ric.createPlainTimeControl(map);
 		mapInfoControls.registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
-
-		// Register appearance widgets
-		AppearanceWidgetsFactory.INSTANCE.registerAppearanceWidgets(map, this, mapInfoControls);
 	}
 	
 	
 
-	public void recreateControls(){
-		rightStack.clearAllViews();
-		mapInfoControls.populateStackControl(rightStack, view, false);
-		
-		leftStack.clearAllViews();
-		mapInfoControls.populateStackControl(leftStack, view, true);
+	public void recreateControls() {
+		rightStack.removeAllViews();
+		mapInfoControls.populateStackControl(rightStack, view.getSettings().getApplicationMode(), false, expanded);
+		leftStack.removeAllViews();
+		mapInfoControls.populateStackControl(leftStack, view.getSettings().getApplicationMode(), true, expanded);
 		leftStack.requestLayout();
 		rightStack.requestLayout();
-		
 		updateColorShadowsOfText(null);
 	}
 
-	public void createControls() {
-		FrameLayout parent = (FrameLayout) ((FrameLayout) view.getParent()).findViewById(R.id.MapInfoControls);
-		
-		// form measurement
-		ImageView iv = new ImageView(map);
-		iv.setImageDrawable(map.getResources().getDrawable(R.drawable.la_backtoloc_disabled));
-		rightStack = map;
-		leftStack = new StackWidgetView(view.getContext());
-		
-		// 2. Preparations
-		Rect topRectPadding = new Rect();
-		view.getResources().getDrawable(R.drawable.box_top).getPadding(topRectPadding);
-		// for measurement
-		// 3. put into frame parent layout controls
 
-		// status bar hides own top part 
-		// we want that status bar lays over map stack controls
-		int topMargin = -topRectPadding.top;
-
-		FrameLayout.LayoutParams flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.RIGHT);
-		flp.rightMargin = 0;
-		flp.topMargin = topMargin;
-		rightStack.setLayoutParams(flp);
-		
-		
-		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL | Gravity.TOP);
-		flp.topMargin = (int) (topMargin  + scaleCoefficient * 8);
-		lanesControl.setLayoutParams(flp);
-		
-		
-		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.LEFT);
-		flp.leftMargin = 0;
-		flp.topMargin = topMargin;
-		leftStack.setLayoutParams(flp);
-
-		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP);
-		flp.leftMargin = 0;
-		flp.rightMargin = 0;
-		flp.topMargin = -topRectPadding.top;
-		
-		flp = new FrameLayout.LayoutParams((int)(78 * scaleCoefficient),
-				(int)(78 * scaleCoefficient), Gravity.LEFT | Gravity.BOTTOM);
-		flp.leftMargin = (int) (10*scaleCoefficient);
-		flp.bottomMargin = (int) (85*scaleCoefficient);
-		alarmControl.setLayoutParams(flp);
-
-		parent.addView(rightStack);
-		parent.addView(leftStack);
-		parent.addView(lanesControl);
-		parent.addView(alarmControl);
-		alarmControl.setVisibility(View.GONE);
-		lanesControl.setVisibility(View.GONE);
-		
-		// update and create controls
-		recreateControls();
+	private int themeId = -1;
+	public void updateColorShadowsOfText(DrawSettings drawSettings) {
+		boolean transparent = view.getSettings().TRANSPARENT_MAP_THEME.get();
+		boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
+		boolean following = routeLayer.getHelper().isFollowingMode();
+		int calcThemeId = (transparent ? 4 : 0) | (nightMode ? 2 : 0) | (following ? 1 : 0);
+		if (themeId != calcThemeId) {
+			themeId = calcThemeId;
+			boolean textBold = following;
+			int textColor = nightMode ? view.getResources().getColor(R.color.widgettext_night):Color.BLACK;
+			// Night shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent night skin (from box_night_free_simple.9.png)
+			int textShadowColor = nightMode? view.getResources().getColor(R.color.widgettext_shadow_night) : Color.WHITE;
+			if (!transparent && !nightMode) {
+				textShadowColor = Color.TRANSPARENT;
+			}
+			int boxTop;
+			int rightRes;
+			int leftRes;
+			int expand;
+			int boxFree;
+			if (transparent) {
+				boxTop = R.drawable.btn_flat_trans;
+				rightRes = R.drawable.btn_left_round_trans;
+				leftRes = R.drawable.btn_right_round_trans;
+				expand = R.drawable.btn_inset_circle_trans;
+				boxFree = R.drawable.btn_round_trans;
+			} else if (nightMode) {
+				boxTop = R.drawable.btn_flat_night;
+				rightRes = R.drawable.btn_left_round_night;
+				leftRes = R.drawable.btn_right_round_night;
+				expand = R.drawable.btn_inset_circle_night;
+				boxFree = R.drawable.btn_round_night;
+			} else {
+				boxTop = R.drawable.btn_flat;
+				rightRes = R.drawable.btn_left_round;
+				leftRes = R.drawable.btn_right_round;
+				expand = R.drawable.btn_inset_circle;
+				boxFree = R.drawable.btn_round;
+			}
+//			lanesControl.setBackgroundDrawable(boxFree);
+			for(int i = 0 ; i < rightStack.getChildCount(); i++ ) {
+				View v = rightStack.getChildAt(i).findViewById(R.id.widget_bg);
+				if(v != null) {
+					v.setBackgroundResource(rightRes);
+					updateTextColor(v.findViewById(R.id.widget_text_small), textColor, textShadowColor, textBold);
+					updateTextColor(v.findViewById(R.id.widget_text), textColor, textShadowColor, textBold);
+				}
+			}
+			for(int i = 0 ; i < leftStack.getChildCount(); i++ ) {
+				View v = leftStack.getChildAt(i).findViewById(R.id.widget_bg);
+				if(v != null) {
+					v.setBackgroundResource(leftRes);
+					updateTextColor(v.findViewById(R.id.widget_text_small), textColor, textShadowColor, textBold);
+					updateTextColor(v.findViewById(R.id.widget_text), textColor, textShadowColor, textBold);
+				}
+			}
+			this.expand.setBackgroundResource(expand);
+			rightStack.invalidate();
+			leftStack.invalidate();
+		}
 	}
 	
+	
+	private void updateTextColor(View v, int textColor, int textShadowColor, boolean textBold) {
+		if(v instanceof TextView) {
+			TextView tv = (TextView) v;
+			tv.setTextColor(textColor);
+			tv.setShadowLayer(textShadowColor == 0 ? 0 : (5 * scaleCoefficient), 0, 0, textShadowColor);
+			tv.setTypeface(tv.getTypeface(), textBold ? Typeface.BOLD : Typeface.NORMAL);
+		}
+	}
+
+	@Override
+	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings drawSettings) {
+		updateColorShadowsOfText(drawSettings);
+		// update data on draw
+		mapInfoControls.updateInfo(settings.getApplicationMode(), drawSettings, expanded); 
+		// TODO
+//		lanesControl.updateInfo(drawSettings);
+//		alarmControl.updateInfo(drawSettings);
+		
+	}
+	
+	public LinearLayout getRightStack() {
+		return rightStack;
+	}
+	
+	public LinearLayout getLeftStack() {
+		return leftStack;
+	}
+
+	
+	@Override
+	public void destroyLayer() {
+	}
+
+	@Override
+	public boolean drawInScreenPixels() {
+		return true;
+	}
+	
+	
+	public View getProgressBar() {
+		// currently no progress on info layer
+		return null;
+	}
+
+
+	public static String getStringPropertyName(Context ctx, String propertyName, String defValue) {
+		try {
+			Field f = R.string.class.getField("rendering_attr_" + propertyName + "_name");
+			if (f != null) {
+				Integer in = (Integer) f.get(null);
+				return ctx.getString(in);
+			}
+		} catch (Exception e) {
+			System.err.println(e.getMessage());
+		}
+		return defValue;
+	}
+
+	public static String getStringPropertyDescription(Context ctx, String propertyName, String defValue) {
+		try {
+			Field f = R.string.class.getField("rendering_attr_" + propertyName + "_description");
+			if (f != null) {
+				Integer in = (Integer) f.get(null);
+				return ctx.getString(in);
+			}
+		} catch (Exception e) {
+			//e.printStackTrace();
+			System.err.println(e.getMessage());
+		}
+		return defValue;
+	}
+
+
+	
 	public ContextMenuAdapter getViewConfigureMenuAdapter() {
-		final OsmandSettings settings = view.getSettings();
 		ContextMenuAdapter cm = new ContextMenuAdapter(view.getContext());
 		cm.setDefaultLayoutId(R.layout.drawer_list_item);
 		cm.item(R.string.layer_map_appearance).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
@@ -273,196 +336,8 @@ public class MapInfoLayer extends OsmandMapLayer {
 					}
 				}).reg();
 		final ApplicationMode mode = settings.getApplicationMode();
-		cm.item(R.string.map_widget_right).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
-		addControls(cm, mapInfoControls.getRight(), mode);
-		cm.item(R.string.map_widget_left).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
-		addControls(cm, mapInfoControls.getLeft(), mode);
-
-		cm.item(R.string.map_widget_appearance_rem).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
-		addControls(cm, mapInfoControls.getAppearanceWidgets(), mode);
-
-
-
-		// TODO add profiles
-//		View confirmDialog = View.inflate(view.getContext(), R.layout.configuration_dialog, null);
-//		AppModeDialog.prepareAppModeView(map, selected, true,
-//				(ViewGroup) confirmDialog.findViewById(R.id.TopBar), true, 
-//				new View.OnClickListener() {
-//			@Override
-//			public void onClick(View v) {
-//				if(selected.size() > 0) {
-//					view.getSettings().APPLICATION_MODE.set(selected.iterator().next());
-//					listAdapter.notifyDataSetChanged();
-//				}
-//			}
-//		});
-
+		mapInfoControls.addControls(this, cm, mode);
 		return cm;
 	}
 	
-	private void addControls(final ContextMenuAdapter adapter, Set<MapWidgetRegInfo> top, final ApplicationMode mode) {
-		for(final MapWidgetRegInfo r : top){
-			adapter.item(r.messageId).selected(r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0)
-				.icons(r.drawableDark, r.drawableLight).listen(new OnContextMenuClick() {
-				
-				@Override
-				public boolean onContextMenuClick(ArrayAdapter<?> a, int itemId, int pos, boolean isChecked) {
-					final boolean selecteable = r.selecteable();
-					boolean check = r.visibleCollapsed(mode) || r.visible(mode);
-					if (check || selecteable) {
-						mapInfoControls.changeVisibility(r);
-					}
-					recreateControls();
-					adapter.setItemName(pos, getText(mode, r));
-					adapter.setSelection(pos, r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0);
-					a.notifyDataSetInvalidated();
-					return false;
-				}
-			}).reg();
-			adapter.setItemName(adapter.length() - 1, getText(mode, r));
-		}
-	}
-
-
-	protected String getText(final ApplicationMode mode, final MapWidgetRegInfo r) {
-		return (r.visibleCollapsed(mode)? " + " : "  ") + map.getString(r.messageId);
-	}
-
-	private int themeId = -1;
-	public void updateColorShadowsOfText(DrawSettings drawSettings) {
-		boolean transparent = view.getSettings().TRANSPARENT_MAP_THEME.get();
-		boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
-		boolean following = routeLayer.getHelper().isFollowingMode();
-		int calcThemeId = (transparent ? 4 : 0) | (nightMode ? 2 : 0) | (following ? 1 : 0);
-		if (themeId != calcThemeId) {
-			themeId = calcThemeId;
-			boolean textBold = following;
-			int textColor = nightMode ? view.getResources().getColor(R.color.widgettext_night):Color.BLACK;
-			// Night shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent night skin (from box_night_free_simple.9.png)
-			int textShadowColor = nightMode? view.getResources().getColor(R.color.widgettext_shadow_night) : Color.WHITE;
-			if (!transparent && !nightMode) {
-				textShadowColor = Color.TRANSPARENT;
-			}
-			int boxTop;
-			int boxTopStack;
-			int boxTopR;
-			int boxTopL;
-			int expand;
-			Drawable boxFree = view.getResources().getDrawable(R.drawable.box_free_simple);
-			
-			if (transparent) {
-				boxTop = R.drawable.box_top_t;
-				boxTopStack = R.drawable.box_top_t_stack;
-				boxTopR = R.drawable.box_top_rt;
-				boxTopL = R.drawable.box_top_lt;
-				expand = R.drawable.box_expand_t;
-				if (nightMode) {
-					boxFree = view.getResources().getDrawable(R.drawable.box_night_free_simple);
-				}
-			} else if (nightMode) {
-				boxTop = R.drawable.box_top_n;
-				boxTopStack = R.drawable.box_top_n_stack;
-				boxTopR = R.drawable.box_top_rn;
-				boxTopL = R.drawable.box_top_ln;
-				expand = R.drawable.box_expand_t;
-				boxFree = view.getResources().getDrawable(R.drawable.box_night_free_simple);
-			} else {
-				boxTop = R.drawable.box_top;
-				boxTopStack = R.drawable.box_top_stack;
-				boxTopR = R.drawable.box_top_r;
-				boxTopL = R.drawable.box_top_l;
-				expand = R.drawable.box_expand;
-			}
-			lanesControl.setBackgroundDrawable(boxFree);
-			rightStack.setTopDrawable(view.getResources().getDrawable(boxTopR));
-			rightStack.setStackDrawable(boxTopStack);
-
-			leftStack.setTopDrawable(view.getResources().getDrawable(boxTopL));
-			leftStack.setStackDrawable(boxTopStack);
-
-			leftStack.setExpandImageDrawable(view.getResources().getDrawable(expand));
-			rightStack.setExpandImageDrawable(view.getResources().getDrawable(expand));
-
-			paintText.setColor(textColor);
-			paintSubText.setColor(textColor);
-			paintSmallText.setColor(textColor);
-			paintSmallSubText.setColor(textColor);
-
-			leftStack.setShadowColor(textShadowColor);
-			rightStack.setShadowColor(textShadowColor);
-
-			paintText.setFakeBoldText(textBold);
-			paintSubText.setFakeBoldText(textBold);
-			paintSmallText.setFakeBoldText(textBold);
-			paintSmallSubText.setFakeBoldText(textBold);
-			
-			rightStack.invalidate();
-			leftStack.invalidate();
-		}
-	}
-	
-	
-	@Override
-	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings drawSettings) {
-		updateColorShadowsOfText(drawSettings);
-		// update data on draw
-		rightStack.updateInfo(drawSettings);
-		leftStack.updateInfo(drawSettings);
-		lanesControl.updateInfo(drawSettings);
-		alarmControl.updateInfo(drawSettings);
-		
-	}
-	
-	public LinearLayout getRightStack() {
-		return rightStack;
-	}
-	
-	public LinearLayout getLeftStack() {
-		return leftStack;
-	}
-
-	
-	@Override
-	public void destroyLayer() {
-	}
-
-	@Override
-	public boolean drawInScreenPixels() {
-		return true;
-	}
-	
-	
-	public View getProgressBar() {
-		return progressBar;
-	}
-
-
-	public static String getStringPropertyName(Context ctx, String propertyName, String defValue) {
-		try {
-			Field f = R.string.class.getField("rendering_attr_" + propertyName + "_name");
-			if (f != null) {
-				Integer in = (Integer) f.get(null);
-				return ctx.getString(in);
-			}
-		} catch (Exception e) {
-			System.err.println(e.getMessage());
-		}
-		return defValue;
-	}
-
-	public static String getStringPropertyDescription(Context ctx, String propertyName, String defValue) {
-		try {
-			Field f = R.string.class.getField("rendering_attr_" + propertyName + "_description");
-			if (f != null) {
-				Integer in = (Integer) f.get(null);
-				return ctx.getString(in);
-			}
-		} catch (Exception e) {
-			//e.printStackTrace();
-			System.err.println(e.getMessage());
-		}
-		return defValue;
-	}
-
-	
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java b/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
deleted file mode 100644
index 59abe49bbd..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package net.osmand.plus.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.londatiga.android.ActionItem;
-import net.londatiga.android.QuickAction;
-import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.mapwidgets.ImageViewWidget;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-public class MonitoringInfoControl {
-	
-	
-	private List<MonitoringInfoControlServices> monitoringServices = new ArrayList<MonitoringInfoControl.MonitoringInfoControlServices>();
-	
-	public interface MonitoringInfoControlServices {
-		
-		public void addMonitorActions(ContextMenuAdapter ca, MonitoringInfoControl li, OsmandMapTileView view);
-	}
-	
-	public void addMonitorActions(MonitoringInfoControlServices la){
-		monitoringServices.add(la);
-	}
-	
-	
-	public List<MonitoringInfoControlServices> getMonitorActions() {
-		return monitoringServices;
-	}
-	
-	public ImageViewWidget createMonitoringWidget(final OsmandMapTileView view, final MapActivity map) {
-		final Drawable m = view.getResources().getDrawable(R.drawable.map_monitoring);
-		final Drawable mWhite = view.getResources().getDrawable(R.drawable.map_monitoring_white);
-		final ImageViewWidget monitoringServices = new ImageViewWidget(view.getContext()) {
-			private boolean nightMode;
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
-				if(nightMode != this.nightMode) {
-					this.nightMode = nightMode;
-					setImageDrawable(nightMode ? mWhite : m);
-					return true;
-				}
-				return false;
-			}
-		};
-		monitoringServices.setImageDrawable(m);
-		monitoringServices.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if(MonitoringInfoControl.this.monitoringServices.isEmpty()) {
-					Toast.makeText(view.getContext(), R.string.enable_plugin_monitoring_services, Toast.LENGTH_LONG).show();
-				} else {
-					showBgServiceQAction(monitoringServices, view, map);
-				}
-			}
-		});
-		return monitoringServices;
-	}
-
-	private void showBgServiceQAction(final ImageView lockView, final OsmandMapTileView view, final MapActivity map) {	
-		final ContextMenuAdapter ca = new ContextMenuAdapter(map);
-		for(MonitoringInfoControlServices la : monitoringServices){
-			la.addMonitorActions(ca, this, view);
-		}
-		final QuickAction qa = new QuickAction(lockView);		
-		String[] itemNames = ca.getItemNames();
-		for(int i = 0; i < ca.length(); i++) {
-			final int ij = i;
-			ActionItem ai = new ActionItem();
-			ai.setTitle(itemNames[ij]);
-			if(ca.getImageId(ij, false) != 0) {
-				ai.setIcon(view.getResources().getDrawable(ca.getImageId(ij , false)));
-			}
-			ai.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					ca.getClickAdapter(ij).onContextMenuClick(null, ca.getElementId(ij), ij, false);
-					qa.dismiss();
-				}
-			});
-			qa.addActionItem(ai);
-		}
-		qa.show();
-		
-	}
-	
-	public static class ValueHolder<T> {
-		public T value;
-	}
-	
-	
-	
-	
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
deleted file mode 100644
index ff7f039ec4..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/AppearanceWidgetsFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package net.osmand.plus.views.mapwidgets;
-
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.MapInfoLayer;
-import net.osmand.plus.views.OsmandMapTileView;
-
-public class AppearanceWidgetsFactory {
-
-	public static AppearanceWidgetsFactory INSTANCE = new AppearanceWidgetsFactory();
-	public static boolean POSITION_ON_THE_MAP = false;
-
-	public void registerAppearanceWidgets(final MapActivity map, final MapInfoLayer mapInfoLayer,
-			final MapWidgetRegistry mapInfoControls) {
-		final OsmandMapTileView view = map.getMapView();
-
-		final MapWidgetRegistry.MapWidgetRegInfo showRuler = mapInfoControls.registerAppearanceWidget(0, 0,
-		// R.drawable.widget_ruler, R.drawable.widget_ruler,
-				R.string.map_widget_show_ruler, "showRuler", view.getSettings().SHOW_RULER);
-		showRuler.setStateChangeListener(new Runnable() {
-			@Override
-			public void run() {
-				view.getSettings().SHOW_RULER.set(!view.getSettings().SHOW_RULER.get());
-				view.refreshMap();
-			}
-		});
-		final MapWidgetRegistry.MapWidgetRegInfo showDestinationArrow = mapInfoControls.registerAppearanceWidget(0, 0,
-				// R.drawable.widget_ruler, R.drawable.widget_ruler,
-				R.string.map_widget_show_destination_arrow, "show_destination_arrow",
-				view.getSettings().SHOW_DESTINATION_ARROW);
-		showDestinationArrow.setStateChangeListener(new Runnable() {
-			@Override
-			public void run() {
-				view.getSettings().SHOW_DESTINATION_ARROW.set(!view.getSettings().SHOW_DESTINATION_ARROW.get());
-				mapInfoLayer.recreateControls();
-			}
-		});
-
-		final MapWidgetRegistry.MapWidgetRegInfo transparent = mapInfoControls.registerAppearanceWidget(0, 0,
-		// R.drawable.widget_ruler, R.drawable.widget_ruler,
-				R.string.map_widget_transparent, "transparent", view.getSettings().TRANSPARENT_MAP_THEME);
-		transparent.setStateChangeListener(new Runnable() {
-			@Override
-			public void run() {
-				view.getSettings().TRANSPARENT_MAP_THEME.set(!view.getSettings().TRANSPARENT_MAP_THEME.get());
-				mapInfoLayer.recreateControls();
-			}
-		});
-		final MapWidgetRegistry.MapWidgetRegInfo centerPosition = mapInfoControls.registerAppearanceWidget(0, 0,
-		// R.drawable.widget_position_marker, R.drawable.widget_position_marker
-				R.string.always_center_position_on_map, "centerPosition", view.getSettings().CENTER_POSITION_ON_MAP);
-		centerPosition.setStateChangeListener(new Runnable() {
-			@Override
-			public void run() {
-				view.getSettings().CENTER_POSITION_ON_MAP.set(!view.getSettings().CENTER_POSITION_ON_MAP.get());
-				map.updateApplicationModeSettings();
-				view.refreshMap(true);
-				mapInfoLayer.recreateControls();
-			}
-		});
-	}
-
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index fc3a80c1ee..8c168e48d8 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -13,9 +13,9 @@ import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.actions.StartGPSStatus;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
+import net.osmand.plus.monitoring.ValueHolder;
 import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.MonitoringInfoControl;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.ShadowText;
@@ -135,7 +135,7 @@ public class MapInfoWidgetsFactory {
 					dlg.show();
 					
 				} else {
-					final MonitoringInfoControl.ValueHolder<Integer> vs = new MonitoringInfoControl.ValueHolder<Integer>();
+					final ValueHolder<Integer> vs = new ValueHolder<Integer>();
 					vs.value = app.getSettings().SERVICE_OFF_INTERVAL.get();
 					final AlertDialog[] dlgshow = new AlertDialog[1]; 
 					Builder dlg = new AlertDialog.Builder(map);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 402a15ba9a..3679a8d577 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -1,7 +1,6 @@
 package net.osmand.plus.views.mapwidgets;
 
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -9,23 +8,21 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.ContextMenuAdapter;
+import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
 import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
-import android.view.View;
-import android.view.ViewGroup;
+import android.content.Context;
+import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.TextView;
 
 public class MapWidgetRegistry {
 	
-	public static final int LEFT_CONTROL = -1;
-	public static final int RIGHT_CONTROL = 1;
-	public static final int MAIN_CONTROL = 0;
-	
-	private Set<MapWidgetRegInfo> appearanceWidgets = new LinkedHashSet<MapWidgetRegistry.MapWidgetRegInfo>();
 	private Set<MapWidgetRegInfo> left = new TreeSet<MapWidgetRegistry.MapWidgetRegInfo>();
 	private Set<MapWidgetRegInfo> right = new TreeSet<MapWidgetRegistry.MapWidgetRegInfo>();
 	private Map<ApplicationMode, Set<String>> visibleElementsFromSettings = new LinkedHashMap<ApplicationMode, Set<String>>();
@@ -45,60 +42,67 @@ public class MapWidgetRegistry {
                 Collections.addAll(set, mpf.split(";"));
 			}
 		}
-		
 	}
 	
-	public MapWidgetRegInfo registerAppearanceWidget(int drawableDark,int drawableLight, int messageId, String key,
-			OsmandPreference<?> pref) {
-		MapWidgetRegInfo ii = new MapWidgetRegInfo();
-		ii.key = key;
-		ii.preference = pref;
-		ii.visibleModes = new LinkedHashSet<ApplicationMode>(); 
-		ii.visibleCollapsible = null;
-		ii.drawableDark = drawableDark;
-		ii.drawableLight = drawableLight;
-		ii.messageId = messageId;
-		this.appearanceWidgets.add(ii);
-		return ii;
+	public void populateStackControl(LinearLayout stack, 
+			ApplicationMode mode, boolean left, boolean expanded) {
+		Set<MapWidgetRegInfo> s = left ? this.left : this.right;
+		for (MapWidgetRegInfo r : s) {
+			if (r.visible(mode)) {
+				stack.addView(r.widget.getView());
+			}
+		}
+		if (expanded) {
+			for (MapWidgetRegInfo r : s) {
+				if (r.visibleCollapsed(mode)) {
+					stack.addView(r.widget.getView());
+				}
+			}
+		}
 	}
 	
 	
-	
+	public void updateInfo(ApplicationMode mode, DrawSettings drawSettings, boolean expanded) {
+		update(mode, drawSettings, expanded, left);
+		update(mode, drawSettings, expanded, right);
+	}
+
+	private void update(ApplicationMode mode, DrawSettings drawSettings, boolean expanded, Set<MapWidgetRegInfo> l) {
+		for (MapWidgetRegInfo r : l) {
+			if (r.visible(mode) || (r.visibleCollapsed(mode) && expanded)) {
+				r.widget.updateInfo(drawSettings);
+			}
+		}
+	}
 	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
 			int messageId, String key, boolean left, int priorityOrder) {
-		MapWidgetRegInfo ii = new MapWidgetRegInfo();
-		ii.key = key;
-		ii.visibleModes = new LinkedHashSet<ApplicationMode>(); 
-		ii.visibleCollapsible = new LinkedHashSet<ApplicationMode>();
-		for(ApplicationMode ms : ApplicationMode.values(settings) ) {
+		MapWidgetRegInfo ii = new MapWidgetRegInfo(key, widget, drawableDark, drawableLight, 
+				messageId, priorityOrder);
+		for (ApplicationMode ms : ApplicationMode.values(settings)) {
 			boolean collapse = ms.isWidgetCollapsible(key);
 			boolean def = ms.isWidgetVisible(key);
 			Set<String> set = visibleElementsFromSettings.get(ms);
-			if(set != null) {
+			if (set != null) {
 				if (set.contains(key)) {
 					def = true;
 					collapse = false;
 				} else if (set.contains("-" + key)) {
 					def = false;
 					collapse = false;
-				} else if(set.contains("+"+key)){
+				} else if (set.contains("+" + key)) {
 					def = false;
-					collapse = true;	
+					collapse = true;
 				}
 			}
-			if(def){
+			if (def) {
 				ii.visibleModes.add(ms);
-			} else if(collapse) {
+			} else if (collapse) {
 				ii.visibleCollapsible.add(ms);
 			}
 		}
-		if (widget != null)
-			widget.setContentTitle(widget.getContext().getString(messageId));
-		ii.drawableDark = drawableDark;
-		ii.drawableLight = drawableLight;
-		ii.messageId = messageId;
-		ii.widget = widget;
-		ii.priorityOrder = priorityOrder;
+		if (widget != null) {
+			widget.setContentTitle(messageId);
+		}
 		if(left) {
 			this.left.add(ii);
 		} else {
@@ -108,100 +112,71 @@ public class MapWidgetRegistry {
 	
 	private void restoreModes(Set<String> set, Set<MapWidgetRegInfo> mi, ApplicationMode mode) {
 		for (MapWidgetRegInfo m : mi) {
-			if (m.preference == null) {
-				if (m.visibleModes.contains(mode)) {
-					set.add(m.key);
-				} else if (m.visibleCollapsible != null && m.visibleCollapsible.contains(mode)) {
-					set.add("+" + m.key);
-				} else {
-					set.add("-" + m.key);
-				}
+			if (m.visibleModes.contains(mode)) {
+				set.add(m.key);
+			} else if (m.visibleCollapsible != null && m.visibleCollapsible.contains(mode)) {
+				set.add("+" + m.key);
+			} else {
+				set.add("-" + m.key);
 			}
 		}
 	}
 	
 	public void changeVisibility(MapWidgetRegInfo m) {
-		boolean selecteable = m.selecteable();
-		if (selecteable) {
-			ApplicationMode mode = settings.APPLICATION_MODE.get();
-			boolean visible = m.visible(mode);
-			boolean collapseEnabled = m.collapseEnabled(mode);
-			boolean collapse = m.visibleCollapsed(mode);
-			if (this.visibleElementsFromSettings.get(mode) == null) {
-				LinkedHashSet<String> set = new LinkedHashSet<String>();
-				restoreModes(set, left, mode);
-				restoreModes(set, right, mode);
-				this.visibleElementsFromSettings.put(mode, set);
-			}
-			// clear everything
-			this.visibleElementsFromSettings.get(mode).remove(m.key);
-			this.visibleElementsFromSettings.get(mode).remove("+" + m.key);
-			this.visibleElementsFromSettings.get(mode).remove("-" + m.key);
-			m.visibleModes.remove(mode);
-			if (m.visibleCollapsible != null) {
-				m.visibleCollapsible.remove(mode);
-			}
-			if (visible || collapse) {
-				if (collapseEnabled && !collapse) {
-					m.visibleCollapsible.add(mode);
-					this.visibleElementsFromSettings.get(mode).add("+" + m.key);
-				} else {
-					this.visibleElementsFromSettings.get(mode).add("-" + m.key);
-				}
+		ApplicationMode mode = settings.APPLICATION_MODE.get();
+		boolean visible = m.visible(mode);
+		boolean collapse = m.visibleCollapsed(mode);
+		defineDefaultSettingsElement(mode);
+		// clear everything
+		this.visibleElementsFromSettings.get(mode).remove(m.key);
+		this.visibleElementsFromSettings.get(mode).remove("+" + m.key);
+		this.visibleElementsFromSettings.get(mode).remove("-" + m.key);
+		m.visibleModes.remove(mode);
+		m.visibleCollapsible.remove(mode);
+		if (visible || collapse) {
+			if (!collapse) {
+				m.visibleCollapsible.add(mode);
+				this.visibleElementsFromSettings.get(mode).add("+" + m.key);
 			} else {
-				m.visibleModes.add(mode);
-				this.visibleElementsFromSettings.get(mode).add("" + m.key);
+				this.visibleElementsFromSettings.get(mode).add("-" + m.key);
 			}
-			StringBuilder bs = new StringBuilder();
-			for (String ks : this.visibleElementsFromSettings.get(mode)) {
-				bs.append(ks).append(";");
-			}
-			settings.MAP_INFO_CONTROLS.set(bs.toString());
+		} else {
+			m.visibleModes.add(mode);
+			this.visibleElementsFromSettings.get(mode).add("" + m.key);
 		}
-		if(m.stateChangeListener != null) {
+		saveVisibleElementsToSettings(mode);
+		if (m.stateChangeListener != null) {
 			m.stateChangeListener.run();
 		}
 	}
-	
-	public Set<MapWidgetRegInfo> getLeft() {
-		return left;
-	}
-	
-	public Set<MapWidgetRegInfo> getRight() {
-		return right;
-	}
-	
-	public Set<MapWidgetRegInfo> getAppearanceWidgets() {
-		return appearanceWidgets;
-	}
-	
-	public void populateStackControl(StackWidgetView stack, OsmandMapTileView v, boolean left){
-		ApplicationMode appMode = settings.getApplicationMode();
-		Set<MapWidgetRegInfo> st = left ? this.left : this.right;
-		for (MapWidgetRegInfo r : st) {
-			if (r.visibleCollapsible != null && r.visibleCollapsible.contains(appMode)) {
-				stack.addCollapsedView(r.widget);
-			} else if (r.visibleModes.contains(appMode)) {
-				stack.addStackView(r.widget);
-			}
+
+	private void defineDefaultSettingsElement(ApplicationMode mode) {
+		if (this.visibleElementsFromSettings.get(mode) == null) {
+			LinkedHashSet<String> set = new LinkedHashSet<String>();
+			restoreModes(set, left, mode);
+			restoreModes(set, right, mode);
+			this.visibleElementsFromSettings.put(mode, set);
 		}
 	}
+
+	private void saveVisibleElementsToSettings(ApplicationMode mode) {
+		StringBuilder bs = new StringBuilder();
+		for (String ks : this.visibleElementsFromSettings.get(mode)) {
+			bs.append(ks).append(";");
+		}
+		settings.MAP_INFO_CONTROLS.set(bs.toString());
+	}
+	
 	
 	private void resetDefault(ApplicationMode mode, Set<MapWidgetRegInfo> set ){
-		for(MapWidgetRegInfo ri : set) {
-			if(ri.preference != null) {
-				ri.preference.resetToDefault();
-			} else {
-				if (ri.visibleCollapsible != null) {
-					ri.visibleCollapsible.remove(mode);
-				}
-				ri.visibleModes.remove(mode);
-				if (mode.isWidgetVisible(ri.key)) {
-					if (mode.isWidgetCollapsible(ri.key)) {
-						ri.visibleCollapsible.add(mode);
-					} else {
-						ri.visibleModes.add(mode);
-					}
+		for (MapWidgetRegInfo ri : set) {
+			ri.visibleCollapsible.remove(mode);
+			ri.visibleModes.remove(mode);
+			if (mode.isWidgetVisible(ri.key)) {
+				if (mode.isWidgetCollapsible(ri.key)) {
+					ri.visibleCollapsible.add(mode);
+				} else {
+					ri.visibleModes.add(mode);
 				}
 			}
 		}
@@ -211,11 +186,51 @@ public class MapWidgetRegistry {
 		ApplicationMode appMode = settings.getApplicationMode();
 		resetDefault(appMode, left);
 		resetDefault(appMode, right);
-		resetDefault(appMode, appearanceWidgets);
+		resetDefaultAppearance(appMode);
 		this.visibleElementsFromSettings.put(appMode, null);
 		settings.MAP_INFO_CONTROLS.set("");
 	}
 	
+	private void resetDefaultAppearance(ApplicationMode appMode) {
+		settings.SHOW_RULER.resetToDefault();		
+		settings.SHOW_DESTINATION_ARROW.resetToDefault();
+		settings.TRANSPARENT_MAP_THEME.resetToDefault();
+		settings.CENTER_POSITION_ON_MAP.resetToDefault();
+	}
+	
+	public void addControlsAppearance(final MapInfoLayer mil, ContextMenuAdapter cm, ApplicationMode mode) {
+		addControlId(mil, cm, R.string.map_widget_show_ruler, settings.SHOW_RULER);
+		addControlId(mil, cm, R.string.map_widget_show_destination_arrow, settings.SHOW_DESTINATION_ARROW);
+		addControlId(mil, cm, R.string.map_widget_transparent, settings.TRANSPARENT_MAP_THEME);
+		addControlId(mil, cm, R.string.always_center_position_on_map, settings.CENTER_POSITION_ON_MAP);
+	}
+
+	private void addControlId(final MapInfoLayer mil, ContextMenuAdapter cm, int stringId, OsmandPreference<Boolean> pref) {
+		cm.item(stringId).selected( pref.get() ? 1 : 0)
+//			.icons(r.drawableDark, r.drawableLight)
+			.listen(new ApearanceOnContextMenuClick(pref, mil.getMapActivity())).reg();
+	}
+	
+	class ApearanceOnContextMenuClick implements OnContextMenuClick {
+		
+		private MapActivity map;
+		private OsmandPreference<Boolean> pref;
+
+		public ApearanceOnContextMenuClick(OsmandPreference<Boolean> pref, MapActivity map) {
+			this.pref = pref;
+			this.map = map;
+		}
+		
+		@Override
+		public boolean onContextMenuClick(ArrayAdapter<?> a, int itemId, int pos, boolean isChecked) {
+			pref.set(!pref.get());
+			map.updateApplicationModeSettings();
+			a.notifyDataSetInvalidated();
+			return false;
+		}
+	};	
+
+	
 	public static boolean distChanged(int oldDist, int dist){
 		if(oldDist != 0 && oldDist - dist < 100 && Math.abs(((float) dist - oldDist)/oldDist) < 0.01){
 			return false;
@@ -223,40 +238,68 @@ public class MapWidgetRegistry {
 		return true;
 	}
 	
+
+	public void addControls(MapInfoLayer mil, ContextMenuAdapter cm, ApplicationMode mode) {
+		cm.item(R.string.map_widget_right).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
+		addControls(mil, cm, right, mode);
+		cm.item(R.string.map_widget_left).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
+		addControls(mil, cm, left, mode);
+		cm.item(R.string.map_widget_appearance_rem).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
+		addControlsAppearance(mil, cm, mode);		
+	}
+	
+	public String getText(Context ctx, final ApplicationMode mode, final MapWidgetRegInfo r) {
+		return (r.visibleCollapsed(mode)? " + " : "  ") + ctx.getString(r.messageId);
+	}
+	
+	private void addControls(final MapInfoLayer mil, final ContextMenuAdapter adapter, Set<MapWidgetRegInfo> top, final ApplicationMode mode) {
+		for(final MapWidgetRegInfo r : top){
+			adapter.item(r.messageId).selected(r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0)
+				.icons(r.drawableDark, r.drawableLight).listen(new OnContextMenuClick() {
+				
+				@Override
+				public boolean onContextMenuClick(ArrayAdapter<?> a, int itemId, int pos, boolean isChecked) {
+					changeVisibility(r);
+					mil.recreateControls();
+					adapter.setItemName(pos, getText(mil.getMapActivity(), mode, r));
+					adapter.setSelection(pos, r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0);
+					a.notifyDataSetInvalidated();
+					return false;
+				}
+			}).reg();
+			adapter.setItemName(adapter.length() - 1, getText(mil.getMapActivity(), mode, r));
+		}
+	}
+
+
+
+	
 	
 	public static class MapWidgetRegInfo implements Comparable<MapWidgetRegInfo>  {
-		public TextInfoWidget widget;
-		public int drawableDark;
-		public int drawableLight;
-		public int messageId;
-		private String key;
-		private int position;
-		private Set<ApplicationMode> visibleModes;
-		private Set<ApplicationMode> visibleCollapsible;
-		private OsmandPreference<?> preference = null;
+		public final TextInfoWidget widget;
+		public final int drawableDark;
+		public final int drawableLight;
+		public final int messageId;
+		public final  String key;
+		public final int priorityOrder;
+		private final Set<ApplicationMode> visibleCollapsible = new LinkedHashSet<ApplicationMode>();
+		private final Set<ApplicationMode> visibleModes = new LinkedHashSet<ApplicationMode>();
 		private Runnable stateChangeListener = null;
-		public int priorityOrder;
+		
+		public MapWidgetRegInfo(String key, TextInfoWidget widget, int drawableDark, int drawableLight, int messageId, int priorityOrder) {
+			this.key = key;
+			this.widget = widget;
+			this.drawableDark = drawableDark;
+			this.drawableLight = drawableLight;
+			this.messageId = messageId;
+			this.priorityOrder = priorityOrder;
+		}
 		
 		public boolean visibleCollapsed(ApplicationMode mode){
-			return preference == null && visibleCollapsible != null && visibleCollapsible.contains(mode);
-		}
-		
-		public boolean collapseEnabled(ApplicationMode mode){
-			return visibleCollapsible != null && preference == null;
-		}
-		
-		public boolean selecteable(){
-			return preference == null || (preference.get() instanceof Boolean);
+			return visibleCollapsible.contains(mode);
 		}
 		
 		public boolean visible(ApplicationMode mode){
-			if(preference != null) {
-				Object value = preference.getModeValue(mode);
-				if(value instanceof Boolean) {
-					return (Boolean) value;
-				}
-				return true;
-			}
 			return visibleModes.contains(mode);
 		}
 		
@@ -265,10 +308,6 @@ public class MapWidgetRegistry {
 			return this;
 		}
 		
-		public void setPreference(CommonPreference<Boolean> blPreference) {
-			this.preference = blPreference;
-		}
-		
 		
 		public void setStateChangeListener(Runnable stateChangeListener) {
 			this.stateChangeListener = stateChangeListener;
@@ -302,4 +341,5 @@ public class MapWidgetRegistry {
 			return priorityOrder - another.priorityOrder;
 		}
 	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java
deleted file mode 100644
index ee3c1c840c..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/StackWidgetView.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package net.osmand.plus.views.mapwidgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.osmand.plus.R;
-import net.osmand.plus.views.MapInfoLayer;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-public class StackWidgetView extends ViewGroup {
-	List<BaseMapWidget> stackViews = new ArrayList<BaseMapWidget>();
-	List<BaseMapWidget> collapsedViews = new ArrayList<BaseMapWidget>();
-	ImageView expandView;
-	// by default opened
-	private boolean isCollapsed = false;
-	private boolean isCollapsible = true;
-
-	private Drawable topDrawable;
-	List<Drawable> cacheStackDrawables = new ArrayList<Drawable>();
-	private int stackDrawable;
-
-	public StackWidgetView(Context context) {
-		super(context);
-		final Bitmap arrowDown = BitmapFactory.decodeResource(context.getResources(), R.drawable.arrow_down);
-		final Bitmap arrowUp = BitmapFactory.decodeResource(context.getResources(), R.drawable.arrow_up);
-		final Paint paintImg = new Paint();
-		paintImg.setAntiAlias(true);
-		expandView = new ImageView(context) {
-			@Override
-			protected void onDraw(Canvas canvas) {
-				super.onDraw(canvas);
-				int cx = (getLeft() + getRight()) / 2 - getLeft();
-				int t = (int) (10 * MapInfoLayer.scaleCoefficient);
-
-				if (!isCollapsed) {
-					canvas.drawBitmap(arrowUp, cx - arrowUp.getWidth() / 2, t , paintImg);
-				} else {
-					canvas.drawBitmap(arrowDown, cx - arrowDown.getWidth() / 2, t , paintImg);
-				}
-			}
-		};
-		expandView.setImageDrawable(context.getResources().getDrawable(R.drawable.box_expand));
-		expandView.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				isCollapsed = !isCollapsed;
-				StackWidgetView.this.requestLayout();
-				StackWidgetView.this.invalidate();
-			}
-		});
-		StackWidgetView.this.addView(expandView);
-	}
-
-	public void setExpandImageDrawable(Drawable d) {
-		expandView.setImageDrawable(d);
-	}
-
-	public void setTopDrawable(Drawable topDrawable) {
-		this.topDrawable = topDrawable;
-	}
-
-	public void setStackDrawable(int stackDrawable) {
-		this.stackDrawable = stackDrawable;
-		this.cacheStackDrawables.clear();
-	}
-
-	public void updateInfo(DrawSettings drawSettings) {
-		for (BaseMapWidget v : stackViews) {
-			v.updateInfo(drawSettings);
-		}
-		// update even if collapsed to know if view becomes visible
-		for (BaseMapWidget v : collapsedViews) {
-			v.updateInfo(drawSettings);
-		}
-	}
-
-
-	public void addStackView(BaseMapWidget v) {
-		stackViews.add(v);
-		v.setShadowColor(shadowColor);
-		StackWidgetView.this.addView(v, getChildCount());
-	}
-
-	public void addCollapsedView(BaseMapWidget v) {
-		collapsedViews.add(v);
-		v.setShadowColor(shadowColor);
-		StackWidgetView.this.addView(v, getChildCount());
-	}
-
-	public void clearAllViews(){
-		stackViews.clear();
-		collapsedViews.clear();
-		while(getChildCount() > 1){
-			removeViewAt(1);
-		}
-	}
-
-	public List<BaseMapWidget> getStackViews() {
-		return stackViews;
-	}
-
-	public List<BaseMapWidget> getCollapsedViews() {
-		return collapsedViews;
-	}
-
-	public List<BaseMapWidget> getAllViews(){
-		List<BaseMapWidget> l = new ArrayList<BaseMapWidget>();
-		l.addAll(stackViews);
-		l.addAll(collapsedViews);
-		return l;
-	}
-
-	public boolean isCollapsed() {
-		return isCollapsed;
-	}
-
-	public boolean isCollapsible() {
-		return isCollapsible;
-	}
-
-
-	private Drawable getStackDrawable(int i){
-		while(i >= cacheStackDrawables.size()) {
-			Drawable d = getResources().getDrawable(stackDrawable);
-			if(Build.VERSION_CODES.FROYO <=  Build.VERSION.SDK_INT) {
-				d = d.mutate();
-			}
-			cacheStackDrawables.add(d);
-		}
-		return cacheStackDrawables.get(i);
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		int w = 0;
-		int h = 0;
-		int prevBot = 0;
-		boolean first = true;
-		int cacheStack = 0;
-		if (stackViews != null) {
-			for (BaseMapWidget c : stackViews) {
-				cacheStack++;
-				if (c.getVisibility() != View.GONE) {
-					c.setBackgroundDrawable(first ? topDrawable : getStackDrawable(cacheStack));
-					first = false;
-					c.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-					w = Math.max(w, c.getMeasuredWidth());
-					if (h > 0) {
-						h -= prevBot;
-					} else {
-						h += c.getPaddingTop();
-					}
-					h += c.getMeasuredHeight();
-					prevBot = c.getPaddingBottom();
-				}
-			}
-			isCollapsible = false;
-			for (BaseMapWidget c : collapsedViews) {
-				cacheStack++;
-				if (c.getVisibility() != View.GONE) {
-					isCollapsible = true;
-					if (!isCollapsed) {
-						c.setBackgroundDrawable(first ? topDrawable : getStackDrawable(cacheStack));
-						first = false;
-						c.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-						w = Math.max(w, c.getMeasuredWidth());
-						h -= c.getPaddingBottom();
-						if (h > 0) {
-							h -= prevBot;
-						}
-						h += c.getMeasuredHeight();
-						prevBot = c.getPaddingBottom();
-					} else {
-						if (h == 0) {
-							// measure one of the figure if it is collapsed and no top elements
-							c.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-							h += c.getPaddingTop();
-						}
-					}
-
-				}
-			}
-			if (isCollapsible) {
-				h += expandView.getDrawable().getMinimumHeight();
-				w = Math.max(w, expandView.getDrawable().getMinimumWidth());
-			}
-		}
-		setMeasuredDimension(w, h);
-	}
-
-	// magic constant (should be removed when image will be recropped)
-	private final static int MAGIC_CONSTANT_STACK = 8;
-	private int shadowColor;
-	@Override
-	protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-		int y = 0;
-		int cw = right - left;
-		for (View c : stackViews) {
-			if (c.getVisibility() != View.GONE) {
-				if (y == 0) {
-					y += c.getPaddingTop();
-				}
-				y -= MAGIC_CONSTANT_STACK;
-				c.layout(0, y, cw, y + c.getMeasuredHeight());
-				y += c.getMeasuredHeight();
-				y -= c.getPaddingBottom();
-			}
-		}
-
-		for (View c : collapsedViews) {
-			if (!isCollapsed) {
-				if (c.getVisibility() != View.GONE) {
-					if (y == 0) {
-						y += c.getPaddingTop();
-					}
-					y -= MAGIC_CONSTANT_STACK;
-					c.layout(0, y, cw, y + c.getMeasuredHeight());
-					y += c.getMeasuredHeight();
-					y -= c.getPaddingBottom();
-				}
-			} else {
-				c.layout(0, 0, 0, 0);
-				if(y == 0){
-					y += c.getPaddingTop();
-				}
-			}
-		}
-
-		if (isCollapsible) {
-			y -= MAGIC_CONSTANT_STACK;
-			expandView.setVisibility(VISIBLE);
-			int w = expandView.getDrawable().getMinimumWidth();
-			int h = expandView.getDrawable().getMinimumHeight();
-			expandView.layout((cw - w) / 2, y, (cw + w) / 2, y + h);
-		} else {
-			expandView.setVisibility(GONE);
-		}
-	}
-
-	public void setShadowColor(int shadowColor) {
-		this.shadowColor = shadowColor;
-		for(BaseMapWidget c : stackViews) {
-			c.setShadowColor(shadowColor);
-		}
-		for(BaseMapWidget c : collapsedViews) {
-			c.setShadowColor(shadowColor);
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index c8721bbab0..dc3accf991 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -18,6 +18,8 @@ public class TextInfoWidget  {
 	private TextView textView;
 	private TextView smallTextView;
 
+	private boolean explicitlyVisible;
+
 	public TextInfoWidget(Activity activity) {
 		view = activity.getLayoutInflater().inflate(R.layout.map_hud_widget, null);
 		imageView = (ImageView) view.findViewById(R.id.widget_icon);
@@ -25,6 +27,10 @@ public class TextInfoWidget  {
 		smallTextView = (TextView) view.findViewById(R.id.widget_text_small);
 	}
 	
+	public View getView() {
+		return view;
+	}
+	
 	public void setImageDrawable(Drawable imageDrawable) {
 		if(imageDrawable != null) {
 			imageView.setImageDrawable(imageDrawable);
@@ -42,6 +48,10 @@ public class TextInfoWidget  {
 			view.setContentDescription(text);
 		}
 	}
+	
+	public void setContentTitle(int messageId) {
+		setContentTitle(view.getContext().getString(messageId));
+	}
 
 	public void setContentTitle(String text) {
 		contentTitle = text;
@@ -88,7 +98,7 @@ public class TextInfoWidget  {
 	}
 	
 	public boolean isVisible() {
-		return view.getVisibility() == View.VISIBLE;
+		return view.getVisibility() == View.VISIBLE && view.getParent() != null;
 	}
 
 	public boolean updateInfo(DrawSettings drawSettings) {
@@ -99,9 +109,14 @@ public class TextInfoWidget  {
 		view.setOnClickListener(onClickListener);
 	}
 
-	public void setVisible(boolean b) {
-		// TODO Auto-generated method stub
-		
+	public void setExplicitlyVisible(boolean explicitlyVisible) {
+		this.explicitlyVisible = explicitlyVisible;
 	}
 	
+	public boolean isExplicitlyVisible() {
+		return explicitlyVisible;
+	}
+
+	
+	
 }
\ No newline at end of file

From 14c6c1abd86de4f808ef34b88c7e2faef316a5d8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 01:45:16 +0100
Subject: [PATCH 14/23] Fix bugs

---
 OsmAnd/res/layout/main.xml                    |  9 ++--
 OsmAnd/res/layout/map_hud_top.xml             | 42 +++++++++----------
 OsmAnd/res/layout/map_view_on_dashboard.xml   |  2 +-
 .../osmand/plus/activities/MapActivity.java   |  4 +-
 .../activities/actions/StartGPSStatus.java    |  6 +--
 .../osmand/plus/dashboard/DashboardOnMap.java |  4 +-
 .../osmand/plus/views/MapControlsLayer.java   |  3 +-
 .../osmand/plus/views/OsmandMapTileView.java  | 34 +++++----------
 .../plus/views/controls/RulerControl.java     | 18 ++++----
 9 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index cd90ad0af8..a0d121230d 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -5,11 +5,9 @@
     android:layout_height="match_parent" >
 
     <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/MapViewWithLayers"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/MapViewWithLayers"
-        android:clipChildren="false"
         android:keepScreenOn="true"
         android:orientation="vertical" >
 
@@ -33,7 +31,7 @@
             android:layout_height="fill_parent"
             android:contentDescription="@string/shared_string_map"
             android:visibility="gone" />
-        
+
         <!-- deprecated -->
 
         <FrameLayout
@@ -52,8 +50,8 @@
             android:id="@+id/MapButtons"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-
     </FrameLayout>
+
     <FrameLayout
         android:id="@+id/MapHudButtonsOverlay"
         android:layout_width="match_parent"
@@ -67,7 +65,6 @@
         android:layout_height="match_parent"
         layout="@layout/dashboard_over_map" />
 
-
     <ListView
         android:id="@+id/left_drawer"
         android:layout_width="280dp"
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 8c8bc8f46b..d80a5ad480 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="match_parent"
     android:orientation="vertical" >
@@ -8,9 +7,9 @@
     <!-- TOP ROW -->
 
     <LinearLayout
+        android:id="@+id/map_top_bar"
         android:layout_width="fill_parent"
         android:layout_height="@dimen/map_address_height"
-        android:id="@+id/map_top_bar"
         android:background="@drawable/btn_flat"
         android:orientation="horizontal" >
 
@@ -36,8 +35,7 @@
             android:text="Long Street Name"
             android:textColor="@color/color_black"
             android:textSize="@dimen/map_widget_text_size"
-            android:textStyle="bold"
-            android:visibility="gone" >
+            android:textStyle="bold" >
         </TextView>
 
         <ImageButton
@@ -69,7 +67,6 @@
             android:weightSum="1" >
 
             <LinearLayout
-                android:id="@+id/map_left_widgets_panel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|left"
@@ -77,6 +74,7 @@
                 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"
@@ -127,16 +125,15 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|center"
             android:background="@drawable/btn_round"
-            android:orientation="vertical" 
-            >
+            android:orientation="vertical" >
 
             <ProgressBar
                 android:id="@+id/map_horizontal_progress"
                 android:layout_width="100dp"
-                android:layout_height="wrap_content" 
+                android:layout_height="wrap_content"
                 android:max="100"
                 android:progress="60"
-                android:visibility="gone"/>
+                android:visibility="gone" />
         </LinearLayout>
         <!-- RIGHT widgets colon -->
 
@@ -154,40 +151,41 @@
                 android:layout_weight="0.6" >
             </LinearLayout>
 
-            <LinearLayout
+            <FrameLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top|right"
-                android:layout_weight="0.4"
-                android:orientation="vertical" >
+                android:layout_weight="0.4" >
 
                 <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" >
 
-                    <!--
+                    <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" >
+                        <include layout="@layout/map_hud_widget" />
+                        <!--
                     <include layout="@layout/map_hud_widget" />
                     <include layout="@layout/map_hud_widget" />
                     <include layout="@layout/map_hud_widget" />
-                    -->
-
-                    <FrameLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" >
+                        -->
+                    </LinearLayout>
 
                         <ImageButton
                             android:id="@+id/map_collapse_button"
                             android:layout_width="@dimen/map_button_size"
                             android:layout_height="@dimen/map_button_size"
-                            android:layout_gravity="center"
+                            android:layout_gravity="top|center_horizontal"
                             android:background="@drawable/btn_inset_circle"
                             android:src="@drawable/ic_action_remove_light" />
-                    </FrameLayout>
                 </LinearLayout>
-            </LinearLayout>
+            </FrameLayout>
         </LinearLayout>
     </FrameLayout>
 
diff --git a/OsmAnd/res/layout/map_view_on_dashboard.xml b/OsmAnd/res/layout/map_view_on_dashboard.xml
index 4197af279b..53a1fed990 100644
--- a/OsmAnd/res/layout/map_view_on_dashboard.xml
+++ b/OsmAnd/res/layout/map_view_on_dashboard.xml
@@ -4,7 +4,7 @@
     android:layout_height="fill_parent" >
 
     <ImageButton
-        android:id="@+id/map_layers_button"
+        android:id="@+id/map_menu_button"
         android:layout_width="@dimen/map_button_size"
         android:layout_height="@dimen/map_button_size"
         android:layout_gravity="top|left"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index cb20ffabbb..f0ae4a90b0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -134,9 +134,7 @@ public class MapActivity extends AccessibleActivity {
 		// Full screen is not used here
 		// getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		setContentView(R.layout.main);
-		
-		mapView = new OsmandMapTileView();
-		mapView.init(this);
+		mapView = new OsmandMapTileView(this);
 		mapActions = new MapActivityActions(this);
 		mapLayers = new MapActivityLayers(this);
 		if (mapViewTrackingUtilities == null) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
index 5113d33cdd..2386b769e1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
@@ -104,10 +104,10 @@ public class StartGPSStatus extends OsmAndAction {
 		}
 		OsmandMapTileView view = mapActivity.getMapView();
 		AlertDialog.Builder builder = new AccessibleAlertBuilder(mapActivity);
-		LinearLayout ll = new LinearLayout(view.getContext());
-		final ListView lv = new ListView(view.getContext());
+		LinearLayout ll = new LinearLayout(activity);
+		final ListView lv = new ListView(activity);
 		lv.setPadding(7, 3, 7, 0);
-		final CheckBox cb = new CheckBox(view.getContext());
+		final CheckBox cb = new CheckBox(activity);
 		cb.setText(R.string.shared_string_remember_my_choice);
 		LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 		lp.setMargins(7, 10, 7, 0);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 49a97706d3..5085e1c0df 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -95,7 +95,7 @@ public class DashboardOnMap {
 		dashboardView.setOnClickListener(listener);
 		
 		
-		switchButton =  (ImageView) dashboardView.findViewById(R.id.map_layers_button);
+		switchButton =  (ImageView) dashboardView.findViewById(R.id.map_menu_button);
 		switchButton.setOnClickListener(new View.OnClickListener() {
 			
 			@Override
@@ -185,7 +185,7 @@ public class DashboardOnMap {
 					R.color.icon_color_light));
 			
 			mapActivity.getMapActions().disableDrawer();
-			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.GONE);
+			mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.INVISIBLE);
 			updateLocation(true, true, false);
 			
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 4afcdfb0cd..491576ee54 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -96,11 +96,12 @@ public class MapControlsLayer extends OsmandMapLayer {
 		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
 		// rightGravity);
 		showUIHandler = new Handler();
+		initTopControls();
 		initTransparencyBar();
 		initZooms();
 		initControls();
 		initRouteControls();
-		initTopControls();
+		
 	}
 
 	private class CompassDrawable extends Drawable {
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 13d9f8bfc4..17635b86fa 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -31,6 +31,7 @@ import net.osmand.util.MapUtils;
 import org.apache.commons.logging.Log;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -53,7 +54,6 @@ import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
-import android.view.ViewParent;
 import android.view.WindowManager;
 import android.widget.Toast;
 
@@ -67,6 +67,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	private FPSMeasurement main = new FPSMeasurement();
 	private FPSMeasurement additional = new FPSMeasurement();
 	private View view;
+	private Activity activity;
+	private OsmandApplication application;
+	protected OsmandSettings settings = null;
 
 	private class FPSMeasurement {
 		int fpsMeasureCount = 0;
@@ -146,13 +149,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	Paint paintCenter;
 
 	private DisplayMetrics dm;
-	
 	private MapRendererView mapRenderer;
 
-	private OsmandApplication application;
-
-	protected OsmandSettings settings = null;
-
 	private Bitmap bufferBitmap;
 	private RotatedTileBox bufferImgLoc;
 	private Bitmap bufferBitmapTmp;
@@ -167,14 +165,16 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
 		}
 	};
-	
-
-
 
+	public OsmandMapTileView(Activity activity) {
+		this.activity = activity;
+		init(activity);
+	}
 
 	// ///////////////////////////// INITIALIZING UI PART ///////////////////////////////////
 	public void init(Context ctx) {
 		application = (OsmandApplication) ctx.getApplicationContext();
+		settings = application.getSettings();
 		paintGrayFill = new Paint();
 		paintGrayFill.setColor(Color.GRAY);
 		paintGrayFill.setStyle(Style.FILL);
@@ -396,9 +396,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	}
 
 	public OsmandSettings getSettings() {
-		if (settings == null) {
-			settings = getApplication().getSettings();
-		}
 		return settings;
 	}
 
@@ -977,23 +974,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		}
 	}
 
-
-	
-
 	public Resources getResources() {
 		return application.getResources();
 	}
 	
 	public Context getContext() {
-		return view.getContext();
-	}
-
-	public int getHeight() {
-		return view.getHeight();
-	}
-
-	public float getWidth() {
-		return view.getWidth();
+		return activity;
 	}
 
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
index 5e77207da8..55b8c29db7 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
@@ -14,7 +14,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.text.TextPaint;
 import android.view.View;
-import android.widget.FrameLayout;
 
 public class RulerControl  {
 
@@ -74,7 +73,8 @@ public class RulerControl  {
 			rulerDrawable = (isNight ? mapActivity.getResources().getDrawable(R.drawable.ruler_night) : mapActivity
 					.getResources().getDrawable(R.drawable.ruler));
 			Rect bounds = rulerDrawable.getBounds();
-			bounds.right = (int) (view.getWidth() - 7 * scaleCoefficient);
+			// TODO
+//			bounds.right = (int) (view.getWidth() - 7 * scaleCoefficient);
 			bounds.left = bounds.right - cacheRulerDistPix;
 			rulerDrawable.setBounds(bounds);
 			rulerDrawable.invalidateSelf();
@@ -82,13 +82,13 @@ public class RulerControl  {
 
 		if (cacheRulerText != null) {
 			Rect bounds = rulerDrawable.getBounds();
-			int bottom = (int) (view.getHeight() );
-			if (bounds.bottom != bottom) {
-				bounds.bottom = bottom;
-				bounds.top = bounds.bottom - rulerDrawable.getMinimumHeight();
-				rulerDrawable.setBounds(bounds);
-				rulerDrawable.invalidateSelf();
-			}
+//			int bottom = (int) (view.getHeight() );
+//			if (bounds.bottom != bottom) {
+//				bounds.bottom = bottom;
+//				bounds.top = bounds.bottom - rulerDrawable.getMinimumHeight();
+//				rulerDrawable.setBounds(bounds);
+//				rulerDrawable.invalidateSelf();
+//			}
 			rulerDrawable.draw(canvas);
 			int shadowColor = isNight == true ? mapActivity.getResources().getColor(R.color.widgettext_shadow_night)
 					: Color.WHITE;

From bbac9c1827e37a95cbebc9debf3c688ea8c2eaa6 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 02:14:10 +0100
Subject: [PATCH 15/23] update sizes

---
 OsmAnd/res/layout/map_hud_widget.xml          |  3 +-
 OsmAnd/res/values/sizes.xml                   |  2 +-
 .../net/osmand/plus/views/MapInfoLayer.java   | 64 ++++++-------------
 .../osmand/plus/views/OsmandMapTileView.java  |  1 +
 .../views/mapwidgets/MapWidgetRegistry.java   | 14 ++++
 .../views/mapwidgets/NextTurnInfoWidget.java  |  6 +-
 .../mapwidgets/RouteInfoWidgetsFactory.java   |  7 +-
 7 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index ae0e21b680..279dc73bc4 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -26,8 +26,7 @@
             android:id="@+id/widget_icon"
             android:gravity="center"
             android:layout_gravity="left|center_vertical"
-            android:src="@drawable/ic_action_remove_light" 
-            android:visibility="invisible"/>
+            android:src="@drawable/ic_action_remove_light"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index c250eb4979..141173b661 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -52,7 +52,7 @@
 	<dimen name="map_trans_seek_size">80dp</dimen>
 	<dimen name="map_widget_text_size">20sp</dimen>
 	<dimen name="map_widget_text_size_small">14sp</dimen>
-	<dimen name="map_widget_text_bottom_margin">2sp</dimen>
+	<dimen name="map_widget_text_bottom_margin">1sp</dimen>
 	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_route_buttons_width">60dp</dimen>
 	<dimen name="map_route_buttons_height">54dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 8a1094e4f2..7b6ab4d958 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -20,10 +20,9 @@ import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
 import android.graphics.Typeface;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -31,7 +30,6 @@ import android.widget.TextView;
 
 public class MapInfoLayer extends OsmandMapLayer {
 
-	public static float scaleCoefficient = 1;
 	
 	private final MapActivity map;
 	private final RouteLayer routeLayer;
@@ -67,40 +65,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	@Override
 	public void initLayer(final OsmandMapTileView view) {
 		this.view = view;
-		scaleCoefficient = view.getScaleCoefficient();
-
-		Paint paintText = new Paint();
-		paintText.setStyle(Style.FILL_AND_STROKE);
-		paintText.setColor(Color.BLACK);
-		paintText.setTextSize(23 * scaleCoefficient);
-		paintText.setAntiAlias(true);
-		paintText.setStrokeWidth(4);
-
-		Paint paintSubText = new Paint();
-		paintSubText.setStyle(Style.FILL_AND_STROKE);
-		paintSubText.setColor(Color.BLACK);
-		paintSubText.setTextSize(15 * scaleCoefficient);
-		paintSubText.setAntiAlias(true);
-
-		Paint paintSmallText = new Paint();
-		paintSmallText.setStyle(Style.FILL_AND_STROKE);
-		paintSmallText.setColor(Color.BLACK);
-		paintSmallText.setTextSize(19 * scaleCoefficient);
-		paintSmallText.setAntiAlias(true);
-		paintSmallText.setStrokeWidth(4);
-
-		Paint paintSmallSubText = new Paint();
-		paintSmallSubText.setStyle(Style.FILL_AND_STROKE);
-		paintSmallSubText.setColor(Color.BLACK);
-		paintSmallSubText.setTextSize(13 * scaleCoefficient);
-		paintSmallSubText.setAntiAlias(true);
-
-		Paint paintImg = new Paint();
-		paintImg.setDither(true);
-		paintImg.setFilterBitmap(true);
-		paintImg.setAntiAlias(true);
-
-
 		mapInfoControls = new MapWidgetRegistry(map.getMyApplication().getSettings());
 		topBar = map.findViewById(R.id.map_top_bar);
 		leftStack = (LinearLayout) map.findViewById(R.id.map_left_widgets_panel);
@@ -113,11 +77,12 @@ public class MapInfoLayer extends OsmandMapLayer {
 		alarmControl.setVisibility(View.GONE);
 		lanesControl.setVisibility(View.GONE);
 		recreateControls();
+		updateColorShadowsOfText(null);
 	}
 	
 	public void registerAllControls(){
-		RouteInfoWidgetsFactory ric = new RouteInfoWidgetsFactory(scaleCoefficient);
-		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory(scaleCoefficient);
+		RouteInfoWidgetsFactory ric = new RouteInfoWidgetsFactory(view.getScaleCoefficient());
+		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory(view.getScaleCoefficient());
 		OsmandApplication app = view.getApplication();
 		lanesControl = ric.createLanesControl(map, view);
 		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
@@ -158,12 +123,23 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 	public void recreateControls() {
 		rightStack.removeAllViews();
-		mapInfoControls.populateStackControl(rightStack, view.getSettings().getApplicationMode(), false, expanded);
+		mapInfoControls.populateStackControl(rightStack, settings.getApplicationMode(), false, expanded);
 		leftStack.removeAllViews();
-		mapInfoControls.populateStackControl(leftStack, view.getSettings().getApplicationMode(), true, expanded);
+		mapInfoControls.populateStackControl(leftStack, settings.getApplicationMode(), true, expanded);
 		leftStack.requestLayout();
 		rightStack.requestLayout();
-		updateColorShadowsOfText(null);
+		expand.setVisibility(mapInfoControls.hasCollapsibles(settings.getApplicationMode())? 
+				View.VISIBLE : View.GONE);
+		this.expand.setImageResource(expanded ? R.drawable.av_upload :
+			R.drawable.av_download);
+		expand.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				expanded = !expanded;
+				recreateControls();
+			}
+		});
 	}
 
 
@@ -234,8 +210,8 @@ public class MapInfoLayer extends OsmandMapLayer {
 		if(v instanceof TextView) {
 			TextView tv = (TextView) v;
 			tv.setTextColor(textColor);
-			tv.setShadowLayer(textShadowColor == 0 ? 0 : (5 * scaleCoefficient), 0, 0, textShadowColor);
-			tv.setTypeface(tv.getTypeface(), textBold ? Typeface.BOLD : Typeface.NORMAL);
+			tv.setShadowLayer(textShadowColor == 0 ? 0 : (8 * view.getScaleCoefficient()), 0, 0, textShadowColor);
+			tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 17635b86fa..8b36c2e089 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -224,6 +224,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		view.setClickable(true);
 		view.setLongClickable(true);
 		view.setFocusable(true);
+		refreshMap(true);
 	}
 
 	public Boolean onKeyDown(int keyCode, KeyEvent event) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 3679a8d577..69d4c835b1 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -61,6 +61,20 @@ public class MapWidgetRegistry {
 		}
 	}
 	
+	public boolean hasCollapsibles(ApplicationMode mode) {
+		for (MapWidgetRegInfo r : left) {
+			if (r.visibleCollapsed(mode)) {
+				return true;
+			}
+		}
+		for (MapWidgetRegInfo r : right) {
+			if (r.visibleCollapsed(mode)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
 	
 	public void updateInfo(ApplicationMode mode, DrawSettings drawSettings, boolean expanded) {
 		update(mode, drawSettings, expanded, left);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index 4141390e5e..d148c4096c 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -18,7 +18,7 @@ import android.graphics.Path;
 
 public class NextTurnInfoWidget extends BaseMapWidget {
 
-	private float scaleCoefficient = MapInfoLayer.scaleCoefficient;
+	private final float scaleCoefficient;
 	private float width;
 	private float height ;
 	private static final float miniCoeff = 2.5f;
@@ -41,10 +41,12 @@ public class NextTurnInfoWidget extends BaseMapWidget {
 	protected int turnImminent;
 	protected boolean horisontalMini;
 
-	public NextTurnInfoWidget(Context ctx, Paint textPaint, Paint subtextPaint, boolean horisontalMini) {
+	public NextTurnInfoWidget(Context ctx, Paint textPaint, Paint subtextPaint, boolean horisontalMini,
+			float scaleCoefficient) {
 		super(ctx);
 		this.textPaint = textPaint;
 		this.subtextPaint = subtextPaint;
+		this.scaleCoefficient = scaleCoefficient;
 
 
 		paintBlack = new Paint();
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index f29cab3356..ded8de5660 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -32,7 +32,6 @@ import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.router.RouteResultPreparation;
 import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -48,7 +47,7 @@ import android.text.format.DateFormat;
 import android.view.View;
 
 public class RouteInfoWidgetsFactory {
-	public float scaleCoefficient = 1;
+	private final float scaleCoefficient ;
 	
 	public RouteInfoWidgetsFactory(float scaleCoefficient){
 		this.scaleCoefficient = scaleCoefficient;
@@ -56,7 +55,7 @@ public class RouteInfoWidgetsFactory {
 	
 	public NextTurnInfoWidget createNextInfoControl(final RoutingHelper routingHelper, final OsmandApplication ctx,
 			final OsmandSettings settings, Paint textPaint, Paint subtextPaint, boolean horisontalMini) {
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini) {
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini, scaleCoefficient) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
 			TurnType straight = TurnType.straight();
 
@@ -146,7 +145,7 @@ public class RouteInfoWidgetsFactory {
 	
 	public NextTurnInfoWidget createNextNextInfoControl(final RoutingHelper routingHelper, final OsmandApplication ctx,
 			final OsmandSettings settings, Paint textPaint, Paint subtextPaint, boolean horisontalMini) {
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini) {
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini, scaleCoefficient) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {

From 994e4e48fc6eb6f0d4e01b913f54875d91efa86b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 02:43:43 +0100
Subject: [PATCH 16/23] Update controls

---
 .../osmand/plus/activities/MapActivity.java   |   3 +-
 .../audionotes/AudioVideoNotesPlugin.java     |   2 +-
 .../osmand/plus/views/MapControlsLayer.java   |   6 +-
 .../net/osmand/plus/views/MapInfoLayer.java   | 155 ++++++++++--------
 .../osmand/plus/views/OsmandMapTileView.java  |   5 +-
 .../views/mapwidgets/MapWidgetRegistry.java   |  25 ++-
 6 files changed, 117 insertions(+), 79 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index f0ae4a90b0..4384f5f6a6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -190,6 +190,7 @@ public class MapActivity extends AccessibleActivity {
 		if(System.currentTimeMillis() - tm > 50) {
 			System.err.println("OnCreate for MapActivity took " + (System.currentTimeMillis() - tm) + " ms");
 		}
+		mapView.refreshMap(true);
 	}
 
 	private void checkAppInitialization() {
@@ -246,7 +247,7 @@ public class MapActivity extends AccessibleActivity {
 			mapView.setMapRender(atlasMapRendererView);
 			OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
 			surf.setVisibility(View.GONE);
-		} else if(init) {
+		} else {
 			OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
 			surf.setVisibility(View.VISIBLE);
 			surf.setMapView(mapView);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 16afde15db..7f461069d7 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -520,7 +520,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			recordControl = new TextInfoWidget(activity);
 			recordControl.setImageDrawable(activity.getResources().getDrawable(R.drawable.monitoring_rec_inactive));
 			setRecordListener(recordControl, activity);
-			mapInfoLayer.getMapInfoControls().registerSideWidget(recordControl, R.drawable.widget_icon_av_inactive, R.drawable.widget_icon_av_inactive,
+			mapInfoLayer.registerSideWidget(recordControl, R.drawable.widget_icon_av_inactive, R.drawable.widget_icon_av_inactive,
 					R.string.map_widget_av_notes, "audionotes", false, 22);
 			mapInfoLayer.recreateControls();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 491576ee54..8dc0b350ef 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -101,7 +101,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		initZooms();
 		initControls();
 		initRouteControls();
-		
+		updateControls(view.getCurrentRotatedTileBox(), null);
 	}
 
 	private class CompassDrawable extends Drawable {
@@ -423,6 +423,10 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
+		updateControls(tileBox, nightMode);
+	}
+
+	private void updateControls(RotatedTileBox tileBox, DrawSettings nightMode) {
 		boolean isNight = nightMode != null && nightMode.isNightMode();
 		int shadw = isNight ? Color.TRANSPARENT : Color.WHITE;
 		int textColor = isNight ? mapActivity.getResources().getColor(R.color.widgettext_night) : Color.BLACK;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 7b6ab4d958..4cf04e9269 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -17,6 +17,7 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
+import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -46,6 +47,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private MapWidgetRegistry mapInfoControls;
 
 	private OsmandSettings settings;
+	private DrawSettings drawSettings;
 
 
 	public MapInfoLayer(MapActivity map, RouteLayer layer){
@@ -77,7 +79,12 @@ public class MapInfoLayer extends OsmandMapLayer {
 		alarmControl.setVisibility(View.GONE);
 		lanesControl.setVisibility(View.GONE);
 		recreateControls();
-		updateColorShadowsOfText(null);
+	}
+	
+	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
+			int messageId, String key, boolean left, int priorityOrder) {
+		MapWidgetRegInfo reg = mapInfoControls.registerSideWidget(widget, drawableDark, drawableLight, messageId, key, left, priorityOrder);
+		updateReg(calculateTextState(), reg);
 	}
 	
 	public void registerAllControls(){
@@ -102,21 +109,21 @@ public class MapInfoLayer extends OsmandMapLayer {
 //		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
 		// right stack
 		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
-		mapInfoControls.registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
+		registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
 		TextInfoWidget dist = ric.createDistanceControl(map);
-		mapInfoControls.registerSideWidget(dist, R.drawable.widget_target, R.drawable.widget_target, R.string.map_widget_distance, "distance", false, 5);
+		registerSideWidget(dist, R.drawable.widget_target, R.drawable.widget_target, R.string.map_widget_distance, "distance", false, 5);
 		TextInfoWidget time = ric.createTimeControl(map);
-		mapInfoControls.registerSideWidget(time, R.drawable.widget_time, R.drawable.widget_time, R.string.map_widget_time, "time", false, 10);
+		registerSideWidget(time, R.drawable.widget_time, R.drawable.widget_time, R.string.map_widget_time, "time", false, 10);
 		TextInfoWidget speed = ric.createSpeedControl(map);
-		mapInfoControls.registerSideWidget(speed, R.drawable.widget_speed, R.drawable.widget_speed, R.string.map_widget_speed, "speed", false, 15);
+		registerSideWidget(speed, R.drawable.widget_speed, R.drawable.widget_speed, R.string.map_widget_speed, "speed", false, 15);
 		TextInfoWidget gpsInfo = mic.createGPSInfoControl(map);
-		mapInfoControls.registerSideWidget(gpsInfo, R.drawable.widget_gps_info,  R.drawable.widget_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
+		registerSideWidget(gpsInfo, R.drawable.widget_gps_info,  R.drawable.widget_gps_info, R.string.map_widget_gps_info, "gps_info", false, 17);
 		TextInfoWidget maxspeed = ric.createMaxSpeedControl(map);
-		mapInfoControls.registerSideWidget(maxspeed, R.drawable.widget_max_speed, R.drawable.widget_max_speed, R.string.map_widget_max_speed, "max_speed", false,  18);
+		registerSideWidget(maxspeed, R.drawable.widget_max_speed, R.drawable.widget_max_speed, R.string.map_widget_max_speed, "max_speed", false,  18);
 		TextInfoWidget alt = mic.createAltitudeControl(map);
-		mapInfoControls.registerSideWidget(alt, R.drawable.widget_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
+		registerSideWidget(alt, R.drawable.widget_altitude, R.drawable.widget_altitude, R.string.map_widget_altitude, "altitude", false, 20);
 		TextInfoWidget plainTime = ric.createPlainTimeControl(map);
-		mapInfoControls.registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
+		registerSideWidget(plainTime, R.drawable.widget_time_to_distance, R.drawable.widget_time_to_distance, R.string.map_widget_plain_time, "plain_time", false, 25);
 	}
 	
 	
@@ -141,84 +148,100 @@ public class MapInfoLayer extends OsmandMapLayer {
 			}
 		});
 	}
+	
+	private static class TextState {
+		boolean textBold ;
+		int textColor ;
+		int textShadowColor ;
+		int boxTop;
+		int rightRes;
+		int leftRes;
+		int expand;
+		int boxFree;
+	}
 
 
 	private int themeId = -1;
-	public void updateColorShadowsOfText(DrawSettings drawSettings) {
+	public void updateColorShadowsOfText() {
 		boolean transparent = view.getSettings().TRANSPARENT_MAP_THEME.get();
 		boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
 		boolean following = routeLayer.getHelper().isFollowingMode();
 		int calcThemeId = (transparent ? 4 : 0) | (nightMode ? 2 : 0) | (following ? 1 : 0);
 		if (themeId != calcThemeId) {
 			themeId = calcThemeId;
-			boolean textBold = following;
-			int textColor = nightMode ? view.getResources().getColor(R.color.widgettext_night):Color.BLACK;
-			// Night shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent night skin (from box_night_free_simple.9.png)
-			int textShadowColor = nightMode? view.getResources().getColor(R.color.widgettext_shadow_night) : Color.WHITE;
-			if (!transparent && !nightMode) {
-				textShadowColor = Color.TRANSPARENT;
-			}
-			int boxTop;
-			int rightRes;
-			int leftRes;
-			int expand;
-			int boxFree;
-			if (transparent) {
-				boxTop = R.drawable.btn_flat_trans;
-				rightRes = R.drawable.btn_left_round_trans;
-				leftRes = R.drawable.btn_right_round_trans;
-				expand = R.drawable.btn_inset_circle_trans;
-				boxFree = R.drawable.btn_round_trans;
-			} else if (nightMode) {
-				boxTop = R.drawable.btn_flat_night;
-				rightRes = R.drawable.btn_left_round_night;
-				leftRes = R.drawable.btn_right_round_night;
-				expand = R.drawable.btn_inset_circle_night;
-				boxFree = R.drawable.btn_round_night;
-			} else {
-				boxTop = R.drawable.btn_flat;
-				rightRes = R.drawable.btn_left_round;
-				leftRes = R.drawable.btn_right_round;
-				expand = R.drawable.btn_inset_circle;
-				boxFree = R.drawable.btn_round;
-			}
+			TextState ts = calculateTextState();
 //			lanesControl.setBackgroundDrawable(boxFree);
-			for(int i = 0 ; i < rightStack.getChildCount(); i++ ) {
-				View v = rightStack.getChildAt(i).findViewById(R.id.widget_bg);
-				if(v != null) {
-					v.setBackgroundResource(rightRes);
-					updateTextColor(v.findViewById(R.id.widget_text_small), textColor, textShadowColor, textBold);
-					updateTextColor(v.findViewById(R.id.widget_text), textColor, textShadowColor, textBold);
-				}
+			for(MapWidgetRegInfo reg :  mapInfoControls.getLeft()) {
+				updateReg(ts, reg);
 			}
-			for(int i = 0 ; i < leftStack.getChildCount(); i++ ) {
-				View v = leftStack.getChildAt(i).findViewById(R.id.widget_bg);
-				if(v != null) {
-					v.setBackgroundResource(leftRes);
-					updateTextColor(v.findViewById(R.id.widget_text_small), textColor, textShadowColor, textBold);
-					updateTextColor(v.findViewById(R.id.widget_text), textColor, textShadowColor, textBold);
-				}
+			for(MapWidgetRegInfo reg :  mapInfoControls.getRight()) {
+				updateReg(ts, reg);
 			}
-			this.expand.setBackgroundResource(expand);
+			this.expand.setBackgroundResource(ts.expand);
 			rightStack.invalidate();
 			leftStack.invalidate();
 		}
 	}
+
+	private void updateReg(TextState ts, MapWidgetRegInfo reg) {
+		View v = reg.widget.getView().findViewById(R.id.widget_bg);
+		if(v != null) {
+			v.setBackgroundResource(reg.left ? ts.leftRes : ts.rightRes);
+			updateTextColor(v.findViewById(R.id.widget_text_small), ts);
+			updateTextColor(v.findViewById(R.id.widget_text), ts);
+		}
+	}
+
+	private TextState calculateTextState() {
+		boolean transparent = view.getSettings().TRANSPARENT_MAP_THEME.get();
+		boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
+		boolean following = routeLayer.getHelper().isFollowingMode();
+		TextState ts = new TextState();
+		ts.textBold = following;
+		ts.textColor = nightMode ? view.getResources().getColor(R.color.widgettext_night) : Color.BLACK;
+		// Night shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent
+		// night skin (from box_night_free_simple.9.png)
+		ts.textShadowColor = nightMode ? view.getResources().getColor(R.color.widgettext_shadow_night) : Color.WHITE;
+		if (!transparent && !nightMode) {
+			ts.textShadowColor = Color.TRANSPARENT;
+		}
+		if (transparent) {
+			ts.boxTop = R.drawable.btn_flat_trans;
+			ts.rightRes = R.drawable.btn_left_round_trans;
+			ts.leftRes = R.drawable.btn_right_round_trans;
+			ts.expand = R.drawable.btn_inset_circle_trans;
+			ts.boxFree = R.drawable.btn_round_trans;
+		} else if (nightMode) {
+			ts.boxTop = R.drawable.btn_flat_night;
+			ts.rightRes = R.drawable.btn_left_round_night;
+			ts.leftRes = R.drawable.btn_right_round_night;
+			ts.expand = R.drawable.btn_inset_circle_night;
+			ts.boxFree = R.drawable.btn_round_night;
+		} else {
+			ts.boxTop = R.drawable.btn_flat;
+			ts.rightRes = R.drawable.btn_left_round;
+			ts.leftRes = R.drawable.btn_right_round;
+			ts.expand = R.drawable.btn_inset_circle;
+			ts.boxFree = R.drawable.btn_round;
+		}
+		return ts;
+	}
 	
 	
-	private void updateTextColor(View v, int textColor, int textShadowColor, boolean textBold) {
+	private void updateTextColor(View v, TextState ts) {
 		if(v instanceof TextView) {
 			TextView tv = (TextView) v;
-			tv.setTextColor(textColor);
-			tv.setShadowLayer(textShadowColor == 0 ? 0 : (8 * view.getScaleCoefficient()), 0, 0, textShadowColor);
-			tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
+			tv.setTextColor(ts.textColor);
+			tv.setShadowLayer(ts.textShadowColor == 0 ? 0 : (8 * view.getScaleCoefficient()), 0, 0, ts.textShadowColor);
+			tv.setTypeface(Typeface.DEFAULT, ts.textBold ? Typeface.BOLD : Typeface.NORMAL);
 		}
 	}
 
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings drawSettings) {
-		updateColorShadowsOfText(drawSettings);
+		this.drawSettings = drawSettings;
 		// update data on draw
+		updateColorShadowsOfText();
 		mapInfoControls.updateInfo(settings.getApplicationMode(), drawSettings, expanded); 
 		// TODO
 //		lanesControl.updateInfo(drawSettings);
@@ -226,14 +249,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 		
 	}
 	
-	public LinearLayout getRightStack() {
-		return rightStack;
-	}
-	
-	public LinearLayout getLeftStack() {
-		return leftStack;
-	}
-
 	
 	@Override
 	public void destroyLayer() {
@@ -315,5 +330,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		mapInfoControls.addControls(this, cm, mode);
 		return cm;
 	}
+
+	
 	
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 8b36c2e089..4a904229d6 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -175,6 +175,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	public void init(Context ctx) {
 		application = (OsmandApplication) ctx.getApplicationContext();
 		settings = application.getSettings();
+		
 		paintGrayFill = new Paint();
 		paintGrayFill.setColor(Color.GRAY);
 		paintGrayFill.setStyle(Style.FILL);
@@ -213,8 +214,10 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		WindowManager mgr = (WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE);
 		dm = new DisplayMetrics();
 		mgr.getDefaultDisplay().getMetrics(dm);
+		LatLon ll = settings.getLastKnownMapLocation();
 		currentViewport = new RotatedTileBox.RotatedTileBoxBuilder().
-				setLocation(0, 0).setZoom(3).setPixelDimensions(100, 100).build();
+				setLocation(ll.getLatitude(), ll.getLongitude()).setZoom(settings.getLastKnownMapZoom()).
+				setPixelDimensions(100, 100).build();
 		currentViewport.setDensity(dm.density);
 		currentViewport.setMapDensity(getSettingsMapDensity());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 69d4c835b1..0e21250865 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -48,13 +48,14 @@ public class MapWidgetRegistry {
 			ApplicationMode mode, boolean left, boolean expanded) {
 		Set<MapWidgetRegInfo> s = left ? this.left : this.right;
 		for (MapWidgetRegInfo r : s) {
-			if (r.visible(mode)) {
+			if (r.visible(mode) || r.widget.isExplicitlyVisible()) {
 				stack.addView(r.widget.getView());
 			}
 		}
 		if (expanded) {
 			for (MapWidgetRegInfo r : s) {
-				if (r.visibleCollapsed(mode)) {
+				if (r.visibleCollapsed(mode) && 
+						!r.widget.isExplicitlyVisible()) {
 					stack.addView(r.widget.getView());
 				}
 			}
@@ -88,10 +89,10 @@ public class MapWidgetRegistry {
 			}
 		}
 	}
-	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
+	public MapWidgetRegInfo registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
 			int messageId, String key, boolean left, int priorityOrder) {
 		MapWidgetRegInfo ii = new MapWidgetRegInfo(key, widget, drawableDark, drawableLight, 
-				messageId, priorityOrder);
+				messageId, priorityOrder, left);
 		for (ApplicationMode ms : ApplicationMode.values(settings)) {
 			boolean collapse = ms.isWidgetCollapsible(key);
 			boolean def = ms.isWidgetVisible(key);
@@ -122,6 +123,7 @@ public class MapWidgetRegistry {
 		} else {
 			this.right.add(ii);
 		}
+		return ii;
 	}
 	
 	private void restoreModes(Set<String> set, Set<MapWidgetRegInfo> mi, ApplicationMode mode) {
@@ -266,6 +268,14 @@ public class MapWidgetRegistry {
 		return (r.visibleCollapsed(mode)? " + " : "  ") + ctx.getString(r.messageId);
 	}
 	
+	public Set<MapWidgetRegInfo> getRight() {
+		return right;
+	}
+	
+	public Set<MapWidgetRegInfo> getLeft() {
+		return left;
+	}
+	
 	private void addControls(final MapInfoLayer mil, final ContextMenuAdapter adapter, Set<MapWidgetRegInfo> top, final ApplicationMode mode) {
 		for(final MapWidgetRegInfo r : top){
 			adapter.item(r.messageId).selected(r.visibleCollapsed(mode) || r.visible(mode) ? 1 : 0)
@@ -294,19 +304,22 @@ public class MapWidgetRegistry {
 		public final int drawableDark;
 		public final int drawableLight;
 		public final int messageId;
-		public final  String key;
+		public final String key;
+		public final boolean left;
 		public final int priorityOrder;
 		private final Set<ApplicationMode> visibleCollapsible = new LinkedHashSet<ApplicationMode>();
 		private final Set<ApplicationMode> visibleModes = new LinkedHashSet<ApplicationMode>();
 		private Runnable stateChangeListener = null;
 		
-		public MapWidgetRegInfo(String key, TextInfoWidget widget, int drawableDark, int drawableLight, int messageId, int priorityOrder) {
+		public MapWidgetRegInfo(String key, TextInfoWidget widget, int drawableDark, int drawableLight, int messageId, int priorityOrder,
+				boolean left) {
 			this.key = key;
 			this.widget = widget;
 			this.drawableDark = drawableDark;
 			this.drawableLight = drawableLight;
 			this.messageId = messageId;
 			this.priorityOrder = priorityOrder;
+			this.left = left;
 		}
 		
 		public boolean visibleCollapsed(ApplicationMode mode){

From c3c5d9d055974d04e0f1266cd25a888b3af43b8d Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 12:42:31 +0100
Subject: [PATCH 17/23] Add big turn info

---
 OsmAnd/res/layout/map_hud_widget.xml          |   4 +-
 OsmAnd/res/values/sizes.xml                   |   4 +-
 .../monitoring/OsmandMonitoringPlugin.java    |   2 -
 .../src/net/osmand/plus/osmo/OsMoPlugin.java  |   2 -
 .../net/osmand/plus/views/MapInfoLayer.java   |  21 +-
 .../views/mapwidgets/MapWidgetRegistry.java   |   6 +-
 .../views/mapwidgets/NextTurnInfoWidget.java  | 274 ++++++++++--------
 .../mapwidgets/RouteInfoWidgetsFactory.java   | 121 +++-----
 .../plus/views/mapwidgets/TextInfoWidget.java |  20 ++
 9 files changed, 233 insertions(+), 221 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 279dc73bc4..804fa27f7e 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -7,9 +7,9 @@
     android:background="@drawable/btn_left_round"
     android:orientation="vertical">
 
-    <ImageButton
+    <ImageView
         android:id="@+id/widget_top_icon"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/map_widget_image"
         android:layout_height="@dimen/map_widget_image"
         android:layout_gravity="center"
         android:src="@drawable/ic_action_close_light"
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 141173b661..d6355ff417 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -50,8 +50,8 @@
 	<dimen name="osmo_header_height">56dp</dimen>
 	<!--  map buttons -->
 	<dimen name="map_trans_seek_size">80dp</dimen>
-	<dimen name="map_widget_text_size">20sp</dimen>
-	<dimen name="map_widget_text_size_small">14sp</dimen>
+	<dimen name="map_widget_text_size">23sp</dimen>
+	<dimen name="map_widget_text_size_small">15sp</dimen>
 	<dimen name="map_widget_text_bottom_margin">1sp</dimen>
 	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_route_buttons_width">60dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 051476dc96..7af8cbeebc 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -154,7 +154,6 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 					setImageDrawable(monitoringBig);
 					return true;
 				}
-				boolean visible = true;
 				String txt = map.getString(R.string.monitoring_control_start);
 				String subtxt = null;
 				Drawable d = monitoringInactive;
@@ -203,7 +202,6 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 						}
 					}, 500);
 				}
-				updateVisibility(visible);
 				return true;
 			}
 		};
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index f8d9cd147b..d10ca0454a 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -215,7 +215,6 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 			private Drawable blinkImg;
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean visible = true;
 				String txt = "OsMo";
 				String subtxt = "";
 				SessionInfo si = getService().getCurrentSessionInfo();
@@ -258,7 +257,6 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 					blink(big, small);
 				}
 				
-				updateVisibility(visible);
 				return true;
 			}
 			
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 4cf04e9269..2281888e00 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -15,9 +15,10 @@ import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
+import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
+import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
-import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -96,17 +97,13 @@ public class MapInfoLayer extends OsmandMapLayer {
 		
 		alarmControl = ric.createAlarmInfoControl(app, map);
 		// register left stack
-		// FIXME TODO LEFT STACK
-//		RoutingHelper routingHelper = app.getRoutingHelper();
-//		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(), false);
-//		mapInfoControls.registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
-//		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(routingHelper, app, view.getSettings(),
-//				paintSmallText, paintSmallSubText, true);
-//		mapInfoControls.registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
-//				10);
-//		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(routingHelper, app, view.getSettings(),
-//				paintSmallText, paintSmallSubText, true);
-//		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
+		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
+		mapInfoControls.registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
+		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(map, app, true);
+		mapInfoControls.registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
+				10);
+		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(map, app, true);
+		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
 		// right stack
 		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
 		registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 0e21250865..c0faa9b61a 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -258,8 +258,10 @@ public class MapWidgetRegistry {
 	public void addControls(MapInfoLayer mil, ContextMenuAdapter cm, ApplicationMode mode) {
 		cm.item(R.string.map_widget_right).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
 		addControls(mil, cm, right, mode);
-		cm.item(R.string.map_widget_left).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
-		addControls(mil, cm, left, mode);
+		if(mode != ApplicationMode.DEFAULT) {
+			cm.item(R.string.map_widget_left).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
+			addControls(mil, cm, left, mode);
+		}
 		cm.item(R.string.map_widget_appearance_rem).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();
 		addControlsAppearance(mil, cm, mode);		
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index d148c4096c..ab7bda479b 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -3,154 +3,184 @@ package net.osmand.plus.views.mapwidgets;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
+import net.osmand.plus.views.TurnPathHelper;
 import net.osmand.router.TurnType;
+import net.osmand.util.Algorithms;
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 
 
 
-public class NextTurnInfoWidget extends BaseMapWidget {
+public class NextTurnInfoWidget extends TextInfoWidget {
 
-	private final float scaleCoefficient;
-	private float width;
-	private float height ;
-	private static final float miniCoeff = 2.5f;
-
-	protected double deviatedPath = 0;
-
-	protected Path pathForTurn = new Path();
-
-	protected TurnType turnType = null;
-	protected String exitOut = null;
-	protected int nextTurnDirection = 0;
-	
-
-	protected Paint textPaint;
-	protected Paint subtextPaint;
-	private Paint paintBlack;
-	private Paint paintRouteDirection;
-
-	protected boolean deviatedFromRoute;
-	protected int turnImminent;
 	protected boolean horisontalMini;
-
-	public NextTurnInfoWidget(Context ctx, Paint textPaint, Paint subtextPaint, boolean horisontalMini,
-			float scaleCoefficient) {
-		super(ctx);
-		this.textPaint = textPaint;
-		this.subtextPaint = subtextPaint;
-		this.scaleCoefficient = scaleCoefficient;
-
-
-		paintBlack = new Paint();
-		paintBlack.setStyle(Style.STROKE);
-		paintBlack.setColor(Color.BLACK);
-		paintBlack.setAntiAlias(true);
-		paintBlack.setStrokeWidth(2.5f);
-
-		paintRouteDirection = new Paint();
-		paintRouteDirection.setStyle(Style.FILL);
-		paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow));
-		paintRouteDirection.setAntiAlias(true);
-		
-		pathTransform = new Matrix();
-		updateHorisontalMini(horisontalMini);
-		
-	}
-
-	protected void updateHorisontalMini(boolean horisontalMini) {
-		this.horisontalMini = horisontalMini;
-		if (horisontalMini) {
-			pathTransform.postScale(scaleCoefficient / miniCoeff, scaleCoefficient / miniCoeff);
-			width = 72 * scaleCoefficient / miniCoeff;
-			height = 72 * scaleCoefficient / miniCoeff;
-		} else {
-			pathTransform.postScale(scaleCoefficient, scaleCoefficient);
-			width = 72 * scaleCoefficient;
-			height = 72 * scaleCoefficient;
-		}
-		requestLayout();
-	}
+	
+	protected int deviatedPath = 0;
+	protected int nextTurnDistance = 0;
+	
+	private TurnDrawable turnDrawable;
+	private OsmandApplication app;
 	
 
-	protected Matrix pathTransform = new Matrix();
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		int h = 0;
-		int w = 0;
-		if (!horisontalMini) {
-			h = (int) (8 * scaleCoefficient + Math.max(textPaint.getTextSize(), subtextPaint.getTextSize()));
+	public NextTurnInfoWidget(Activity activity, OsmandApplication app, boolean horisontalMini,
+			float scaleCoefficient) {
+		super(activity);
+		this.app = app;
+		this.horisontalMini = horisontalMini;
+		turnDrawable = new TurnDrawable(activity);
+		if(horisontalMini) {
+			setImageDrawable(turnDrawable);
 		} else {
-			h = (int) (7 * scaleCoefficient);
-			w = (int) textPaint.measureText(OsmAndFormatter.getFormattedDistance(nextTurnDirection, getClientContext()));
+			setTopImageDrawable(turnDrawable);
+		}
+	}
+	
+	public TurnType getTurnType() {
+		return turnDrawable.turnType;
+	}
+	
+	public void setTurnType(TurnType turnType) {
+		if (!Algorithms.objectEquals(getTurnType(), turnType)) {
+			turnDrawable.setTurnType(turnType);
+			invalidateImageViews();
+		}
+		updateVisibility(turnType != null);
+	}
+	
+	public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) {
+		if(turnDrawable.turnImminent != turnImminent || turnDrawable.deviatedFromRoute != deviatedFromRoute) {
+			turnDrawable.setTurnImminent(turnImminent, deviatedFromRoute);
+			updateDistance();
+		}
+	}
+	
+	public void setDeviatePath(int deviatePath) {
+		if (RouteInfoWidgetsFactory.distChanged(deviatePath, this.deviatedPath)) {
+			this.deviatedPath = deviatePath;
+			updateDistance();
 		}
-		setWDimensions((int) width + w, (int) height + h);
 	}
 
-	@Override
-	protected void onDraw(Canvas canvas) {
-		super.onDraw(canvas);
-		if (pathForTurn != null) {
-			//if user deviates from route that we should draw grey arrow
-			if (deviatedFromRoute){
-				paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_distant));
-			} else if (turnImminent > 0) {
-				paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow));
-			} else if (turnImminent == 0) {
-				paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_imminent));
-			} else {
-				paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_distant));
-			}
-			// small indent
-			canvas.translate(0, 3 * scaleCoefficient);
-			canvas.drawPath(pathForTurn, paintRouteDirection);
-			canvas.drawPath(pathForTurn, paintBlack);
-			if (exitOut != null && !horisontalMini && !deviatedFromRoute) {
-				drawShadowText(canvas, exitOut, width / 2 - 7 * scaleCoefficient, 
-						height / 2 + textPaint.getTextSize() / 2 - 3 * scaleCoefficient, textPaint);
-			}
-			String text = OsmAndFormatter.getFormattedDistance(nextTurnDirection, getClientContext());
-			String subtext = null;
+	public void setTurnDistance(int nextTurnDistance) {
+		if (RouteInfoWidgetsFactory.distChanged(nextTurnDistance, this.nextTurnDistance)) {
+			this.nextTurnDistance = nextTurnDistance;
+			updateDistance();
+		}		
+	}
 
-			if (deviatedFromRoute) {
-				text = OsmAndFormatter.getFormattedDistance((float) deviatedPath, (OsmandApplication)getContext().getApplicationContext());
-			}
-
-			int ls = text.lastIndexOf(' ');
-			float st = 0;
-			if (ls != -1) {
-				subtext = text.substring(ls + 1);
-				text = text.substring(0, ls);
-				st = textPaint.measureText(subtext);
-			}
-			float mt = textPaint.measureText(text);
-			if (!horisontalMini) {
-				float startX = Math.max((getWWidth() - st - mt) / 2, 2 * scaleCoefficient);
-				drawShadowText(canvas, text, startX, getWHeight() - 5 * scaleCoefficient, textPaint);
-				if (subtext != null) {
-					drawShadowText(canvas, subtext, startX + 2 * scaleCoefficient + mt, getWHeight() - 5 * scaleCoefficient, subtextPaint);
-				}
-			} else {
-				drawShadowText(canvas, text, 72 * scaleCoefficient / miniCoeff + 2 * scaleCoefficient,
-						height / 2 + 7 * scaleCoefficient, textPaint);
-				if (subtext != null) {
-					drawShadowText(canvas, subtext, 72 * scaleCoefficient / miniCoeff +  mt
-							+ 2 * scaleCoefficient, height / 2 + 7 * scaleCoefficient, subtextPaint);
-				}
-			}
+	private void updateDistance() {
+		int deviatePath = turnDrawable.deviatedFromRoute ? deviatedPath : nextTurnDistance;
+		String ds = OsmAndFormatter.getFormattedDistance(deviatePath, app);
+		int ls = ds.lastIndexOf(' ');
+		if (ls == -1) {
+			setText(ds, null);
+		} else {
+			setText(ds.substring(0, ls), ds.substring(ls + 1));
 		}
 	}
+	
+	public void setExitOut(int exit) {
+		// TODO exit
+//		if(turnDrawable.exitOut != exit) {
+//			turnDrawable.e
+//		}
+//		TODO;
+	}
 
 	@Override
 	public boolean updateInfo(DrawSettings drawSettings) {
 		return false;
 	}
+	
+	public static class TurnDrawable extends Drawable {
+		protected Paint paintBlack;
+		protected Paint paintRouteDirection;
+		protected Path pathForTurn = new Path();
+		protected TurnType turnType = null;
+		protected int turnImminent;
+		protected boolean deviatedFromRoute;
+		private Context ctx;
+		
+		public TurnDrawable(Context ctx) {
+			this.ctx = ctx;
+			paintBlack = new Paint();
+			paintBlack.setStyle(Style.STROKE);
+			paintBlack.setColor(Color.BLACK);
+			paintBlack.setAntiAlias(true);
+			paintBlack.setStrokeWidth(2.5f);
+
+			paintRouteDirection = new Paint();
+			paintRouteDirection.setStyle(Style.FILL);
+			paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow));
+			paintRouteDirection.setAntiAlias(true);
+			
+		}
+		
+		@Override
+		protected void onBoundsChange(Rect bounds) {
+			if (pathForTurn != null) {
+				Matrix m = new Matrix();
+				m.setScale(bounds.width() / 72f, bounds.height() / 72f);
+				pathForTurn.transform(m, pathForTurn);
+			}
+		}
+		
+		public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) {
+			//if user deviates from route that we should draw grey arrow
+			this.turnImminent = turnImminent;
+			this.deviatedFromRoute = deviatedFromRoute;
+			if (deviatedFromRoute){
+				paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_distant));
+			} else if (turnImminent > 0) {
+				paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow));
+			} else if (turnImminent == 0) {
+				paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_imminent));
+			} else {
+				paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_distant));
+			}
+			
+		}
+
+		@Override
+		public void draw(Canvas canvas) {
+			/// small indent
+			// canvas.translate(0, 3 * scaleCoefficient);
+			canvas.drawPath(pathForTurn, paintRouteDirection);
+			canvas.drawPath(pathForTurn, paintBlack);
+		}
+
+		@Override
+		public void setAlpha(int alpha) {
+			paintRouteDirection.setAlpha(alpha);
+		}
+
+		@Override
+		public void setColorFilter(ColorFilter cf) {
+			paintRouteDirection.setColorFilter(cf);
+		}
+
+		@Override
+		public int getOpacity() {
+			return 0;
+		}
+
+		public void setTurnType(TurnType turnType) {
+			this.turnType = turnType;
+			if(turnType != null) {
+				TurnPathHelper.calcTurnPath(pathForTurn, turnType, null);
+				onBoundsChange(getBounds());
+			}
+		}
+		
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index ded8de5660..3a0b9d2df3 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -31,7 +31,7 @@ import net.osmand.plus.views.TurnPathHelper;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.router.RouteResultPreparation;
 import net.osmand.router.TurnType;
-import net.osmand.util.Algorithms;
+import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -53,59 +53,40 @@ public class RouteInfoWidgetsFactory {
 		this.scaleCoefficient = scaleCoefficient;
 	}
 	
-	public NextTurnInfoWidget createNextInfoControl(final RoutingHelper routingHelper, final OsmandApplication ctx,
-			final OsmandSettings settings, Paint textPaint, Paint subtextPaint, boolean horisontalMini) {
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini, scaleCoefficient) {
+	public NextTurnInfoWidget createNextInfoControl(final Activity activity,
+			final OsmandApplication app, boolean horisontalMini) {
+		final OsmandSettings settings = app.getSettings();
+		final RoutingHelper routingHelper = app.getRoutingHelper();
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini, scaleCoefficient) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
-			TurnType straight = TurnType.straight();
 
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean visible = false;
-				boolean followingMode = routingHelper.isFollowingMode() || ctx.getLocationProvider().getLocationSimulation().isRouteAnimating();
+				boolean followingMode = routingHelper.isFollowingMode() || app.getLocationProvider().getLocationSimulation().isRouteAnimating();
+				TurnType turnType = null;
+				boolean deviatedFromRoute = false;
+				int turnImminent = 0;
+				int nextTurnDistance = 0;
 				if (routingHelper != null && routingHelper.isRouteCalculated() && followingMode) {
 					deviatedFromRoute = routingHelper.isDeviatedFromRoute() ;
+					
 					if (deviatedFromRoute) {
-						visible = true;
 						turnImminent = 0;
 						turnType = TurnType.valueOf(TurnType.OFFR, settings.DRIVING_REGION.get().leftHandDriving);
-						TurnPathHelper.calcTurnPath(pathForTurn, turnType, pathTransform);
-						deviatedPath = routingHelper.getRouteDeviation();
-						invalidate();
+						setDeviatePath((int) routingHelper.getRouteDeviation());
 					} else {
-						boolean showStraight = false;
 						NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(calc1, true);
-						if (r != null && r.distanceTo > 0) {
-							visible = true;
-							if (r.directionInfo == null) {
-								if (turnType != null) {
-									turnType = null;
-									invalidate();
-								}
-							} else if (!Algorithms.objectEquals(turnType, showStraight ? straight : r.directionInfo.getTurnType())) {
-								turnType = showStraight ? straight : r.directionInfo.getTurnType();
-								TurnPathHelper.calcTurnPath(pathForTurn, turnType, pathTransform);
-								if (turnType.getExitOut() > 0) {
-									exitOut = turnType.getExitOut() + ""; //$NON-NLS-1$
-								} else {
-									exitOut = null;
-								}
-								requestLayout();
-								invalidate();
-							}
-							if (distChanged(r.distanceTo, nextTurnDirection)) {
-								invalidate();
-								requestLayout();
-								nextTurnDirection = r.distanceTo;
-							}
-							if (turnImminent != r.imminent) {
-								turnImminent = r.imminent;
-								invalidate();
-							}
+						if (r != null && r.distanceTo > 0 && r.directionInfo != null) {
+							turnType = r.directionInfo.getTurnType();
+							setExitOut(turnType.getExitOut());
+							nextTurnDistance = r.distanceTo;
+							turnImminent = r.imminent;
 						}
 					}
 				}
-				updateVisibility(visible);
+				setTurnType(turnType);
+				setTurnImminent(turnImminent, deviatedFromRoute);
+				setTurnDistance(nextTurnDistance);
 				return true;
 			}
 		};
@@ -130,31 +111,31 @@ public class RouteInfoWidgetsFactory {
 //				nextTurnInfo.turnImminent = (nextTurnInfo.turnImminent + 1) % 3;
 //				nextTurnInfo.nextTurnDirection = 580;
 //				TurnPathHelper.calcTurnPath(nextTurnInfo.pathForTurn, nextTurnInfo.turnType,nextTurnInfo.pathTransform);
-//				showMiniMap = true;
 				if(routingHelper.isRouteCalculated()) {
 					routingHelper.getVoiceRouter().announceCurrentDirection(null);
 				}
-				nextTurnInfo.requestLayout();
-				nextTurnInfo.invalidate();
 			}
 		});
 		// initial state
-		nextTurnInfo.setVisibility(View.GONE);
 		return nextTurnInfo;
 	}
 	
-	public NextTurnInfoWidget createNextNextInfoControl(final RoutingHelper routingHelper, final OsmandApplication ctx,
-			final OsmandSettings settings, Paint textPaint, Paint subtextPaint, boolean horisontalMini) {
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(ctx, textPaint, subtextPaint, horisontalMini, scaleCoefficient) {
+	public NextTurnInfoWidget createNextNextInfoControl(final Activity activity,
+			final OsmandApplication app, boolean horisontalMini) {
+		final RoutingHelper routingHelper = app.getRoutingHelper();
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini, scaleCoefficient) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean visible = false;
-				boolean followingMode = routingHelper.isFollowingMode() || ctx.getLocationProvider().getLocationSimulation().isRouteAnimating();
+				boolean followingMode = routingHelper.isFollowingMode() || app.getLocationProvider().getLocationSimulation().isRouteAnimating();
+				TurnType turnType = null;
+				boolean deviatedFromRoute = false;
+				int turnImminent = 0;
+				int nextTurnDistance = 0;
 				if (routingHelper != null && routingHelper.isRouteCalculated() && followingMode) {
-					boolean devitedFromRoute = routingHelper.isDeviatedFromRoute() ;
+					deviatedFromRoute = routingHelper.isDeviatedFromRoute() ;
 					NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(calc1, true);
-					if (!devitedFromRoute) {
+					if (!deviatedFromRoute) {
 						if (r != null) {
 							// next turn is very close (show next next with false to speak)
 //							if (r.imminent >= 0 && r.imminent < 2) {
@@ -167,33 +148,15 @@ public class RouteInfoWidgetsFactory {
 //							}
 						}
 					}
-					if (r != null && r.distanceTo > 0) {
-						visible = true;
-						if (r == null || r.directionInfo == null) {
-							if (turnType != null) {
-								turnType = null;
-								invalidate();
-							}
-						} else if (!Algorithms.objectEquals(turnType, r.directionInfo.getTurnType())) {
-							turnType = r.directionInfo.getTurnType();
-							TurnPathHelper.calcTurnPath(pathForTurn, turnType, pathTransform);
-							invalidate();
-							requestLayout();
-						}
-						if (distChanged(r.distanceTo, nextTurnDirection)) {
-							invalidate();
-							requestLayout();
-							nextTurnDirection = r.distanceTo;
-						}
-						int imminent = r.imminent;
-						if (turnImminent != imminent) {
-							turnImminent = imminent;
-							invalidate();
-						}
+					if (r != null && r.distanceTo > 0&& r.directionInfo != null) {
+						turnType = r.directionInfo.getTurnType();
+						turnImminent = r.imminent;
+						nextTurnDistance = r.distanceTo;
 					}
 				}
-				updateVisibility(visible);
-
+				setTurnType(turnType);
+				setTurnImminent(turnImminent, deviatedFromRoute);
+				setTurnDistance(nextTurnDistance);
 				return true;
 			}
 		};
@@ -221,10 +184,14 @@ public class RouteInfoWidgetsFactory {
 			}
 		});
 		// initial state 
-		nextTurnInfo.setVisibility(View.GONE);
 		return nextTurnInfo;
 	}
 	
+	
+
+
+
+
 	public TextInfoWidget createTimeControl(final MapActivity map){
 		final RoutingHelper routingHelper = map.getRoutingHelper();
 		final Drawable time = map.getResources().getDrawable(R.drawable.widget_time);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index dc3accf991..0a6956aa0d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -17,11 +17,14 @@ public class TextInfoWidget  {
 	private ImageView imageView;
 	private TextView textView;
 	private TextView smallTextView;
+	private ImageView topImageView;
 
 	private boolean explicitlyVisible;
 
+
 	public TextInfoWidget(Activity activity) {
 		view = activity.getLayoutInflater().inflate(R.layout.map_hud_widget, null);
+		topImageView = (ImageView) view.findViewById(R.id.widget_top_icon);
 		imageView = (ImageView) view.findViewById(R.id.widget_icon);
 		textView = (TextView) view.findViewById(R.id.widget_text);
 		smallTextView = (TextView) view.findViewById(R.id.widget_text_small);
@@ -41,6 +44,23 @@ public class TextInfoWidget  {
 		imageView.invalidate();
 	}
 	
+	public void setTopImageDrawable(Drawable imageDrawable) {
+		if(imageDrawable != null) {
+			topImageView.setImageDrawable(imageDrawable);
+			topImageView.setVisibility(View.VISIBLE);
+		} else {
+			topImageView.setVisibility(View.INVISIBLE);
+		}
+		topImageView.invalidate();
+	}
+	
+	protected void invalidateImageViews() {
+		topImageView.invalidate();
+		imageView.invalidate();
+	}
+	
+	
+	
 	public void setContentDescription(CharSequence text) {
 		if (contentTitle != null) {
 			view.setContentDescription(contentTitle + " " + text); //$NON-NLS-1$

From c8af7a7467f4875d77e79fba17a4989a5a422346 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 13:52:07 +0100
Subject: [PATCH 18/23] Street name / waypoint

---
 OsmAnd/res/layout/main.xml                    |  18 --
 OsmAnd/res/layout/map_hud_top.xml             |  93 ++++++---
 OsmAnd/res/values/sizes.xml                   |   2 +-
 .../plus/activities/MapActivityActions.java   |  10 +-
 .../plus/helpers/WaypointDialogHelper.java    | 136 +------------
 .../osmand/plus/views/MapControlsLayer.java   |   4 -
 .../net/osmand/plus/views/MapInfoLayer.java   |  35 ++--
 .../plus/views/controls/RulerControl.java     |   3 -
 .../plus/views/mapwidgets/BaseMapWidget.java  |   3 +-
 .../views/mapwidgets/ImageViewWidget.java     |  12 --
 .../mapwidgets/MapInfoWidgetsFactory.java     | 182 +++++++++++-------
 .../views/mapwidgets/NextTurnInfoWidget.java  |   3 +
 .../plus/views/mapwidgets/TextInfoWidget.java |  12 ++
 .../views/mapwidgets/UpdateableWidget.java    |  11 --
 14 files changed, 234 insertions(+), 290 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/ImageViewWidget.java
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/UpdateableWidget.java

diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index a0d121230d..e9838a62bc 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -32,24 +32,6 @@
             android:contentDescription="@string/shared_string_map"
             android:visibility="gone" />
 
-        <!-- deprecated -->
-
-        <FrameLayout
-            android:id="@+id/MapInfoControls"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <LinearLayout
-            android:id="@+id/WaypointVisit"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:orientation="horizontal" />
-
-        <FrameLayout
-            android:id="@+id/MapButtons"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
     </FrameLayout>
 
     <FrameLayout
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index d80a5ad480..65827f38a6 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -9,26 +9,19 @@
     <LinearLayout
         android:id="@+id/map_top_bar"
         android:layout_width="fill_parent"
-        android:layout_height="@dimen/map_address_height"
+        android:layout_height="wrap_content"
         android:background="@drawable/btn_flat"
+        android:minHeight="@dimen/map_address_height"
         android:orientation="horizontal" >
 
-        <ImageView
-            android:id="@+id/waypoint_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/map_button_margin"
-            android:layout_marginRight="@dimen/map_button_margin"
-            android:src="@drawable/ic_action_remove_light" />
-
         <TextView
             android:id="@+id/map_address_text"
             android:layout_width="0dp"
-            android:layout_height="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:ellipsize="end"
             android:gravity="center"
+             
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
             android:shadowRadius="10"
@@ -38,19 +31,58 @@
             android:textStyle="bold" >
         </TextView>
 
-        <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_remove_light" />
+        <LinearLayout
+            android:id="@+id/waypoint_info_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone" >
 
-        <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_remove_light" />
+            <ImageView
+                android:id="@+id/waypoint_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/map_button_margin"
+                android:layout_marginRight="@dimen/map_button_margin"
+                android:src="@drawable/ic_action_remove_light" />
+
+            <TextView
+                android:id="@+id/waypoint_dist"
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dp"
+                android:maxLines="2"
+                android:textColor="@color/wpt_distance_color"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/waypoint_text"
+                android:layout_width="0dp"
+                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:textSize="18sp" />
+
+            <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_remove_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_remove_light" />
+        </LinearLayout>
     </LinearLayout>
     <!-- Widgets -->
 
@@ -169,6 +201,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="top|right"
                         android:orientation="vertical" >
+
                         <include layout="@layout/map_hud_widget" />
                         <!--
                     <include layout="@layout/map_hud_widget" />
@@ -177,13 +210,13 @@
                         -->
                     </LinearLayout>
 
-                        <ImageButton
-                            android:id="@+id/map_collapse_button"
-                            android:layout_width="@dimen/map_button_size"
-                            android:layout_height="@dimen/map_button_size"
-                            android:layout_gravity="top|center_horizontal"
-                            android:background="@drawable/btn_inset_circle"
-                            android:src="@drawable/ic_action_remove_light" />
+                    <ImageButton
+                        android:id="@+id/map_collapse_button"
+                        android:layout_width="@dimen/map_button_size"
+                        android:layout_height="@dimen/map_button_size"
+                        android:layout_gravity="top|center_horizontal"
+                        android:background="@drawable/btn_inset_circle"
+                        android:src="@drawable/ic_action_remove_light" />
                 </LinearLayout>
             </FrameLayout>
         </LinearLayout>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index d6355ff417..228d1d8086 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -52,7 +52,7 @@
 	<dimen name="map_trans_seek_size">80dp</dimen>
 	<dimen name="map_widget_text_size">23sp</dimen>
 	<dimen name="map_widget_text_size_small">15sp</dimen>
-	<dimen name="map_widget_text_bottom_margin">1sp</dimen>
+	<dimen name="map_widget_text_bottom_margin">0sp</dimen>
 	<dimen name="map_button_text_size">18sp</dimen>
 	<dimen name="map_route_buttons_width">60dp</dimen>
 	<dimen name="map_route_buttons_height">54dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 78484dead7..c66a2d759e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -107,8 +107,8 @@ public class MapActivityActions implements DialogProvider {
 		settings = mapActivity.getMyApplication().getSettings();
 		routingHelper = mapActivity.getMyApplication().getRoutingHelper();
 		waypointDialogHelper = new WaypointDialogHelper(mapActivity);
-		waypointDialogHelper.init();
 	}
+	
 
 	protected void addFavouritePoint(final double latitude, final double longitude){
 		String name = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName();
@@ -953,6 +953,14 @@ public class MapActivityActions implements DialogProvider {
 		mDrawerList.setOnItemClickListener(waypointDialogHelper.getDrawerItemClickListener(mapActivity, running,
 				listAdapter, null));
 	}
+	
+	public void showWaypointsDialog(boolean flat) {
+		if(flat) {
+			waypointDialogHelper.showWaypointsDialogFlat(mapActivity, false);
+		} else {
+			waypointDialogHelper.showWaypointsDialog(mapActivity, false);
+		}
+	}
 
 	public void disableDrawer(){
 		if(mDrawerLayout == null) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 81fc5d1315..4b749be9f3 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -3,12 +3,10 @@ package net.osmand.plus.helpers;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.osmand.Location;
 import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.IntermediatePointsDialog;
@@ -16,23 +14,18 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.poi.PoiLegacyFilter;
 import net.osmand.plus.views.AnimateDraggingMapThread;
-import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnDismissListener;
-import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -41,16 +34,14 @@ import android.widget.CompoundButton;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
 /**
  */
-public class WaypointDialogHelper implements OsmAndLocationListener {
+public class WaypointDialogHelper {
 	private MapActivity mapActivity;
 	private OsmandApplication app;
-	private LinearLayout mainLayout;
 	private WaypointHelper waypointHelper;
 
 
@@ -62,79 +53,14 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 		}
 	}
 
-	public final static boolean OVERLAP_LAYOUT = true; // only true is supported
-	private View closePointDialog;
-	private List<LocationPointWrapper> many = new ArrayList<WaypointHelper.LocationPointWrapper>();
-
-
 	public WaypointDialogHelper(MapActivity mapActivity) {
 		this.app = mapActivity.getMyApplication();
 		waypointHelper = this.app.getWaypointHelper();
 		this.mapActivity = mapActivity;
-		this.mainLayout = (LinearLayout) mapActivity.findViewById(R.id.WaypointVisit);
 
 	}
 
-	public void init() {
-		app.getLocationProvider().addLocationListener(this);
-	}
-
-	@Override
-	public void updateLocation(Location location) {
-		if (mapActivity != null) {
-			updateDialog();
-		}
-	}
-
-	public void removeListener() {
-		app.getLocationProvider().removeLocationListener(this);
-		mapActivity = null;
-	}
-
-
-	@SuppressWarnings("deprecation")
-	public void updateDialog() {
-		final LocationPointWrapper point = waypointHelper.getMostImportantLocationPoint(many);
-		if (point == null) {
-			removeDialog();
-		} else {
-			boolean created = false;
-			View dlg = closePointDialog;
-			if (dlg == null) {
-				created = true;
-				final LayoutInflater vi = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				dlg = vi.inflate(R.layout.waypoint_reached, null);
-			}
-			updatePointInfoView(app, mapActivity, dlg, point, null);
-			View all = dlg.findViewById(R.id.all_points);
-			all.setVisibility(/*many.size() <= 1 ? View.GONE : */View.VISIBLE);
-			View btnN = dlg.findViewById(R.id.info_close);
-			btnN.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					waypointHelper.removeVisibleLocationPoint(point);
-					updateDialog();
-				}
-			});
-			if (created) {
-				dlg.setBackgroundDrawable(mapActivity.getResources().getDrawable(R.drawable.view_black_selection));
-				((TextView) dlg.findViewById(R.id.waypoint_text)).setTextColor(Color.WHITE);
-				all.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						showWaypointsDialog(mapActivity, false);
-					}
-				});
-
-				closePointDialog = dlg;
-				mainLayout.addView(closePointDialog, getDialogLayoutParams());
-				waitBeforeLayoutIsResized(dlg);
-			}
-
-		}
-	}
-
-	private static void updatePointInfoView(final OsmandApplication app, final Activity ctx,
+	public static void updatePointInfoView(final OsmandApplication app, final MapActivity activity,
 											View localView, final LocationPointWrapper ps, final DialogFragment dialog) {
 		WaypointHelper wh = app.getWaypointHelper();
 		final LocationPoint point = ps.getPoint();
@@ -142,15 +68,15 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 		localView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				showOnMap(app, ctx, point, dialog);
+				showOnMap(app, activity, point, dialog);
 			}
 		});
 		TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
-		((ImageView) localView.findViewById(R.id.waypoint_icon)).setImageDrawable(ps.getDrawable(ctx, app));
+		((ImageView) localView.findViewById(R.id.waypoint_icon)).setImageDrawable(ps.getDrawable(activity, app));
 		int dist = -1;
 		if (!wh.isRouteCalculated()) {
-			if (ctx instanceof MapActivity) {
-				dist = (int) MapUtils.getDistance(((MapActivity) ctx).getMapView().getLatitude(), ((MapActivity) ctx)
+			if (activity instanceof MapActivity) {
+				dist = (int) MapUtils.getDistance(((MapActivity) activity).getMapView().getLatitude(), ((MapActivity) activity)
 						.getMapView().getLongitude(), point.getLatitude(), point.getLongitude());
 			}
 		} else {
@@ -171,54 +97,12 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 //					0);
 	}
 
-	public void removeDialog() {
-		if (closePointDialog != null) {
-			mainLayout.removeView(closePointDialog);
-			closePointDialog = null;
-			shiftButtons(0);
-		}
-	}
-
 	private FrameLayout.LayoutParams getDialogLayoutParams() {
 		FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
 		params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
 		return params;
 	}
 
-	private void shiftButtons(int height) {
-		MapControlsLayer mapControls = mapActivity.getMapLayers().getMapControlsLayer();
-		if (mapControls != null) {
-			mapControls.shiftLayout(height);
-		}
-	}
-
-
-	private void waitBeforeLayoutIsResized(View reachedView) {
-		//this async task is needed because layout height is not set
-		// right after you add it so we need to w8 some time
-		new AsyncTask<View, Void, Void>() {
-			int height;
-
-			@Override
-			protected Void doInBackground(View... params) {
-				for (int i = 0; i < 10; i++) {
-					SystemClock.sleep(50);
-					height = params[0].getHeight();
-					if (params[0].getHeight() > 0) {
-						break;
-					}
-				}
-				return null;
-			}
-
-			protected void onPostExecute(Void result) {
-				if (height > 0 && OVERLAP_LAYOUT) {
-					shiftButtons(height);
-				}
-			}
-		}.execute(reachedView);
-	}
-
 	public void showWaypointsDialogFlat(FragmentActivity fragmentActivity, boolean edit) {
 		Bundle args = new Bundle();
 		args.putBoolean(WaypointDialogFragment.FLAT_ARG, true);
@@ -237,7 +121,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 	}
 
 
-	public ArrayAdapter<Object> getWaypointsDrawerAdapter(final FragmentActivity ctx, final int[] running, final boolean flat) {
+	public ArrayAdapter<Object> getWaypointsDrawerAdapter(final MapActivity ctx, final int[] running, final boolean flat) {
 		final List<Object> points;
 		if(flat) {
 			points = new ArrayList<Object>(waypointHelper.getAllPoints());
@@ -277,7 +161,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 	}
 
 	public ArrayAdapter<Object> getWaypointsAdapter(final boolean edit, final List<LocationPointWrapper> deletedPoints,
-													 final FragmentActivity ctx, final int[] running,
+													 final MapActivity ctx, final int[] running,
 													 final AlertDialog[] srcDialog, final DialogFragment dialogFragment) {
 		final List<Object> points = getPoints();
 		return new ArrayAdapter<Object>(ctx,
@@ -734,7 +618,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 					if (v == null || v.findViewById(R.id.waypoint_icon) == null) {
 						v = ctx.getLayoutInflater().inflate(R.layout.waypoint_reached, null);
 					}
-					updatePointInfoView(app, ctx, v, getItem(position), WaypointDialogFragment.this);
+					updatePointInfoView(app, (MapActivity) ctx, v, getItem(position), WaypointDialogFragment.this);
 					View remove = v.findViewById(R.id.info_close);
 					if (!edit) {
 						remove.setVisibility(View.GONE);
@@ -790,7 +674,7 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 			final ListView listView = new ListView(ctx);
 			final int[] running = new int[]{-1};
 			final AlertDialog[] srcDialog = new AlertDialog[1];
-			final ArrayAdapter<Object> listAdapter = getWaypointsAdapter(edit, deletedPoints, ctx,
+			final ArrayAdapter<Object> listAdapter = getWaypointsAdapter(edit, deletedPoints, (MapActivity) ctx,
 					running, srcDialog, WaypointDialogFragment.this);
 
 			listView.setAdapter(listAdapter);
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 8dc0b350ef..60c6e5ffe6 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -597,10 +597,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
-	public void shiftLayout(int height) {
-		// TODO
-	}
-
 	private class MapHudButton {
 		View iv;
 		int bgDark;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 2281888e00..cc286bdea1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -14,6 +14,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
 import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
+import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopTextView;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget;
@@ -38,7 +39,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private OsmandMapTileView view;
 	
 	// groups
-	private View topBar;
 	private LinearLayout rightStack;
 	private LinearLayout leftStack;
 	private ImageButton  expand;
@@ -49,6 +49,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 	private OsmandSettings settings;
 	private DrawSettings drawSettings;
+	private TopTextView streetNameView;
 
 
 	public MapInfoLayer(MapActivity map, RouteLayer layer){
@@ -69,11 +70,11 @@ public class MapInfoLayer extends OsmandMapLayer {
 	public void initLayer(final OsmandMapTileView view) {
 		this.view = view;
 		mapInfoControls = new MapWidgetRegistry(map.getMyApplication().getSettings());
-		topBar = map.findViewById(R.id.map_top_bar);
+		
 		leftStack = (LinearLayout) map.findViewById(R.id.map_left_widgets_panel);
 		rightStack = (LinearLayout) map.findViewById(R.id.map_right_widgets_panel);
 		expand = (ImageButton) map.findViewById(R.id.map_collapse_button);
-
+		
 		
 		// update and create controls
 		registerAllControls();
@@ -95,6 +96,9 @@ public class MapInfoLayer extends OsmandMapLayer {
 		lanesControl = ric.createLanesControl(map, view);
 		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
 		
+		streetNameView = new MapInfoWidgetsFactory.TopTextView(map.getMyApplication(), map);
+		updateStreetName(calculateTextState());
+		
 		alarmControl = ric.createAlarmInfoControl(app, map);
 		// register left stack
 		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
@@ -168,24 +172,29 @@ public class MapInfoLayer extends OsmandMapLayer {
 			themeId = calcThemeId;
 			TextState ts = calculateTextState();
 //			lanesControl.setBackgroundDrawable(boxFree);
-			for(MapWidgetRegInfo reg :  mapInfoControls.getLeft()) {
+			for (MapWidgetRegInfo reg : mapInfoControls.getLeft()) {
 				updateReg(ts, reg);
 			}
-			for(MapWidgetRegInfo reg :  mapInfoControls.getRight()) {
+			for (MapWidgetRegInfo reg : mapInfoControls.getRight()) {
 				updateReg(ts, reg);
 			}
+			updateStreetName(ts);
 			this.expand.setBackgroundResource(ts.expand);
 			rightStack.invalidate();
 			leftStack.invalidate();
 		}
 	}
 
+	private void updateStreetName(TextState ts) {
+		streetNameView.setBackgroundResource(ts.boxTop);
+		streetNameView.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold);
+	}
+
 	private void updateReg(TextState ts, MapWidgetRegInfo reg) {
 		View v = reg.widget.getView().findViewById(R.id.widget_bg);
 		if(v != null) {
 			v.setBackgroundResource(reg.left ? ts.leftRes : ts.rightRes);
-			updateTextColor(v.findViewById(R.id.widget_text_small), ts);
-			updateTextColor(v.findViewById(R.id.widget_text), ts);
+			reg.widget.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold);
 		}
 	}
 
@@ -225,21 +234,15 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 	
 	
-	private void updateTextColor(View v, TextState ts) {
-		if(v instanceof TextView) {
-			TextView tv = (TextView) v;
-			tv.setTextColor(ts.textColor);
-			tv.setShadowLayer(ts.textShadowColor == 0 ? 0 : (8 * view.getScaleCoefficient()), 0, 0, ts.textShadowColor);
-			tv.setTypeface(Typeface.DEFAULT, ts.textBold ? Typeface.BOLD : Typeface.NORMAL);
-		}
-	}
+	
 
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings drawSettings) {
 		this.drawSettings = drawSettings;
 		// update data on draw
 		updateColorShadowsOfText();
-		mapInfoControls.updateInfo(settings.getApplicationMode(), drawSettings, expanded); 
+		mapInfoControls.updateInfo(settings.getApplicationMode(), drawSettings, expanded);
+		streetNameView.updateInfo(drawSettings);
 		// TODO
 //		lanesControl.updateInfo(drawSettings);
 //		alarmControl.updateInfo(drawSettings);
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
index 55b8c29db7..fbf5d84591 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
@@ -47,9 +47,6 @@ public class RulerControl  {
 		if (!mapActivity.getMyApplication().getSettings().SHOW_RULER.get()) {
 			return;
 		}
-		if (mapActivity.findViewById(R.id.MapButtons).getVisibility() == View.GONE) {
-			return;
-		}
 		OsmandMapTileView view = mapActivity.getMapView();
 		boolean isNight = nightMode == null ? false : nightMode.isNightMode();
 		// update cache
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java
index af9c535029..549ac3566e 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java
@@ -11,7 +11,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-public abstract class BaseMapWidget extends View implements UpdateableWidget {
+public abstract class BaseMapWidget extends View  {
 	int width = 0;
 	int height = 0;
 	Rect padding = new Rect();
@@ -82,7 +82,6 @@ public abstract class BaseMapWidget extends View implements UpdateableWidget {
 		canvas.clipRect(0, 0, getWWidth(),getWHeight());
 	}
 	
-	@Override
 	public boolean updateInfo(DrawSettings drawSettings) { return false; }
 	
 	protected boolean updateVisibility(boolean visible) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/ImageViewWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/ImageViewWidget.java
deleted file mode 100644
index b337e194df..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/ImageViewWidget.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.osmand.plus.views.mapwidgets;
-
-import android.content.Context;
-import android.widget.ImageView;
-
-public abstract class ImageViewWidget extends ImageView implements UpdateableWidget {
-
-	public ImageViewWidget(Context context) {
-		super(context);
-	}
-	
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 8c168e48d8..05750be1af 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -3,15 +3,20 @@ package net.osmand.plus.views.mapwidgets;
 import net.osmand.Location;
 import net.osmand.access.AccessibleToast;
 import net.osmand.binary.RouteDataObject;
+import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.NavigationService;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmAndLocationProvider.GPSInfo;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.actions.StartGPSStatus;
+import net.osmand.plus.helpers.WaypointDialogHelper;
+import net.osmand.plus.helpers.WaypointHelper;
+import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.monitoring.ValueHolder;
 import net.osmand.plus.routing.RouteDirectionInfo;
@@ -28,12 +33,14 @@ import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Typeface;
 import android.graphics.Paint.Align;
 import android.graphics.drawable.Drawable;
 import android.text.TextPaint;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -189,21 +196,22 @@ public class MapInfoWidgetsFactory {
 		final Drawable lockDisabledWhite = view.getResources().getDrawable(R.drawable.lock_disabled_white);
 		lockDisabled = lockDisabledNormal;
 		lockEnabled = lockEnabledNormal;
-		final ImageViewWidget lockView = new ImageViewWidget(view.getContext()) {
-			private boolean nightMode;
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
-				if(nightMode != this.nightMode) {
-					this.nightMode = nightMode;
-					lockDisabled = drawSettings.isNightMode() ? lockDisabledWhite : lockDisabledNormal;
-					lockEnabled = drawSettings.isNightMode() ? lockEnabledWhite : lockEnabledNormal;
-					setImageDrawable(isScreenLocked ? lockEnabled : lockDisabled);
-					return true;
-				}
-				return false;
-			}
-		};
+		final ImageView lockView = null;
+//		final ImageViewWidget lockView = new ImageViewWidget(view.getContext()) {
+//			private boolean nightMode;
+//			@Override
+//			public boolean updateInfo(DrawSettings drawSettings) {
+//				boolean nightMode = drawSettings == null ? false : drawSettings.isNightMode();
+//				if(nightMode != this.nightMode) {
+//					this.nightMode = nightMode;
+//					lockDisabled = drawSettings.isNightMode() ? lockDisabledWhite : lockDisabledNormal;
+//					lockEnabled = drawSettings.isNightMode() ? lockEnabledWhite : lockEnabledNormal;
+//					setImageDrawable(isScreenLocked ? lockEnabled : lockDisabled);
+//					return true;
+//				}
+//				return false;
+//			}
+//		};
 		
 		if (isScreenLocked) {
 			map.getMapViewTrackingUtilities().backToLocationImpl();
@@ -273,36 +281,58 @@ public class MapInfoWidgetsFactory {
 	}
 	
 	
-	public class TopTextView extends TextView implements UpdateableWidget {
+	public static class TopTextView   {
 		private final RoutingHelper routingHelper;
 		private final MapActivity map;
-		private int shadowColor = Color.WHITE;
+		private View topBar;
+		private TextView addressText;
 		private OsmAndLocationProvider locationProvider;
-		private Paint paintText;
+		private WaypointHelper waypointHelper;
+		private OsmandSettings settings;
+		private View waypointInfoBar;
+		private LocationPointWrapper lastPoint;
 
-		public TopTextView(OsmandApplication app, MapActivity map, Paint paintText) {
-			super(map);
-			this.paintText = paintText;
+		public TopTextView(OsmandApplication app, MapActivity map) {
+			topBar = map.findViewById(R.id.map_top_bar);
+			addressText = (TextView) map.findViewById(R.id.map_address_text);
+			waypointInfoBar = map.findViewById(R.id.waypoint_info_bar);
 			this.routingHelper = app.getRoutingHelper();
 			locationProvider = app.getLocationProvider();
 			this.map = map;
-			getPaint().setTextAlign(Align.CENTER);
-			setTextColor(Color.BLACK);
+			settings = app.getSettings();
+			waypointHelper = app.getWaypointHelper();
+			updateVisibility(false);
+		}
+		
+		public boolean updateVisibility(boolean visible) {
+			return updateVisibility(topBar, visible);
+		}
+		
+		public boolean updateVisibility(View v, boolean visible) {
+			if (visible != (v.getVisibility() == View.VISIBLE)) {
+				if (visible) {
+					v.setVisibility(View.VISIBLE);
+				} else {
+					v.setVisibility(View.GONE);
+				}
+				v.invalidate();
+				return true;
+			}
+			return false;
+		}
+		
+		public void updateTextColor(int textColor, int textShadowColor, boolean bold) {
+			updateTextColor(addressText, textColor, textShadowColor, bold);
+			updateTextColor((TextView) waypointInfoBar.findViewById(R.id.waypoint_text),
+					textColor, textShadowColor, bold);
+		}
+		
+		private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold) {
+			tv.setTextColor(textColor);
+			tv.setShadowLayer(textShadowColor == 0 ? 0 : 8, 0, 0, textShadowColor);
+			tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
 		}
 
-		@Override
-		protected void onDraw(Canvas canvas) {
-			getPaint().setColor(paintText.getColor());
-			getPaint().setFakeBoldText(paintText.isFakeBoldText());
-			ShadowText.draw(getText().toString(), canvas, getWidth() / 2, getHeight() - 4 * scaleCoefficient,
-					getPaint(), shadowColor);
-		}
-		
-		public void setShadowColor(int shadowColor) {
-			this.shadowColor = shadowColor;
-		}
-		
-		@Override
 		public boolean updateInfo(DrawSettings d) {
 			String text = null;
 			if (routingHelper != null && routingHelper.isRouteCalculated()) {
@@ -316,46 +346,66 @@ public class MapInfoWidgetsFactory {
 						text = "\u2566 " + RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
 					}
 				}
-			} else if(map.getMapViewTrackingUtilities().isMapLinkedToLocation()) {
+			} else if(settings.getApplicationMode() != ApplicationMode.DEFAULT &&
+					map.getMapViewTrackingUtilities().isMapLinkedToLocation()) {
 				RouteDataObject rt = locationProvider.getLastKnownRouteSegment(); 
 				if(rt != null) {
 					text = RoutingHelper.formatStreetName(rt.getName(), rt.getRef(), rt.getDestinationName());
 				}
 			}
-			if(text == null) {
-				text = "";
-			}
-			if (!text.equals(getText().toString())) {
-				TextPaint pp = new TextPaint(getPaint());
-				if (!text.equals("")) {
-					pp.setTextSize(20 * scaleCoefficient);
-					float ts = pp.measureText(text);
-					int wth = getWidth();
-					while (ts > wth && pp.getTextSize() > (16 * scaleCoefficient)) {
-						pp.setTextSize(pp.getTextSize() - 1);
-						ts = pp.measureText(text);
+			if(updateWaypoint()) {
+				updateVisibility(addressText, false);
+			} else if(text == null) {
+				updateVisibility(false);
+			} else {
+				updateVisibility(true);
+				updateVisibility(addressText, true);
+				if (!text.equals(addressText.getText().toString())) {
+					if (!text.equals("")) {
+						topBar.setContentDescription(text);
+					} else {
+						topBar.setContentDescription(map.getResources().getString(R.string.map_widget_top_text));
 					}
-					boolean dots = false;
-					while (ts > wth) {
-						dots = true;
-						ts = pp.measureText(text);
-						text = text.substring(0, text.length() - 2);
-					}
-					if (dots) {
-						text += "..";
-					}
-					setTextSize(TypedValue.COMPLEX_UNIT_PX, pp.getTextSize());
-					setContentDescription(text);
-				} else {
-					setTextSize(TypedValue.COMPLEX_UNIT_PX, 7);
-					setContentDescription(getResources().getString(R.string.map_widget_top_text));
+					addressText.setText(text);
+					return true;
 				}
-				setText(text);
-				invalidate();
-				return true;
 			}
 			return false;
 		}
+		
+		public boolean updateWaypoint() {
+			lastPoint = waypointHelper.getMostImportantLocationPoint(null);
+			if (lastPoint == null) {
+				updateVisibility(waypointInfoBar, false);
+				return false;
+			} else {
+				boolean updated = updateVisibility(waypointInfoBar, true);
+				WaypointDialogHelper.updatePointInfoView(map.getMyApplication(), map, waypointInfoBar, 
+						lastPoint, null);
+				if (updated) {
+					View all = waypointInfoBar.findViewById(R.id.waypoint_more);
+					View btnN = waypointInfoBar.findViewById(R.id.waypoint_close);
+					all.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View view) {
+							map.getMapActions().showWaypointsInDrawer(false);
+						}
+					});
+					btnN.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View view) {
+							waypointHelper.removeVisibleLocationPoint(lastPoint);
+							map.refreshMap();
+						}
+					});
+				}
+				return true;
+			}
+		}
+
+		public void setBackgroundResource(int boxTop) {
+			topBar.setBackgroundResource(boxTop);
+		}
 
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index ab7bda479b..bfa7024380 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -40,9 +40,12 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 		turnDrawable = new TurnDrawable(activity);
 		if(horisontalMini) {
 			setImageDrawable(turnDrawable);
+			setTopImageDrawable(null);
 		} else {
 			setTopImageDrawable(turnDrawable);
+			setImageDrawable(null);
 		}
+		updateVisibility(false);
 	}
 	
 	public TurnType getTurnType() {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index 0a6956aa0d..01bd6aa6e0 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -3,6 +3,7 @@ package net.osmand.plus.views.mapwidgets;
 import net.osmand.plus.R;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import android.app.Activity;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -137,6 +138,17 @@ public class TextInfoWidget  {
 		return explicitlyVisible;
 	}
 
+	public void updateTextColor(int textColor, int textShadowColor, boolean bold) {
+		updateTextColor(smallTextView, textColor, textShadowColor, bold);
+		updateTextColor(textView, textColor, textShadowColor, bold);
+	}
+	
+	private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold) {
+		tv.setTextColor(textColor);
+		tv.setShadowLayer(textShadowColor == 0 ? 0 : 8, 0, 0, textShadowColor);
+		tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
+	}
+
 	
 	
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/UpdateableWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/UpdateableWidget.java
deleted file mode 100644
index 1b099c90e4..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/UpdateableWidget.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.osmand.plus.views.mapwidgets;
-
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-
-
-public interface UpdateableWidget  {
-
-	public boolean updateInfo(DrawSettings drawSettings);
-	
-
-}
\ No newline at end of file

From bd179ac81c4f79ceaad1525d13c9c584c46a7d15 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 14:25:07 +0100
Subject: [PATCH 19/23] Update text

---
 OsmAnd/res/layout/map_hud_top.xml             |  4 +--
 .../osmand/plus/routing/RoutingHelper.java    | 10 +++++--
 .../osmand/plus/views/OsmandMapTileView.java  |  2 +-
 .../mapwidgets/MapInfoWidgetsFactory.java     | 28 +++++++++++--------
 .../views/mapwidgets/NextTurnInfoWidget.java  | 18 ++++++------
 .../plus/views/mapwidgets/TextInfoWidget.java | 17 ++++++++---
 6 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 65827f38a6..f44133179c 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -20,8 +20,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:ellipsize="end"
+            android:layout_gravity="center_vertical"
             android:gravity="center"
-             
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
             android:shadowRadius="10"
@@ -74,7 +74,7 @@
                 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_remove_light" />
+                android:src="@drawable/ic_overflow_menu_white" />
 
             <ImageButton
                 android:id="@+id/waypoint_close"
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 2eb798bcf5..3147ed5956 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -23,6 +23,7 @@ import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RouteSegmentResult;
+import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -660,7 +661,7 @@ public class RoutingHelper {
 		return false;
 	}
 	
-	public synchronized String getCurrentName(){
+	public synchronized String getCurrentName(TurnType[] next){
 		NextDirectionInfo n = getNextRouteDirectionInfo(new NextDirectionInfo(), false);
 		Location l = lastFixedLocation;
 		float speed = 0;
@@ -672,14 +673,17 @@ public class RoutingHelper {
 			String nm = n.directionInfo.getStreetName();
 			String rf = n.directionInfo.getRef();
 			String dn = n.directionInfo.getDestinationName();
-			return "\u2566 " + formatStreetName(nm, rf, dn);
+			if(next != null) {
+				next[0] = n.directionInfo.getTurnType();
+			}
+			return formatStreetName(nm, rf, dn);
 		}
 		RouteSegmentResult rs = getCurrentSegmentResult();
 		if(rs != null) {
 			String nm = rs.getObject().getName();
 			String rf = rs.getObject().getRef();
 			String dn = rs.getObject().getDestinationName();
-			return "\u21E7 " + formatStreetName(nm, rf, dn);
+			return formatStreetName(nm, rf, dn);
 		}
 		return null;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
index 4a904229d6..4a574b2170 100644
--- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
+++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
@@ -217,7 +217,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		LatLon ll = settings.getLastKnownMapLocation();
 		currentViewport = new RotatedTileBox.RotatedTileBoxBuilder().
 				setLocation(ll.getLatitude(), ll.getLongitude()).setZoom(settings.getLastKnownMapZoom()).
-				setPixelDimensions(100, 100).build();
+				setPixelDimensions(400, 700).build();
 		currentViewport.setDensity(dm.density);
 		currentViewport.setMapDensity(getSettingsMapDensity());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 05750be1af..d574b4d8ce 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -23,24 +23,18 @@ import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.ShadowText;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
+import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget.TurnDrawable;
+import net.osmand.router.TurnType;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
 import android.graphics.Typeface;
-import android.graphics.Paint.Align;
 import android.graphics.drawable.Drawable;
-import android.text.TextPaint;
 import android.util.DisplayMetrics;
-import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -291,6 +285,7 @@ public class MapInfoWidgetsFactory {
 		private OsmandSettings settings;
 		private View waypointInfoBar;
 		private LocationPointWrapper lastPoint;
+		private TurnDrawable turnDrawable;
 
 		public TopTextView(OsmandApplication app, MapActivity map) {
 			topBar = map.findViewById(R.id.map_top_bar);
@@ -302,6 +297,7 @@ public class MapInfoWidgetsFactory {
 			settings = app.getSettings();
 			waypointHelper = app.getWaypointHelper();
 			updateVisibility(false);
+			turnDrawable = new NextTurnInfoWidget.TurnDrawable(map);
 		}
 		
 		public boolean updateVisibility(boolean visible) {
@@ -335,15 +331,17 @@ public class MapInfoWidgetsFactory {
 
 		public boolean updateInfo(DrawSettings d) {
 			String text = null;
+			TurnType[] type = new TurnType[1];
 			if (routingHelper != null && routingHelper.isRouteCalculated()) {
 				if (routingHelper.isFollowingMode()) {
-					text = routingHelper.getCurrentName();
+					text = routingHelper.getCurrentName(type);
 				} else {
 					int di = MapRouteInfoControl.getDirectionInfo();
 					if (di >= 0 && MapRouteInfoControl.isControlVisible() &&
 							di < routingHelper.getRouteDirections().size()) {
 						RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
-						text = "\u2566 " + RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
+						type[0] = next.getTurnType();
+						text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
 					}
 				}
 			} else if(settings.getApplicationMode() != ApplicationMode.DEFAULT &&
@@ -360,6 +358,14 @@ public class MapInfoWidgetsFactory {
 			} else {
 				updateVisibility(true);
 				updateVisibility(addressText, true);
+				boolean update = turnDrawable.setTurnType(type[0]);
+				if (update) {
+					if (type[0] != null) {
+						addressText.setCompoundDrawables(turnDrawable, null, null, null);
+					} else {
+						addressText.setCompoundDrawables(null, null, null, null);
+					}
+				}
 				if (!text.equals(addressText.getText().toString())) {
 					if (!text.equals("")) {
 						topBar.setContentDescription(text);
@@ -388,7 +394,7 @@ public class MapInfoWidgetsFactory {
 					all.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View view) {
-							map.getMapActions().showWaypointsInDrawer(false);
+							map.getMapActions().showWaypointsDialog(false);
 						}
 					});
 					btnN.setOnClickListener(new View.OnClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index bfa7024380..b11e72ffb6 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -39,11 +39,11 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 		this.horisontalMini = horisontalMini;
 		turnDrawable = new TurnDrawable(activity);
 		if(horisontalMini) {
-			setImageDrawable(turnDrawable);
-			setTopImageDrawable(null);
+			setImageDrawable(turnDrawable, false);
+			setTopImageDrawable(null, true);
 		} else {
-			setTopImageDrawable(turnDrawable);
-			setImageDrawable(null);
+			setImageDrawable(null, false);
+			setTopImageDrawable(turnDrawable, true);
 		}
 		updateVisibility(false);
 	}
@@ -86,9 +86,9 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 		String ds = OsmAndFormatter.getFormattedDistance(deviatePath, app);
 		int ls = ds.lastIndexOf(' ');
 		if (ls == -1) {
-			setText(ds, null);
+			setTextNoUpdateVisibility(ds, null);
 		} else {
-			setText(ds.substring(0, ls), ds.substring(ls + 1));
+			setTextNoUpdateVisibility(ds.substring(0, ls), ds.substring(ls + 1));
 		}
 	}
 	
@@ -177,12 +177,14 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 			return 0;
 		}
 
-		public void setTurnType(TurnType turnType) {
+		public boolean setTurnType(TurnType turnType) {
 			this.turnType = turnType;
-			if(turnType != null) {
+			if(turnType != this.turnType) {
 				TurnPathHelper.calcTurnPath(pathForTurn, turnType, null);
 				onBoundsChange(getBounds());
+				return true;
 			}
+			return false;
 		}
 		
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index 01bd6aa6e0..1a136efcc4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -36,21 +36,26 @@ public class TextInfoWidget  {
 	}
 	
 	public void setImageDrawable(Drawable imageDrawable) {
+		setImageDrawable(imageDrawable, false);
+	}
+	
+	
+	public void setImageDrawable(Drawable imageDrawable, boolean gone) {
 		if(imageDrawable != null) {
 			imageView.setImageDrawable(imageDrawable);
 			imageView.setVisibility(View.VISIBLE);
 		} else {
-			imageView.setVisibility(View.INVISIBLE);
+			imageView.setVisibility(gone ? View.GONE : View.INVISIBLE);
 		}
 		imageView.invalidate();
 	}
 	
-	public void setTopImageDrawable(Drawable imageDrawable) {
+	public void setTopImageDrawable(Drawable imageDrawable, boolean gone) {
 		if(imageDrawable != null) {
 			topImageView.setImageDrawable(imageDrawable);
 			topImageView.setVisibility(View.VISIBLE);
 		} else {
-			topImageView.setVisibility(View.INVISIBLE);
+			topImageView.setVisibility(gone ? View.GONE : View.INVISIBLE);
 		}
 		topImageView.invalidate();
 	}
@@ -80,6 +85,11 @@ public class TextInfoWidget  {
 	}
 	
 	public void setText(String text, String subtext) {
+		setTextNoUpdateVisibility(text, subtext);
+		updateVisibility(text != null);
+	}
+
+	protected void setTextNoUpdateVisibility(String text, String subtext) {
 		if (text != null) {
 			if (subtext != null) {
 				setContentDescription(text + " " + subtext); //$NON-NLS-1$
@@ -102,7 +112,6 @@ public class TextInfoWidget  {
 		} else {
 			smallTextView.setText(subtext);
 		}
-		updateVisibility(text != null);
 	}
 	
 	protected boolean updateVisibility(boolean visible) {

From 7fd1d625a27d38b71109b0b69a24f7f8811d53c4 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 16:19:19 +0100
Subject: [PATCH 20/23] Update icons

---
 OsmAnd/res/layout/map_hud_top.xml             | 23 +++++++++--------
 OsmAnd/res/layout/map_hud_widget.xml          |  2 +-
 OsmAnd/res/values/sizes.xml                   |  2 ++
 .../src/net/osmand/plus/AppInitializer.java   | 11 ++++----
 .../osmand/plus/activities/MapActivity.java   |  2 +-
 .../development/DashSimulateFragment.java     |  7 ++++--
 .../development/OsmandDevelopmentPlugin.java  |  2 +-
 .../DistanceCalculatorPlugin.java             |  2 +-
 .../monitoring/OsmandMonitoringPlugin.java    |  2 +-
 .../src/net/osmand/plus/osmo/OsMoPlugin.java  |  2 +-
 .../parkingpoint/ParkingPositionPlugin.java   |  2 +-
 .../plus/resources/ResourceManager.java       | 13 ++++++++++
 .../RoutePointsPlugin.java                    |  2 +-
 .../osmand/plus/routing/RoutingHelper.java    |  3 +--
 .../net/osmand/plus/views/MapInfoLayer.java   | 12 ++++-----
 .../mapwidgets/MapInfoWidgetsFactory.java     | 25 ++++++++++++-------
 .../views/mapwidgets/MapWidgetRegistry.java   |  2 +-
 .../views/mapwidgets/NextTurnInfoWidget.java  | 15 +++++------
 .../mapwidgets/RouteInfoWidgetsFactory.java   | 12 ++++-----
 .../plus/views/mapwidgets/TextInfoWidget.java |  4 ---
 20 files changed, 84 insertions(+), 61 deletions(-)

diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index f44133179c..d5e26d7ddc 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -6,21 +6,20 @@
 
     <!-- TOP ROW -->
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/map_top_bar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/btn_flat"
-        android:minHeight="@dimen/map_address_height"
-        android:orientation="horizontal" >
+        android:minHeight="@dimen/map_address_height">
 
+        <!-- android:layout_weight="1" to show properly next turn -->
         <TextView
             android:id="@+id/map_address_text"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:ellipsize="end"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="center"
             android:gravity="center"
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
@@ -35,8 +34,7 @@
             android:id="@+id/waypoint_info_bar"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone" >
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/waypoint_icon"
@@ -83,7 +81,7 @@
                 android:background="@drawable/btn_circle_transparent"
                 android:src="@drawable/ic_action_remove_light" />
         </LinearLayout>
-    </LinearLayout>
+    </FrameLayout>
     <!-- Widgets -->
 
     <FrameLayout
@@ -156,15 +154,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|center"
+            android:layout_marginTop="@dimen/map_button_margin"
             android:background="@drawable/btn_round"
             android:orientation="vertical" >
 
             <ProgressBar
                 android:id="@+id/map_horizontal_progress"
-                android:layout_width="100dp"
+                android:layout_width="@dimen/map_routing_progress_width"
+                android:layout_marginLeft="@dimen/map_button_margin"
+                android:layout_marginRight="@dimen/map_button_margin"
                 android:layout_height="wrap_content"
                 android:max="100"
                 android:progress="60"
+                
+                style="?android:attr/progressBarStyleHorizontal" 
                 android:visibility="gone" />
         </LinearLayout>
         <!-- RIGHT widgets colon -->
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 804fa27f7e..164da76524 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -35,7 +35,7 @@
             android:layout_gravity="bottom"
             android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
             android:layout_weight="1"
-            android:minWidth="30dp"
+            android:minWidth="10dp"
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
             android:textColor="@color/color_black"
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 228d1d8086..30d76865bc 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -65,6 +65,8 @@
 	<dimen name="map_widget_image">80dp</dimen>
 	<dimen name="map_button_spacing">15dp</dimen>
 	<dimen name="map_button_margin">4dp</dimen>
+	<dimen name="map_routing_progress_width">100dp</dimen>
+	
 	<dimen name="map_button_shadow_margin">2dp</dimen>
 	<dimen name="map_button_inset">4dp</dimen>
 	<dimen name="map_button_rect_rad">3dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index ea7948489f..8cab8af5f0 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -231,17 +231,18 @@ public class AppInitializer implements IProgress {
 	}
 	
 	
-	private void indexRegionsBoundaries(boolean overwrite) {
+	private void indexRegionsBoundaries(List<String> warnings) {
 		try {
 			File file = app.getAppPath("regions.ocbf");
 			if (file != null) {
-				if (!file.exists() || overwrite) {
+				if (!file.exists()) {
 					Algorithms.streamCopy(OsmandRegions.class.getResourceAsStream("regions.ocbf"),
 							new FileOutputStream(file));
 				}
+				app.regions.prepareFile(file.getAbsolutePath());
 			}
-			app.regions.prepareFile(file.getAbsolutePath());
-		} catch (IOException e) {
+		} catch (Exception e) {
+			warnings.add(e.getMessage());
 			LOG.error(e.getMessage(), e);
 		}
 	}
@@ -392,7 +393,7 @@ public class AppInitializer implements IProgress {
 			
 			app.poiFilters.reloadAllPoiFilters();
 			notifyEvent(InitEvents.POI_TYPES_INITIALIZED);			
-			indexRegionsBoundaries(false);
+			indexRegionsBoundaries(warnings);
 			notifyEvent(InitEvents.INDEX_REGION_BOUNDARIES);
 			app.selectedGpxHelper.loadGPXTracks(this);
 			notifyEvent(InitEvents.LOAD_GPX_TRACKS);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 4384f5f6a6..27118c5fb3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -262,7 +262,7 @@ public class MapActivity extends AccessibleActivity {
 			public void updateProgress(int progress) {
 				pb.setVisibility(View.VISIBLE);
 				pb.setProgress(progress);
-
+				pb.requestLayout();
 			}
 
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/development/DashSimulateFragment.java b/OsmAnd/src/net/osmand/plus/development/DashSimulateFragment.java
index c9508e6850..9dab5cb57b 100644
--- a/OsmAnd/src/net/osmand/plus/development/DashSimulateFragment.java
+++ b/OsmAnd/src/net/osmand/plus/development/DashSimulateFragment.java
@@ -10,6 +10,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -45,7 +46,7 @@ public class DashSimulateFragment extends DashBaseFragment  {
 		View item = inflater.inflate(R.layout.dash_simulate_item, null, false);
 		tracks.addView(item);
 		final OsmAndLocationProvider loc = getMyApplication().getLocationProvider();
-		((ImageButton) item.findViewById(R.id.stop)).setOnClickListener(new View.OnClickListener() {
+		OnClickListener listener = new View.OnClickListener() {
 			
 			@Override
 			public void onClick(View v) {
@@ -54,7 +55,9 @@ public class DashSimulateFragment extends DashBaseFragment  {
 					dashboard.setDashboardVisibility(false);
 				}
 			}
-		});
+		};
+		item.setOnClickListener(listener);
+		((ImageButton) item.findViewById(R.id.stop)).setOnClickListener(listener);
 		((TextView) item.findViewById(R.id.name)).setText(R.string.animate_route);
 		item.findViewById(R.id.divider).setVisibility(View.VISIBLE);
 
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index 1e3b96839b..062dc39125 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -65,7 +65,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 					return true;
 				}
 			};
-			mapInfoLayer.getMapInfoControls().registerSideWidget(fps, R.drawable.widget_no_icon, R.drawable.widget_no_icon,
+			mapInfoLayer.registerSideWidget(fps, R.drawable.widget_no_icon, R.drawable.widget_no_icon,
 					R.string.map_widget_fps_info, "fps", false, 30);
 			mapInfoLayer.recreateControls();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
index 3de17feeec..0eb05e07c3 100644
--- a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
@@ -117,7 +117,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null ) {
 			distanceControl = createDistanceControl(activity);
-			mapInfoLayer.getMapInfoControls().registerSideWidget(distanceControl,
+			mapInfoLayer.registerSideWidget(distanceControl,
 					R.drawable.widget_distance, R.drawable.widget_distance, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21);
 			mapInfoLayer.recreateControls();
 			updateText();
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
index 7af8cbeebc..80fcaae782 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
@@ -99,7 +99,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		MapInfoLayer layer = activity.getMapLayers().getMapInfoLayer();
 		monitoringControl = createMonitoringControl(activity);
 		
-		layer.getMapInfoControls().registerSideWidget(monitoringControl,
+		layer.registerSideWidget(monitoringControl,
 				R.drawable.monitoring_rec_big, R.drawable.monitoring_rec_big, R.string.map_widget_monitoring, "monitoring", false, 18);
 		layer.recreateControls();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index d10ca0454a..40cfb9b56f 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -174,7 +174,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 		super.registerLayers(activity);
 		MapInfoLayer layer = activity.getMapLayers().getMapInfoLayer();
 		osmoControl = createOsMoControl(activity);
-		layer.getMapInfoControls().registerSideWidget(osmoControl,
+		layer.registerSideWidget(osmoControl,
 				R.drawable.mon_osmo_signal_inactive, R.drawable.mon_osmo_signal_inactive, R.string.osmo_control, "osmo_control", false, 18);
 		layer.recreateControls();
 		
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index bdc556a6e1..70188ef40c 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -190,7 +190,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null) {
 			parkingPlaceControl = createParkingPlaceInfoControl(activity);
-			mapInfoLayer.getMapInfoControls().registerSideWidget(parkingPlaceControl,
+			mapInfoLayer.registerSideWidget(parkingPlaceControl,
 					R.drawable.widget_parking, R.drawable.widget_parking, R.string.map_widget_parking, "parking", false, 8);
 			mapInfoLayer.recreateControls();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
index 40c56bac8a..ada8c62d1b 100644
--- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
@@ -467,6 +467,7 @@ public class ResourceManager {
 					unpackBundledAssets(assetManager, applicationDataDir, progress, isFirstInstall);
 					context.getSettings().PREVIOUS_INSTALLED_VERSION.set(Version.getFullVersion(context));
 					context.getPoiFilters().updateFilters(false);
+					copyRegionsBoundaries();
 				} catch (SQLiteException e) {
 					log.error(e.getMessage(), e);
 				} catch (IOException e) {
@@ -478,6 +479,18 @@ public class ResourceManager {
 		}
 		return Collections.emptyList();
 	}
+	
+	private void copyRegionsBoundaries() {
+		try {
+			File file = context.getAppPath("regions.ocbf");
+			if (file != null) {
+				Algorithms.streamCopy(OsmandRegions.class.getResourceAsStream("regions.ocbf"), new FileOutputStream(
+						file));
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
 
 	private final static String ASSET_INSTALL_MODE__alwaysCopyOnFirstInstall = "alwaysCopyOnFirstInstall";
 	private final static String ASSET_COPY_MODE__overwriteOnlyIfExists = "overwriteOnlyIfExists";
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
index c0ab056f56..546f43f8ae 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
@@ -200,7 +200,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 		MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer();
 		if (mapInfoLayer != null) {
 			routeStepsControl = createRouteStepsInfoControl(activity);
-			mapInfoLayer.getMapInfoControls().registerSideWidget(routeStepsControl,
+			mapInfoLayer.registerSideWidget(routeStepsControl,
 					R.drawable.widget_signpost, R.drawable.widget_signpost, R.string.map_widget_route_points, "route_steps", false, 8);
 			mapInfoLayer.recreateControls();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 3147ed5956..64954f6d8a 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -20,7 +20,6 @@ import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
 import net.osmand.plus.routing.RouteProvider.RouteService;
-import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RouteSegmentResult;
 import net.osmand.router.TurnType;
@@ -826,7 +825,7 @@ public class RoutingHelper {
 			params.type = settings.ROUTER_SERVICE.getModeValue(mode);
 			params.mode = mode;
 			params.ctx = app;
-			if (previousRoute == null && params.type == RouteService.OSMAND) {
+			if (params.type == RouteService.OSMAND) {
 				params.calculationProgress = new RouteCalculationProgress();
 				updateProgress(params.calculationProgress);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index cc286bdea1..864af7ef0b 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -85,13 +85,13 @@ public class MapInfoLayer extends OsmandMapLayer {
 	
 	public void registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
 			int messageId, String key, boolean left, int priorityOrder) {
-		MapWidgetRegInfo reg = mapInfoControls.registerSideWidget(widget, drawableDark, drawableLight, messageId, key, left, priorityOrder);
+		MapWidgetRegInfo reg = mapInfoControls.registerSideWidgetInternal(widget, drawableDark, drawableLight, messageId, key, left, priorityOrder);
 		updateReg(calculateTextState(), reg);
 	}
 	
 	public void registerAllControls(){
-		RouteInfoWidgetsFactory ric = new RouteInfoWidgetsFactory(view.getScaleCoefficient());
-		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory(view.getScaleCoefficient());
+		RouteInfoWidgetsFactory ric = new RouteInfoWidgetsFactory();
+		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory();
 		OsmandApplication app = view.getApplication();
 		lanesControl = ric.createLanesControl(map, view);
 		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
@@ -102,12 +102,12 @@ public class MapInfoLayer extends OsmandMapLayer {
 		alarmControl = ric.createAlarmInfoControl(app, map);
 		// register left stack
 		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
-		mapInfoControls.registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
+		registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
 		NextTurnInfoWidget smallInfoControl = ric.createNextInfoControl(map, app, true);
-		mapInfoControls.registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
+		registerSideWidget(smallInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn_small, "next_turn_small", true,
 				10);
 		NextTurnInfoWidget nextNextInfoControl = ric.createNextNextInfoControl(map, app, true);
-		mapInfoControls.registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
+		registerSideWidget(nextNextInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_next_turn, "next_next_turn",true, 15);
 		// right stack
 		TextInfoWidget intermediateDist = ric.createIntermediateDistanceControl(map);
 		registerSideWidget(intermediateDist, R.drawable.widget_intermediate, R.drawable.widget_intermediate, R.string.map_widget_intermediate_distance, "intermediate_distance", false, 3);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index d574b4d8ce..c1b9e1b3e8 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -47,12 +47,6 @@ import android.widget.Toast;
 
 public class MapInfoWidgetsFactory {
 	
-	private float scaleCoefficient;
-
-	public MapInfoWidgetsFactory(float scaleCoefficient){
-		this.scaleCoefficient = scaleCoefficient;
-	}
-
 	public TextInfoWidget createAltitudeControl(final MapActivity map) {
 		final TextInfoWidget altitudeControl = new TextInfoWidget(map) {
 			private int cachedAlt = 0;
@@ -332,6 +326,7 @@ public class MapInfoWidgetsFactory {
 		public boolean updateInfo(DrawSettings d) {
 			String text = null;
 			TurnType[] type = new TurnType[1];
+			boolean showNextTurn = false;
 			if (routingHelper != null && routingHelper.isRouteCalculated()) {
 				if (routingHelper.isFollowingMode()) {
 					text = routingHelper.getCurrentName(type);
@@ -339,6 +334,7 @@ public class MapInfoWidgetsFactory {
 					int di = MapRouteInfoControl.getDirectionInfo();
 					if (di >= 0 && MapRouteInfoControl.isControlVisible() &&
 							di < routingHelper.getRouteDirections().size()) {
+						showNextTurn = true;
 						RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
 						type[0] = next.getTurnType();
 						text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
@@ -351,14 +347,20 @@ public class MapInfoWidgetsFactory {
 					text = RoutingHelper.formatStreetName(rt.getName(), rt.getRef(), rt.getDestinationName());
 				}
 			}
-			if(updateWaypoint()) {
+			if(!showNextTurn && updateWaypoint()) {
+				updateVisibility(true);
 				updateVisibility(addressText, false);
 			} else if(text == null) {
 				updateVisibility(false);
 			} else {
 				updateVisibility(true);
+				updateVisibility(waypointInfoBar, false);
 				updateVisibility(addressText, true);
 				boolean update = turnDrawable.setTurnType(type[0]);
+				int h = addressText.getHeight() / 4 * 3;
+				if (h != turnDrawable.getBounds().bottom) {
+					turnDrawable.setBounds(0, 0, h, h);
+				}
 				if (update) {
 					if (type[0] != null) {
 						addressText.setCompoundDrawables(turnDrawable, null, null, null);
@@ -382,15 +384,20 @@ public class MapInfoWidgetsFactory {
 		public boolean updateWaypoint() {
 			lastPoint = waypointHelper.getMostImportantLocationPoint(null);
 			if (lastPoint == null) {
+				topBar.setOnClickListener(null);
 				updateVisibility(waypointInfoBar, false);
 				return false;
 			} else {
+				updateVisibility(addressText, false);
 				boolean updated = updateVisibility(waypointInfoBar, true);
-				WaypointDialogHelper.updatePointInfoView(map.getMyApplication(), map, waypointInfoBar, 
+				// pass top bar to make it clickable
+				WaypointDialogHelper.updatePointInfoView(map.getMyApplication(), map, topBar, 
 						lastPoint, null);
 				if (updated) {
-					View all = waypointInfoBar.findViewById(R.id.waypoint_more);
+					ImageView all = (ImageView) waypointInfoBar.findViewById(R.id.waypoint_more);
 					View btnN = waypointInfoBar.findViewById(R.id.waypoint_close);
+					all.setImageDrawable(map.getMyApplication().getIconsCache().
+							getContentIcon(R.drawable.ic_overflow_menu_light));
 					all.setOnClickListener(new View.OnClickListener() {
 						@Override
 						public void onClick(View view) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index c0faa9b61a..e304f3d59f 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -89,7 +89,7 @@ public class MapWidgetRegistry {
 			}
 		}
 	}
-	public MapWidgetRegInfo registerSideWidget(TextInfoWidget widget, int drawableDark,int drawableLight, 
+	public MapWidgetRegInfo registerSideWidgetInternal(TextInfoWidget widget, int drawableDark,int drawableLight, 
 			int messageId, String key, boolean left, int priorityOrder) {
 		MapWidgetRegInfo ii = new MapWidgetRegInfo(key, widget, drawableDark, drawableLight, 
 				messageId, priorityOrder, left);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index b11e72ffb6..85376cfe71 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -6,7 +6,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.TurnPathHelper;
 import net.osmand.router.TurnType;
-import net.osmand.util.Algorithms;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
@@ -32,8 +31,7 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 	private OsmandApplication app;
 	
 
-	public NextTurnInfoWidget(Activity activity, OsmandApplication app, boolean horisontalMini,
-			float scaleCoefficient) {
+	public NextTurnInfoWidget(Activity activity, OsmandApplication app, boolean horisontalMini) {
 		super(activity);
 		this.app = app;
 		this.horisontalMini = horisontalMini;
@@ -53,9 +51,12 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 	}
 	
 	public void setTurnType(TurnType turnType) {
-		if (!Algorithms.objectEquals(getTurnType(), turnType)) {
-			turnDrawable.setTurnType(turnType);
-			invalidateImageViews();
+		if (turnDrawable.setTurnType(turnType)) {
+			if(horisontalMini) {
+				setImageDrawable(turnDrawable, false);
+			} else {
+				setTopImageDrawable(turnDrawable, true);
+			}
 		}
 		updateVisibility(turnType != null);
 	}
@@ -178,8 +179,8 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 		}
 
 		public boolean setTurnType(TurnType turnType) {
-			this.turnType = turnType;
 			if(turnType != this.turnType) {
+				this.turnType = turnType;
 				TurnPathHelper.calcTurnPath(pathForTurn, turnType, null);
 				onBoundsChange(getBounds());
 				return true;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 3a0b9d2df3..8f9de55fe7 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -47,17 +47,15 @@ import android.text.format.DateFormat;
 import android.view.View;
 
 public class RouteInfoWidgetsFactory {
-	private final float scaleCoefficient ;
-	
-	public RouteInfoWidgetsFactory(float scaleCoefficient){
-		this.scaleCoefficient = scaleCoefficient;
-	}
+
+	// TODO
+	private float scaleCoefficient = 1;
 	
 	public NextTurnInfoWidget createNextInfoControl(final Activity activity,
 			final OsmandApplication app, boolean horisontalMini) {
 		final OsmandSettings settings = app.getSettings();
 		final RoutingHelper routingHelper = app.getRoutingHelper();
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini, scaleCoefficient) {
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
 
 			@Override
@@ -123,7 +121,7 @@ public class RouteInfoWidgetsFactory {
 	public NextTurnInfoWidget createNextNextInfoControl(final Activity activity,
 			final OsmandApplication app, boolean horisontalMini) {
 		final RoutingHelper routingHelper = app.getRoutingHelper();
-		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini, scaleCoefficient) {
+		final NextTurnInfoWidget nextTurnInfo = new NextTurnInfoWidget(activity, app, horisontalMini) {
 			NextDirectionInfo calc1 = new NextDirectionInfo();
 			@Override
 			public boolean updateInfo(DrawSettings drawSettings) {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index 1a136efcc4..dbd8efd0f9 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -60,10 +60,6 @@ public class TextInfoWidget  {
 		topImageView.invalidate();
 	}
 	
-	protected void invalidateImageViews() {
-		topImageView.invalidate();
-		imageView.invalidate();
-	}
 	
 	
 	

From fb55113c38d86181f8b616a3cdc6f323bd52b7b7 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 16:35:17 +0100
Subject: [PATCH 21/23] Update icons

---
 OsmAnd/res/layout/main.xml                                    | 1 +
 OsmAnd/res/layout/map_hud_widget.xml                          | 2 --
 .../osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java   | 4 ++++
 .../net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java  | 3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index e9838a62bc..59fe2bf38a 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -22,6 +22,7 @@
             android:id="@+id/MapView"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
+            android:background="@drawable/btn_flat"
             android:contentDescription="@string/shared_string_map"
             android:visibility="gone" />
 
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 164da76524..03aba49dd5 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -40,7 +40,6 @@
             android:shadowColor="@color/color_myloc_distance"
             android:textColor="@color/color_black"
             android:shadowRadius="10"
-            android:textStyle="bold"
             android:textSize="@dimen/map_widget_text_size"
             android:text="1048" />
         <TextView
@@ -55,7 +54,6 @@
             android:shadowColor="@color/color_myloc_distance"
             android:textColor="@color/color_black"
             android:shadowRadius="10"
-            android:textStyle="bold"
             android:textSize="@dimen/map_widget_text_size_small"
             android:text="km" />
     </LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index c1b9e1b3e8..5bd245d69e 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -338,6 +338,10 @@ public class MapInfoWidgetsFactory {
 						RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
 						type[0] = next.getTurnType();
 						text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
+						if(next.distance > 0) {
+							text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
+						}
+						
 					}
 				}
 			} else if(settings.getApplicationMode() != ApplicationMode.DEFAULT &&
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
index 85376cfe71..0d94feeab5 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@@ -43,7 +43,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 			setImageDrawable(null, false);
 			setTopImageDrawable(turnDrawable, true);
 		}
-		updateVisibility(false);
 	}
 	
 	public TurnType getTurnType() {
@@ -51,6 +50,7 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 	}
 	
 	public void setTurnType(TurnType turnType) {
+		updateVisibility(turnType != null);
 		if (turnDrawable.setTurnType(turnType)) {
 			if(horisontalMini) {
 				setImageDrawable(turnDrawable, false);
@@ -58,7 +58,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 				setTopImageDrawable(turnDrawable, true);
 			}
 		}
-		updateVisibility(turnType != null);
 	}
 	
 	public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) {

From 14d772a21402966c7084d297af805bff7ae37d11 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 20:29:26 +0100
Subject: [PATCH 22/23] Add warnings and ruler control

---
 OsmAnd/res/drawable-hdpi/warnings_limit.png   | Bin 0 -> 7561 bytes
 OsmAnd/res/drawable-mdpi/warnings_limit.png   | Bin 0 -> 4716 bytes
 OsmAnd/res/drawable-xhdpi/warnings_limit.png  | Bin 0 -> 9552 bytes
 OsmAnd/res/drawable-xxhdpi/warnings_limit.png | Bin 0 -> 15259 bytes
 OsmAnd/res/layout/main.xml                    |   1 -
 OsmAnd/res/layout/map_hud_bottom.xml          |  49 ++-
 OsmAnd/res/values/sizes.xml                   |   4 +
 .../src/net/osmand/plus/OsmAndFormatter.java  |   5 +-
 .../osmand/plus/views/MapControlsLayer.java   |   8 +-
 .../net/osmand/plus/views/MapInfoLayer.java   |  28 +-
 .../plus/views/controls/RulerControl.java     |  97 -----
 .../mapwidgets/MapInfoWidgetsFactory.java     |  10 +-
 .../views/mapwidgets/MapWidgetRegistry.java   |   4 +-
 .../mapwidgets/RouteInfoWidgetsFactory.java   | 338 ++++++++++--------
 .../plus/views/mapwidgets/TextInfoWidget.java |  10 +-
 15 files changed, 283 insertions(+), 271 deletions(-)
 create mode 100755 OsmAnd/res/drawable-hdpi/warnings_limit.png
 create mode 100755 OsmAnd/res/drawable-mdpi/warnings_limit.png
 create mode 100755 OsmAnd/res/drawable-xhdpi/warnings_limit.png
 create mode 100755 OsmAnd/res/drawable-xxhdpi/warnings_limit.png
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java

diff --git a/OsmAnd/res/drawable-hdpi/warnings_limit.png b/OsmAnd/res/drawable-hdpi/warnings_limit.png
new file mode 100755
index 0000000000000000000000000000000000000000..c8db2c42f66ca64c12f47e05566ade4130877f75
GIT binary patch
literal 7561
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
aBmm&_5sAyn*WN!rN43@Os8y+0hy6eJ%;qEj

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/warnings_limit.png b/OsmAnd/res/drawable-mdpi/warnings_limit.png
new file mode 100755
index 0000000000000000000000000000000000000000..b1a14e37cee970983e87626cd7350c66c52dd846
GIT binary patch
literal 4716
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/warnings_limit.png b/OsmAnd/res/drawable-xhdpi/warnings_limit.png
new file mode 100755
index 0000000000000000000000000000000000000000..981b445cb5aee6f91a89fe599b7b8cb4e4e9683c
GIT binary patch
literal 9552
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/warnings_limit.png b/OsmAnd/res/drawable-xxhdpi/warnings_limit.png
new file mode 100755
index 0000000000000000000000000000000000000000..75e88589347a15b2126ee30ff679c2cbbc3f1597
GIT binary patch
literal 15259
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 59fe2bf38a..e9838a62bc 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -22,7 +22,6 @@
             android:id="@+id/MapView"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:background="@drawable/btn_flat"
             android:contentDescription="@string/shared_string_map"
             android:visibility="gone" />
 
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 51ff0465bd..9db0c587c5 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -9,6 +9,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
+        <FrameLayout
+            android:id="@+id/map_alarm_warning"
+            android:layout_gravity="bottom|left"
+            android:layout_marginBottom="@dimen/map_button_shadow_height"
+            android:layout_marginLeft="@dimen/map_button_shadow_margin"
+            android:layout_width="@dimen/map_alarm_size"
+            android:layout_height="@dimen/map_alarm_size">
+            <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" />
+            <TextView
+                android:id="@+id/map_alarm_warning_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textStyle="bold"
+                android:textColor="@color/color_black"
+                android:textSize="@dimen/map_alarm_text_size"
+                android:text="60"/>
+        </FrameLayout>
         <FrameLayout
             android:id="@+id/map_app_mode_shadow"
             android:layout_width="@dimen/map_button_shadow_width"
@@ -38,7 +61,6 @@
         <LinearLayout
             android:id="@+id/map_transparency_layout"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|center"
             android:layout_marginBottom="@dimen/map_button_size"
@@ -81,6 +103,31 @@
                 android:layout_marginLeft="@dimen/map_button_spacing"
                 android:background="@drawable/btn_round"
                 android:src="@drawable/ic_action_remove_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">
+                <TextView
+                    android:id="@+id/map_ruler_text"
+                	android:layout_width="fill_parent"
+                	android:layout_height="fill_parent" 
+                	android:layout_marginBottom="@dimen/map_ruler_bottom_margin"
+                	android:text="100 m"
+                	android:gravity="center_horizontal"
+                	android:layout_gravity="bottom"
+                	android:textSize="@dimen/map_widget_text_size_small"
+                    />
+                <ImageView 
+                    android:id="@+id/map_ruler_image"
+                	android:layout_width="fill_parent"
+                	android:layout_height="wrap_content"
+                	android:layout_gravity="bottom" 
+                	android:background="@drawable/ruler"
+                    />
+            </FrameLayout>
         </LinearLayout>
 
         <LinearLayout
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 30d76865bc..b5d8d909eb 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -58,7 +58,11 @@
 	<dimen name="map_route_buttons_height">54dp</dimen>
 	<dimen name="map_address_height">40dp</dimen>
 	<dimen name="map_button_size">48dp</dimen>
+	<dimen name="map_ruler_width">100dp</dimen>
+	<dimen name="map_ruler_bottom_margin">7dp</dimen>
 	<dimen name="map_button_shadow_width">52dp</dimen>
+	<dimen name="map_alarm_size">78dp</dimen>
+	<dimen name="map_alarm_text_size">25sp</dimen>
 	<dimen name="map_button_shadow_height">85dp</dimen>
 	<dimen name="map_widget_icon">24dp</dimen>
 	<dimen name="map_widget_height">32dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index 292a07e314..ef51de125c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -43,12 +43,15 @@ public class OsmAndFormatter {
 		int generator = 1;
 		byte pointer = 1;
 		double point = mainUnitInMeter;
+		double roundDist = 1;
 		while (distInMeters * point > generator) {
+			roundDist = (generator / point);
 			if (pointer++ % 3 == 2) {
 				generator = generator * 5 / 2;
 			} else {
 				generator *= 2;
 			}
+			
 			if (point == mainUnitInMeter && metersInSecondUnit * mainUnitInMeter * 0.9f <= generator) {
 				point = 1 / metersInSecondUnit;
 				generator = 1;
@@ -56,7 +59,7 @@ public class OsmAndFormatter {
 			}
 		}
 
-		return (generator / point);
+		return roundDist;
 	}
 	
 	public static String getFormattedRoundDistanceKm(float meters, int digits, OsmandApplication ctx) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 60c6e5ffe6..e42ac1c8df 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -92,9 +92,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	@Override
 	public void initLayer(final OsmandMapTileView view) {
-		// TODO
-		// rulerControl = init(new RulerControl(zoomControls, mapActivity, showUIHandler, scaleCoefficient), parent,
-		// rightGravity);
 		showUIHandler = new Handler();
 		initTopControls();
 		initTransparencyBar();
@@ -182,8 +179,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 		});
 
 		View compass = mapActivity.findViewById(R.id.map_compass_button);
-		// protected void onDraw(Canvas canvas) {
-		// }
 		compassHud = createHudButton((ImageView) compass, R.drawable.map_compass).setIconColorId(0).setBg(
 				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night);
 		compassHud.compass = true;
@@ -555,6 +550,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		transparencyBar.setMax(255);
 		if (settingsToTransparency != null) {
 			transparencyBar.setProgress(settingsToTransparency.get());
+			transparencyBarLayout.setVisibility(View.VISIBLE);
+		} else {
+			transparencyBarLayout.setVisibility(View.GONE);
 		}
 		transparencyBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 864af7ef0b..0446729db0 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -19,17 +19,17 @@ import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory;
+import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory.AlarmWidget;
+import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory.RulerWidget;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 public class MapInfoLayer extends OsmandMapLayer {
 
@@ -44,7 +44,8 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private ImageButton  expand;
 	private static boolean expanded = false;
 	private BaseMapWidget lanesControl;
-	private BaseMapWidget alarmControl;
+	private AlarmWidget alarmControl;
+	private RulerWidget rulerControl;
 	private MapWidgetRegistry mapInfoControls;
 
 	private OsmandSettings settings;
@@ -74,12 +75,9 @@ public class MapInfoLayer extends OsmandMapLayer {
 		leftStack = (LinearLayout) map.findViewById(R.id.map_left_widgets_panel);
 		rightStack = (LinearLayout) map.findViewById(R.id.map_right_widgets_panel);
 		expand = (ImageButton) map.findViewById(R.id.map_collapse_button);
-		
-		
 		// update and create controls
 		registerAllControls();
-		alarmControl.setVisibility(View.GONE);
-		lanesControl.setVisibility(View.GONE);
+		
 		recreateControls();
 	}
 	
@@ -95,11 +93,17 @@ public class MapInfoLayer extends OsmandMapLayer {
 		OsmandApplication app = view.getApplication();
 		lanesControl = ric.createLanesControl(map, view);
 		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
+		lanesControl.setVisibility(View.GONE);
 		
 		streetNameView = new MapInfoWidgetsFactory.TopTextView(map.getMyApplication(), map);
 		updateStreetName(calculateTextState());
 		
 		alarmControl = ric.createAlarmInfoControl(app, map);
+		alarmControl.setVisibility(false);
+		
+		rulerControl = ric.createRulerControl(app, map);
+		rulerControl.setVisibility(false);
+		
 		// register left stack
 		NextTurnInfoWidget bigInfoControl = ric.createNextInfoControl(map, app, false);
 		registerSideWidget(bigInfoControl, R.drawable.widget_next_turn, R.drawable.widget_next_turn, R.string.map_widget_next_turn,"next_turn", true, 5);
@@ -159,6 +163,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		int leftRes;
 		int expand;
 		int boxFree;
+		int textShadowRadius;
 	}
 
 
@@ -179,6 +184,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 				updateReg(ts, reg);
 			}
 			updateStreetName(ts);
+			rulerControl.updateTextSize(nightMode, ts.textColor, ts.textShadowColor, ts.textShadowRadius);
 			this.expand.setBackgroundResource(ts.expand);
 			rightStack.invalidate();
 			leftStack.invalidate();
@@ -187,14 +193,14 @@ public class MapInfoLayer extends OsmandMapLayer {
 
 	private void updateStreetName(TextState ts) {
 		streetNameView.setBackgroundResource(ts.boxTop);
-		streetNameView.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold);
+		streetNameView.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold, ts.textShadowRadius);
 	}
 
 	private void updateReg(TextState ts, MapWidgetRegInfo reg) {
 		View v = reg.widget.getView().findViewById(R.id.widget_bg);
 		if(v != null) {
 			v.setBackgroundResource(reg.left ? ts.leftRes : ts.rightRes);
-			reg.widget.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold);
+			reg.widget.updateTextColor(ts.textColor, ts.textShadowColor, ts.textBold, ts.textShadowRadius);
 		}
 	}
 
@@ -211,6 +217,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		if (!transparent && !nightMode) {
 			ts.textShadowColor = Color.TRANSPARENT;
 		}
+		ts.textShadowRadius = ts.textShadowColor == 0 ? 0 : 8; 
 		if (transparent) {
 			ts.boxTop = R.drawable.btn_flat_trans;
 			ts.rightRes = R.drawable.btn_left_round_trans;
@@ -243,9 +250,10 @@ public class MapInfoLayer extends OsmandMapLayer {
 		updateColorShadowsOfText();
 		mapInfoControls.updateInfo(settings.getApplicationMode(), drawSettings, expanded);
 		streetNameView.updateInfo(drawSettings);
+		alarmControl.updateInfo(drawSettings);
+		rulerControl.updateInfo(tileBox, drawSettings);
 		// TODO
 //		lanesControl.updateInfo(drawSettings);
-//		alarmControl.updateInfo(drawSettings);
 		
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java b/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
deleted file mode 100644
index fbf5d84591..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/controls/RulerControl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package net.osmand.plus.views.controls;
-
-import net.osmand.data.RotatedTileBox;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.ShadowText;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.text.TextPaint;
-import android.view.View;
-
-public class RulerControl  {
-
-	//ruler and ruler label appeareance:
-	//  Day view:   color black, shadowColor white (transpparent skin or not)
-	//  Night view: color widgettext_night, shadowColor always use widgettext_shadow_night, same as widget background color for non-transparent night skin (from box_night_free_simple.9.png)
-
-	ShadowText cacheRulerText = null;
-	double cacheRulerZoom = 0;
-	double cacheRulerTileX = 0;
-	double cacheRulerTileY = 0;
-	float cacheRulerTextLen = 0;
-	Drawable rulerDrawable;
-	TextPaint rulerTextPaint;
-	final static double screenRulerPercent = 0.25;
-	boolean isNightRemembered = false;
-	private MapActivity mapActivity;
-	private float scaleCoefficient;
-
-	public RulerControl(MapActivity mapActivity, Handler showUIHandler, float scaleCoefficient) {
-		this.mapActivity = mapActivity;
-		this.scaleCoefficient = scaleCoefficient;
-		rulerTextPaint = new TextPaint();
-		rulerTextPaint.setTextSize(20 * scaleCoefficient);
-		rulerTextPaint.setAntiAlias(true);
-		rulerDrawable = mapActivity.getResources().getDrawable(R.drawable.ruler);
-	}
-
-
-	public void onDraw(Canvas canvas, RotatedTileBox tb, DrawSettings nightMode) {
-		if (!mapActivity.getMyApplication().getSettings().SHOW_RULER.get()) {
-			return;
-		}
-		OsmandMapTileView view = mapActivity.getMapView();
-		boolean isNight = nightMode == null ? false : nightMode.isNightMode();
-		// update cache
-		if (view.isZooming()) {
-			cacheRulerText = null;
-		} else if (((isNight != isNightRemembered) || (tb.getZoom() != cacheRulerZoom) || Math.abs(tb.getCenterTileX()
-				- cacheRulerTileX)
-				+ Math.abs(tb.getCenterTileY() - cacheRulerTileY) > 1)
-				&& tb.getPixWidth() > 0) {
-			cacheRulerZoom = (tb.getZoom());
-			cacheRulerTileX = tb.getCenterTileX();
-			cacheRulerTileY = tb.getCenterTileY();
-			final double dist = tb.getDistance(0, tb.getPixHeight() / 2, tb.getPixWidth(), tb.getPixHeight() / 2);
-			double pixDensity = tb.getPixWidth() / dist;
-			double roundedDist = OsmAndFormatter.calculateRoundedDist(dist * screenRulerPercent, view.getApplication());
-
-			int cacheRulerDistPix = (int) (pixDensity * roundedDist);
-			cacheRulerText = ShadowText.create(OsmAndFormatter.getFormattedDistance((float) roundedDist,
-					view.getApplication()));
-			cacheRulerTextLen = rulerTextPaint.measureText(cacheRulerText.getText());
-			rulerDrawable = (isNight ? mapActivity.getResources().getDrawable(R.drawable.ruler_night) : mapActivity
-					.getResources().getDrawable(R.drawable.ruler));
-			Rect bounds = rulerDrawable.getBounds();
-			// TODO
-//			bounds.right = (int) (view.getWidth() - 7 * scaleCoefficient);
-			bounds.left = bounds.right - cacheRulerDistPix;
-			rulerDrawable.setBounds(bounds);
-			rulerDrawable.invalidateSelf();
-		}
-
-		if (cacheRulerText != null) {
-			Rect bounds = rulerDrawable.getBounds();
-//			int bottom = (int) (view.getHeight() );
-//			if (bounds.bottom != bottom) {
-//				bounds.bottom = bottom;
-//				bounds.top = bounds.bottom - rulerDrawable.getMinimumHeight();
-//				rulerDrawable.setBounds(bounds);
-//				rulerDrawable.invalidateSelf();
-//			}
-			rulerDrawable.draw(canvas);
-			int shadowColor = isNight == true ? mapActivity.getResources().getColor(R.color.widgettext_shadow_night)
-					: Color.WHITE;
-			cacheRulerText.draw(canvas, bounds.left + (bounds.width() - cacheRulerTextLen) / 2, bounds.bottom - 8
-					* scaleCoefficient, rulerTextPaint, shadowColor);
-		}
-		isNightRemembered = isNight;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 5bd245d69e..eb2463647d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -311,15 +311,15 @@ public class MapInfoWidgetsFactory {
 			return false;
 		}
 		
-		public void updateTextColor(int textColor, int textShadowColor, boolean bold) {
-			updateTextColor(addressText, textColor, textShadowColor, bold);
+		public void updateTextColor(int textColor, int textShadowColor, boolean bold, int rad) {
+			updateTextColor(addressText, textColor, textShadowColor, bold, rad);
 			updateTextColor((TextView) waypointInfoBar.findViewById(R.id.waypoint_text),
-					textColor, textShadowColor, bold);
+					textColor, textShadowColor, bold, rad);
 		}
 		
-		private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold) {
+		private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold, int rad) {
 			tv.setTextColor(textColor);
-			tv.setShadowLayer(textShadowColor == 0 ? 0 : 8, 0, 0, textShadowColor);
+			tv.setShadowLayer(rad, 0, 0, textShadowColor);
 			tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index e304f3d59f..84e5fbe576 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -208,14 +208,14 @@ public class MapWidgetRegistry {
 	}
 	
 	private void resetDefaultAppearance(ApplicationMode appMode) {
-		settings.SHOW_RULER.resetToDefault();		
+//		settings.SHOW_RULER.resetToDefault();		
 		settings.SHOW_DESTINATION_ARROW.resetToDefault();
 		settings.TRANSPARENT_MAP_THEME.resetToDefault();
 		settings.CENTER_POSITION_ON_MAP.resetToDefault();
 	}
 	
 	public void addControlsAppearance(final MapInfoLayer mil, ContextMenuAdapter cm, ApplicationMode mode) {
-		addControlId(mil, cm, R.string.map_widget_show_ruler, settings.SHOW_RULER);
+//		addControlId(mil, cm, R.string.map_widget_show_ruler, settings.SHOW_RULER);
 		addControlId(mil, cm, R.string.map_widget_show_destination_arrow, settings.SHOW_DESTINATION_ARROW);
 		addControlId(mil, cm, R.string.map_widget_transparent, settings.TRANSPARENT_MAP_THEME);
 		addControlId(mil, cm, R.string.always_center_position_on_map, settings.CENTER_POSITION_ON_MAP);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 8f9de55fe7..c433052f7c 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -8,6 +8,7 @@ import java.util.List;
 import net.osmand.Location;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.data.LatLon;
+import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
@@ -31,20 +32,21 @@ import net.osmand.plus.views.TurnPathHelper;
 import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.router.RouteResultPreparation;
 import net.osmand.router.TurnType;
+import net.osmand.util.Algorithms;
 import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.text.format.DateFormat;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
 
 public class RouteInfoWidgetsFactory {
 
@@ -629,152 +631,179 @@ public class RouteInfoWidgetsFactory {
 		TurnPathHelper.calcTurnPath(laneStraight, TurnType.straight(), pathTransform);
 		return laneStraight;
 	}
-
 	
-	public BaseMapWidget createAlarmInfoControl(final OsmandApplication app, MapActivity ma) {
-		final RoutingHelper rh = app.getRoutingHelper();
-		final WaypointHelper wh = app.getWaypointHelper();
-		final OsmandSettings settings = app.getSettings();
-		final OsmAndLocationProvider locationProvider = app.getLocationProvider();
-		final MapViewTrackingUtilities trackingUtilities = ma.getMapViewTrackingUtilities();
-		final Paint paintCircle = new Paint();
-		final float th = 11 * scaleCoefficient;
-		paintCircle.setColor(Color.rgb(225, 15, 15));
-		paintCircle.setStrokeWidth(11 * scaleCoefficient);
-		paintCircle.setStyle(Style.STROKE);
-		paintCircle.setAntiAlias(true);
-		paintCircle.setDither(true);
-		final Paint content = new Paint();
-		content.setColor(Color.WHITE);
-		content.setStyle(Style.FILL);
-		final Paint ptext = new Paint();
-		ptext.setTextSize(27 * scaleCoefficient);
-		ptext.setFakeBoldText(true);
-		ptext.setAntiAlias(true);
-		ptext.setTextAlign(Align.CENTER);
+	public static class RulerWidget  {
 		
-		final BaseMapWidget alarm = new BaseMapWidget(ma) {
-			private int textDy = 0;
-			private String text = "";
-			private Bitmap img = null;
-			private int imgId;
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean trafficWarnings = settings.SHOW_TRAFFIC_WARNINGS.get();
-				boolean cams = settings.SHOW_CAMERAS.get();
-				boolean peds = settings.SHOW_PEDESTRIAN.get();
-				boolean visible = false;
-				boolean eval = rh.isFollowingMode() || trackingUtilities.isMapLinkedToLocation();
-				if ((trafficWarnings || cams) && eval) {
-					AlarmInfo alarm ;
-					if(rh.isFollowingMode()) { 
-						alarm = wh.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams);
-					} else {
-						RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
-						Location loc = locationProvider.getLastKnownLocation();
-						if(ro != null && loc != null) {
-							alarm = wh.calculateMostImportantAlarm(ro, loc, settings.METRIC_SYSTEM.get(), cams);
-						} else {
-							alarm = null;
-						}
-					}
-					if(alarm != null) {
-						int locimgId = 0;
-						int textDy = 0;
-						String text = null;
-						if(alarm.getType() == AlarmInfoType.SPEED_LIMIT) {
-							if(settings.DRIVING_REGION.get().americanSigns){
-								locimgId = R.drawable.warnings_speed_limit_us;
-								textDy = (int) (-12 * scaleCoefficient);
-							//else case is done by drawing red ring
-							}
-							text = alarm.getIntValue() +"";
-						} else if(alarm.getType() == AlarmInfoType.SPEED_CAMERA) {
-							locimgId = R.drawable.warnings_speed_camera;
-							text = "";
-						} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
-							locimgId = R.drawable.warnings_border_control;
-							text = "";
-						} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
-							//image done by drawing red ring
-							text = "$";
-						} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {
-							if(settings.DRIVING_REGION.get().americanSigns){
-								locimgId = R.drawable.warnings_traffic_calming_us;
-							} else {
-								locimgId = R.drawable.warnings_traffic_calming;
-							}
-							text = "";
-						} else if(alarm.getType() == AlarmInfoType.STOP) {
-							locimgId = R.drawable.warnings_stop;
-							text = "";
-						} else if(alarm.getType() == AlarmInfoType.RAILWAY) {
-							if(settings.DRIVING_REGION.get().americanSigns){
-								locimgId = R.drawable.warnings_railways_us;
-							} else {
-								locimgId = R.drawable.warnings_railways;
-							}
-							text = "";
-						} else if(alarm.getType() == AlarmInfoType.PEDESTRIAN) {
-							if(settings.DRIVING_REGION.get().americanSigns){
-								locimgId = R.drawable.warnings_pedestrian_us;
-							} else {
-								locimgId = R.drawable.warnings_pedestrian;
-							}
-							text = "";
-						}
-						visible = (text != null &&  text.length() > 0) || (locimgId != 0);
-						if (visible) {
-							if (alarm.getType() == AlarmInfoType.SPEED_CAMERA) {
-								visible = cams;
-							} else if (alarm.getType() == AlarmInfoType.PEDESTRIAN) {
-								visible = peds;
-							} else {
-								visible = trafficWarnings;
-							}
-						}
-						if(visible) {
-							if(locimgId != imgId) {
-								imgId = locimgId;
-								if(imgId == 0) {
-									img = null;
-								} else {
-									img = BitmapFactory.decodeResource(getResources(), locimgId);
-								}
-								invalidate();
-							}
-							if(text != null && !text.equals(this.text)) {
-								this.text = text;
-								this.textDy = textDy;
-								invalidate();
-							}
-						}
-					}
-				}
-				updateVisibility(visible);
-				return true;
-			}
+		private View layout;
+		private ImageView icon;
+		private TextView text;
+		private MapActivity ma;
+		private String cacheRulerText;
+		private int maxWidth;
+		private int cacheRulerZoom;
+		private double cacheRulerTileX;
+		private double cacheRulerTileY;
 
-			@Override
-			protected void onDraw(Canvas canvas) {
-				if(img == null) {
-					RectF f = new RectF(th / 2, th / 2, getWidth() - th / 2, getHeight() - th / 2);
-					canvas.drawOval(f, content);
-					canvas.drawOval(f, paintCircle);
-				} else {
-					canvas.drawBitmap(img, 0, 0, paintCircle);
-				}
-				if(text.length() > 0) {
-					canvas.drawText(text, getWidth() / 2 , getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient - textDy, ptext);
-				}
-			}
+		public RulerWidget(final OsmandApplication app, MapActivity ma) {
+			this.ma = ma;
+			layout = ma.findViewById(R.id.map_ruler_layout);
+			icon = (ImageView) ma.findViewById(R.id.map_ruler_image);
+			text = (TextView) ma.findViewById(R.id.map_ruler_text);
+			maxWidth = ma.getResources().getDimensionPixelSize(R.dimen.map_ruler_width);
+		}
+		
+		public void updateTextSize(boolean isNight, int textColor, int textShadowColor, int shadowRadius) {
+			text.setTextColor(textColor);
+			text.setShadowLayer(shadowRadius, 0, 0, textShadowColor);
+			icon.setBackgroundResource(isNight ? R.drawable.ruler_night : R.drawable.ruler);
+		}
+		
+		public boolean updateInfo(RotatedTileBox tb, DrawSettings nightMode) {
+			boolean visible = true;
+			OsmandMapTileView view = ma.getMapView();
+			// update cache
+			if (view.isZooming()) {
+				visible = false;
+			} else if ((tb.getZoom() != cacheRulerZoom || Math.abs(tb.getCenterTileX() - cacheRulerTileX) > 1 || Math
+					.abs(tb.getCenterTileY() - cacheRulerTileY) > 1) && tb.getPixWidth() > 0 && maxWidth > 0) {
+				cacheRulerZoom = tb.getZoom();
+				cacheRulerTileX = tb.getCenterTileX();
+				cacheRulerTileY = tb.getCenterTileY();
+				final double dist = tb.getDistance(0, tb.getPixHeight() / 2, tb.getPixWidth(), tb.getPixHeight() / 2);
+				double pixDensity = tb.getPixWidth() / dist;
+				double roundedDist = OsmAndFormatter.calculateRoundedDist(maxWidth / 
+						pixDensity, view.getApplication());
 
-		};
-		// initial state
-		// nextTurnInfo.setVisibility(View.GONE);
-		return alarm;
+				int cacheRulerDistPix = (int) (pixDensity * roundedDist);
+				cacheRulerText = OsmAndFormatter.getFormattedDistance((float) roundedDist, view.getApplication());
+				text.setText(cacheRulerText);
+				LinearLayout.LayoutParams lp = (LayoutParams) layout.getLayoutParams();
+				lp.width = cacheRulerDistPix;
+				layout.setLayoutParams(lp);
+				layout.requestLayout();
+			}
+			updateVisibility(layout, visible);
+			return true;
+		}
+		
+		public void setVisibility(boolean visibility) {
+			layout.setVisibility(visibility ? View.VISIBLE : View.GONE);
+		}
 	}
 	
+	public static class AlarmWidget  {
+		
+		private View layout;
+		private ImageView icon;
+		private TextView text;
+		private OsmandSettings settings;
+		private RoutingHelper rh;
+		private MapViewTrackingUtilities trackingUtilities;
+		private OsmAndLocationProvider locationProvider;
+		private WaypointHelper wh;
+		private int imgId;
+		private String textString;
+
+		public AlarmWidget(final OsmandApplication app, MapActivity ma) {
+			layout = ma.findViewById(R.id.map_alarm_warning);
+			icon = (ImageView) ma.findViewById(R.id.map_alarm_warning_icon);
+			text = (TextView) ma.findViewById(R.id.map_alarm_warning_text);
+			settings = app.getSettings();
+			rh = ma.getRoutingHelper();
+			trackingUtilities = ma.getMapViewTrackingUtilities();
+			locationProvider = app.getLocationProvider();
+			wh = app.getWaypointHelper();
+		}
+		
+		public boolean updateInfo(DrawSettings drawSettings) {
+			boolean trafficWarnings = settings.SHOW_TRAFFIC_WARNINGS.get();
+			boolean cams = settings.SHOW_CAMERAS.get();
+			boolean peds = settings.SHOW_PEDESTRIAN.get();
+			boolean visible = false;
+			boolean eval = rh.isFollowingMode() || trackingUtilities.isMapLinkedToLocation();
+			if ((trafficWarnings || cams) && eval) {
+				AlarmInfo alarm ;
+				if(rh.isFollowingMode()) { 
+					alarm = wh.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams);
+				} else {
+					RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
+					Location loc = locationProvider.getLastKnownLocation();
+					if(ro != null && loc != null) {
+						alarm = wh.calculateMostImportantAlarm(ro, loc, settings.METRIC_SYSTEM.get(), cams);
+					} else {
+						alarm = null;
+					}
+				}
+				if(alarm != null) {
+					int locimgId = R.drawable.warnings_limit;
+					String text = "";
+					if(alarm.getType() == AlarmInfoType.SPEED_LIMIT) {
+						if(settings.DRIVING_REGION.get().americanSigns){
+							locimgId = R.drawable.warnings_speed_limit_us;
+						//else case is done by drawing red ring
+						}
+						text = alarm.getIntValue() +"";
+					} else if(alarm.getType() == AlarmInfoType.SPEED_CAMERA) {
+						locimgId = R.drawable.warnings_speed_camera;
+					} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
+						locimgId = R.drawable.warnings_border_control;
+					} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
+						//image done by drawing red ring
+					} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {
+						if(settings.DRIVING_REGION.get().americanSigns){
+							locimgId = R.drawable.warnings_traffic_calming_us;
+						} else {
+							locimgId = R.drawable.warnings_traffic_calming;
+						}
+					} else if(alarm.getType() == AlarmInfoType.STOP) {
+						locimgId = R.drawable.warnings_stop;
+					} else if(alarm.getType() == AlarmInfoType.RAILWAY) {
+						if(settings.DRIVING_REGION.get().americanSigns){
+							locimgId = R.drawable.warnings_railways_us;
+						} else {
+							locimgId = R.drawable.warnings_railways;
+						}
+					} else if(alarm.getType() == AlarmInfoType.PEDESTRIAN) {
+						if(settings.DRIVING_REGION.get().americanSigns){
+							locimgId = R.drawable.warnings_pedestrian_us;
+						} else {
+							locimgId = R.drawable.warnings_pedestrian;
+						}
+					} else {
+						text = null;
+					}
+					visible = (text != null &&  text.length() > 0) || (locimgId != 0);
+					if (visible) {
+						if (alarm.getType() == AlarmInfoType.SPEED_CAMERA) {
+							visible = cams;
+						} else if (alarm.getType() == AlarmInfoType.PEDESTRIAN) {
+							visible = peds;
+						} else {
+							visible = trafficWarnings;
+						}
+					}
+					if(visible) {
+						if(locimgId != imgId) {
+							imgId = locimgId;
+							icon.setImageResource(locimgId);
+						}
+						if (!Algorithms.objectEquals(text, this.textString)) {
+							textString = text;
+							this.text.setText(this.textString);
+						} 
+					}
+				}
+			}
+			updateVisibility(layout, visible);
+			return true;
+		}
+
+		public void setVisibility(boolean visibility) {
+			layout.setVisibility(visibility ? View.VISIBLE : View.GONE);
+		}
+	}
+
+	
 	
 	public static boolean distChanged(int oldDist, int dist){
 		if(oldDist != 0 && Math.abs(oldDist - dist) < 10){
@@ -782,4 +811,25 @@ public class RouteInfoWidgetsFactory {
 		}
 		return true;
 	}
+
+	public AlarmWidget createAlarmInfoControl(OsmandApplication app, MapActivity map) {
+		return new AlarmWidget(app, map);
+	}
+	
+	public RulerWidget createRulerControl(OsmandApplication app, MapActivity map) {
+		return new RulerWidget(app, map);
+	}
+	
+	protected static boolean updateVisibility(View view, boolean visible) {
+		if (visible != (view.getVisibility() == View.VISIBLE)) {
+			if (visible) {
+				view.setVisibility(View.VISIBLE);
+			} else {
+				view.setVisibility(View.GONE);
+			}
+			view.invalidate();
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
index dbd8efd0f9..0b9fb5d085 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/TextInfoWidget.java
@@ -143,14 +143,14 @@ public class TextInfoWidget  {
 		return explicitlyVisible;
 	}
 
-	public void updateTextColor(int textColor, int textShadowColor, boolean bold) {
-		updateTextColor(smallTextView, textColor, textShadowColor, bold);
-		updateTextColor(textView, textColor, textShadowColor, bold);
+	public void updateTextColor(int textColor, int textShadowColor, boolean bold, int rad) {
+		updateTextColor(smallTextView, textColor, textShadowColor, bold, rad);
+		updateTextColor(textView, textColor, textShadowColor, bold, rad);
 	}
 	
-	private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold) {
+	private void updateTextColor(TextView tv, int textColor, int textShadowColor, boolean textBold, int rad) {
 		tv.setTextColor(textColor);
-		tv.setShadowLayer(textShadowColor == 0 ? 0 : 8, 0, 0, textShadowColor);
+		tv.setShadowLayer(rad, 0, 0, textShadowColor);
 		tv.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
 	}
 

From 3794bc7225aac3b89586b62831b38a590d97cb54 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 22:18:33 +0100
Subject: [PATCH 23/23] Fix lanes control

---
 OsmAnd/res/layout/map_hud_bottom.xml          |   2 +-
 OsmAnd/res/layout/map_hud_top.xml             |  37 ++-
 OsmAnd/res/values/sizes.xml                   |   4 +-
 .../net/osmand/plus/views/MapInfoLayer.java   |  12 +-
 .../plus/views/mapwidgets/BaseMapWidget.java  | 106 ------
 .../mapwidgets/MapInfoWidgetsFactory.java     |   6 +-
 .../mapwidgets/RouteInfoWidgetsFactory.java   | 309 +++++++++++-------
 7 files changed, 225 insertions(+), 251 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java

diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 9db0c587c5..9d9ef0f888 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -12,7 +12,7 @@
         <FrameLayout
             android:id="@+id/map_alarm_warning"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/map_button_shadow_height"
+            android:layout_marginBottom="@dimen/map_alarm_bottom_margin"
             android:layout_marginLeft="@dimen/map_button_shadow_margin"
             android:layout_width="@dimen/map_alarm_size"
             android:layout_height="@dimen/map_alarm_size">
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index d5e26d7ddc..871e03c95a 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -11,15 +11,16 @@
         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 -->
+
         <TextView
             android:id="@+id/map_address_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
             android:layout_gravity="center"
+            android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
             android:shadowColor="@color/color_myloc_distance"
@@ -34,7 +35,7 @@
             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"
@@ -110,10 +111,9 @@
                     android:layout_gravity="top|left"
                     android:orientation="vertical" >
 
-                    <!--
                     <include layout="@layout/map_hud_widget" />
                     <include layout="@layout/map_hud_widget" />
-                    -->
+                    <include layout="@layout/map_hud_widget" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -158,16 +158,31 @@
             android:background="@drawable/btn_round"
             android:orientation="vertical" >
 
+            <ImageView
+                android:id="@+id/map_lanes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/map_lanes_dist_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:text="1048 km"
+                android:textColor="@color/color_black"
+                android:textSize="@dimen/map_widget_text_size_small" />
+
             <ProgressBar
                 android:id="@+id/map_horizontal_progress"
+                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="@dimen/map_routing_progress_width"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/map_button_margin"
                 android:layout_marginRight="@dimen/map_button_margin"
-                android:layout_height="wrap_content"
                 android:max="100"
                 android:progress="60"
-                
-                style="?android:attr/progressBarStyleHorizontal" 
                 android:visibility="gone" />
         </LinearLayout>
         <!-- RIGHT widgets colon -->
@@ -206,11 +221,7 @@
                         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" />
-                        -->
+                        <include layout="@layout/map_hud_widget" />
                     </LinearLayout>
 
                     <ImageButton
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index b5d8d909eb..3839c8b93f 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -58,11 +58,13 @@
 	<dimen name="map_route_buttons_height">54dp</dimen>
 	<dimen name="map_address_height">40dp</dimen>
 	<dimen name="map_button_size">48dp</dimen>
-	<dimen name="map_ruler_width">100dp</dimen>
+	<dimen name="map_ruler_width">120dp</dimen>
 	<dimen name="map_ruler_bottom_margin">7dp</dimen>
 	<dimen name="map_button_shadow_width">52dp</dimen>
 	<dimen name="map_alarm_size">78dp</dimen>
 	<dimen name="map_alarm_text_size">25sp</dimen>
+	
+	<dimen name="map_alarm_bottom_margin">87dp</dimen>
 	<dimen name="map_button_shadow_height">85dp</dimen>
 	<dimen name="map_widget_icon">24dp</dimen>
 	<dimen name="map_widget_height">32dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 0446729db0..1542ce7aca 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -12,7 +12,6 @@ import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
-import net.osmand.plus.views.mapwidgets.BaseMapWidget;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopTextView;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry;
@@ -20,6 +19,7 @@ import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.MapWidgetRegInfo;
 import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory.AlarmWidget;
+import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory.LanesControl;
 import net.osmand.plus.views.mapwidgets.RouteInfoWidgetsFactory.RulerWidget;
 import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.content.Context;
@@ -43,7 +43,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	private LinearLayout leftStack;
 	private ImageButton  expand;
 	private static boolean expanded = false;
-	private BaseMapWidget lanesControl;
+	private LanesControl lanesControl;
 	private AlarmWidget alarmControl;
 	private RulerWidget rulerControl;
 	private MapWidgetRegistry mapInfoControls;
@@ -92,8 +92,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 		MapInfoWidgetsFactory mic = new MapInfoWidgetsFactory();
 		OsmandApplication app = view.getApplication();
 		lanesControl = ric.createLanesControl(map, view);
-		lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
-		lanesControl.setVisibility(View.GONE);
 		
 		streetNameView = new MapInfoWidgetsFactory.TopTextView(map.getMyApplication(), map);
 		updateStreetName(calculateTextState());
@@ -176,7 +174,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		if (themeId != calcThemeId) {
 			themeId = calcThemeId;
 			TextState ts = calculateTextState();
-//			lanesControl.setBackgroundDrawable(boxFree);
+			map.findViewById(R.id.map_center_info).setBackgroundResource(ts.boxFree);
 			for (MapWidgetRegInfo reg : mapInfoControls.getLeft()) {
 				updateReg(ts, reg);
 			}
@@ -184,6 +182,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 				updateReg(ts, reg);
 			}
 			updateStreetName(ts);
+			lanesControl.updateTextSize(nightMode, ts.textColor, ts.textShadowColor, ts.textBold, ts.textShadowRadius);
 			rulerControl.updateTextSize(nightMode, ts.textColor, ts.textShadowColor, ts.textShadowRadius);
 			this.expand.setBackgroundResource(ts.expand);
 			rightStack.invalidate();
@@ -252,8 +251,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		streetNameView.updateInfo(drawSettings);
 		alarmControl.updateInfo(drawSettings);
 		rulerControl.updateInfo(tileBox, drawSettings);
-		// TODO
-//		lanesControl.updateInfo(drawSettings);
+		lanesControl.updateInfo(drawSettings);
 		
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java
deleted file mode 100644
index 549ac3566e..0000000000
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/BaseMapWidget.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package net.osmand.plus.views.mapwidgets;
-
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.ShadowText;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.view.View;
-
-public abstract class BaseMapWidget extends View  {
-	int width = 0;
-	int height = 0;
-	Rect padding = new Rect();
-	int shadowColor = Color.WHITE;
-
-    private String contentTitle;
-
-	public BaseMapWidget(Context ctx) {
-		super(ctx);
-	}
-	
-	@Override
-	public void setBackgroundDrawable(Drawable d) {
-		d.getPadding(padding);
-		super.setBackgroundDrawable(d);
-	}
-
-	@Override
-	public void setContentDescription(CharSequence text) {
-		if (contentTitle != null)
-			super.setContentDescription(contentTitle + " " + text); //$NON-NLS-1$
-		else super.setContentDescription(text);
-	}
-
-	public void setContentTitle(String text) {
-		contentTitle = text;
-		super.setContentDescription(text);
-	}
-
-	public void setWDimensions(int w, int h){
-		setMeasuredDimension(w + padding.left + padding.right, h + padding.top + padding.bottom);
-	}
-	
-	@Override
-	protected final void onLayout(boolean changed, int left, int top, int right, int bottom) {
-		onWLayout(right - left - padding.left - padding.right, bottom - top - padding.bottom - padding.top);
-	}
-	
-	public int getWHeight(){
-		return getBottom() - getTop() - padding.top - padding.bottom;
-	}
-	
-	public int getWWidth(){
-		return getRight() - getLeft() - padding.left - padding.right; 
-	}
-	
-	// To override
-	protected void onWLayout(int w, int h) {
-
-	}
-	
-	protected void drawShadowText(Canvas cv, String text, float centerX, float centerY, Paint textPaint) {
-		ShadowText.draw(text, cv, centerX, centerY, textPaint, shadowColor);
-	}
-	
-	public void setShadowColor(int shadowColor) {
-		this.shadowColor = shadowColor;
-	}
-	
-	public int getShadowColor() {
-		return shadowColor;
-	}
-	
-	@Override
-	protected void onDraw(Canvas canvas) {
-		super.onDraw(canvas);
-		canvas.translate(padding.left, padding.top);
-		canvas.clipRect(0, 0, getWWidth(),getWHeight());
-	}
-	
-	public boolean updateInfo(DrawSettings drawSettings) { return false; }
-	
-	protected boolean updateVisibility(boolean visible) {
-		if (visible != (getVisibility() == View.VISIBLE)) {
-			if (visible) {
-				setVisibility(View.VISIBLE);
-			} else {
-				setVisibility(View.GONE);
-			}
-			requestLayout();
-			invalidate();
-			return true;
-		}
-		return false;
-	}
-	
-	public OsmandApplication getClientContext(){
-		return (OsmandApplication) getContext().getApplicationContext();
-	}
-	
-
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index eb2463647d..831b53749b 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -338,9 +338,9 @@ public class MapInfoWidgetsFactory {
 						RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
 						type[0] = next.getTurnType();
 						text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
-						if(next.distance > 0) {
-							text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
-						}
+//						if(next.distance > 0) {
+//							text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
+//						}
 						
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index c433052f7c..75623af025 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -34,10 +34,13 @@ import net.osmand.router.RouteResultPreparation;
 import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
 import android.app.Activity;
+import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.Typeface;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.drawable.Drawable;
@@ -50,9 +53,6 @@ import android.widget.TextView;
 
 public class RouteInfoWidgetsFactory {
 
-	// TODO
-	private float scaleCoefficient = 1;
-	
 	public NextTurnInfoWidget createNextInfoControl(final Activity activity,
 			final OsmandApplication app, boolean horisontalMini) {
 		final OsmandSettings settings = app.getSettings();
@@ -486,9 +486,9 @@ public class RouteInfoWidgetsFactory {
 		return distanceControl;
 	}
 	
-	private static final float miniCoeff = 2f;
 	
-	private Path getPathFromTurnType(List<Path> paths, int laneType, Path defaultType) {
+	
+	private static Path getPathFromTurnType(List<Path> paths, int laneType, Path defaultType, float coef) {
 		if(laneType == 0) {
 			return defaultType;
 		}
@@ -501,137 +501,206 @@ public class RouteInfoWidgetsFactory {
 		}
 		p = new Path();
 		Matrix pathTransform = new Matrix();
-		pathTransform.postScale(scaleCoefficient / miniCoeff, scaleCoefficient / miniCoeff);
+		pathTransform.postScale(coef, coef );
 		TurnType tp = TurnType.valueOf(laneType, false);
 		TurnPathHelper.calcTurnPath(p, tp, pathTransform);
 		paths.set(laneType, p);
 		return p;
 	}
 	
-	public BaseMapWidget createLanesControl(final MapActivity map, final OsmandMapTileView view) {
-		final List<Path> paths = new ArrayList<Path>();
-		final Path laneStraight = getPathFromTurnType(paths, TurnType.C, null);
-		 
-		final Paint paintBlack = new Paint();
-		paintBlack.setStyle(Style.STROKE);
-		paintBlack.setColor(Color.BLACK);
-		paintBlack.setAntiAlias(true);
-		paintBlack.setStrokeWidth(2.5f);
-		
-		final Paint paintRouteDirection = new Paint();
-		paintRouteDirection.setStyle(Style.FILL);
-		paintRouteDirection.setColor(view.getResources().getColor(R.color.nav_arrow));
-		paintRouteDirection.setAntiAlias(true);
-		final float w = 72 * scaleCoefficient / miniCoeff;
-		final MapViewTrackingUtilities trackingUtilities = map.getMapViewTrackingUtilities();
-		final OsmAndLocationProvider locationProvider = map.getMyApplication().getLocationProvider();
-		final RoutingHelper rh = map.getMyApplication().getRoutingHelper();
-		
-		final BaseMapWidget lanesControl = new BaseMapWidget(view.getContext()) {
-			int[] lanes = null; 
-			boolean imminent = false;
+	public static class LanesControl {
+		private MapViewTrackingUtilities trackingUtilities;
+		private OsmAndLocationProvider locationProvider;
+		private RoutingHelper rh;
+		private OsmandSettings settings;
+		private ImageView lanesView;
+		private TextView lanesText;
+		private OsmandApplication app;
+		private int dist;
+		private LanesDrawable lanesDrawable;
 
-			
-			@Override
-			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-				int ls = (int) (lanes == null ? 0 : lanes.length * w);
-				setWDimensions(ls, (int)( w + 3 * scaleCoefficient));
-			}
-
-			@Override
-			protected void onDraw(Canvas canvas) {
-				super.onDraw(canvas);
-				//to change color immediately when needed
-				if (lanes != null && lanes.length > 0) {
-					canvas.save();
-					// canvas.translate((int) (16 * scaleCoefficient), 0);
-					for (int i = 0; i < lanes.length; i++) {
-						int turnType;
-						if ((lanes[i] & 1) == 1) {
-							paintRouteDirection.setColor(imminent ? getResources().getColor(R.color.nav_arrow_imminent) : getResources().getColor(R.color.nav_arrow));
-							turnType = TurnType.getPrimaryTurn(lanes[i]);
-						} else {
-							paintRouteDirection.setColor(getResources().getColor(R.color.nav_arrow_distant));
-							turnType = TurnType.getPrimaryTurn(lanes[i]); 
-						}
-						Path p = getPathFromTurnType(paths, turnType, laneStraight);
-						canvas.drawPath(p, paintBlack);
-						canvas.drawPath(p, paintRouteDirection);
-						canvas.translate(w, 0);
+		public LanesControl(final MapActivity map, final OsmandMapTileView view) {
+			lanesView = (ImageView) map.findViewById(R.id.map_lanes);
+			lanesText = (TextView) map.findViewById(R.id.map_lanes_dist_text);
+			 
+			lanesDrawable = new LanesDrawable(map, map.getMapView().getScaleCoefficient());
+			lanesView.setImageDrawable(lanesDrawable);
+			trackingUtilities = map.getMapViewTrackingUtilities();
+			locationProvider = map.getMyApplication().getLocationProvider();
+			settings = map.getMyApplication().getSettings();
+			rh = map.getMyApplication().getRoutingHelper();
+			app = map.getMyApplication();
+		}
+		
+		public void updateTextSize(boolean isNight, int textColor, int textShadowColor, boolean textBold, int shadowRadius) {
+			lanesText.setTextColor(textColor);
+			lanesText.setTypeface(Typeface.DEFAULT, textBold ? Typeface.BOLD : Typeface.NORMAL);
+			lanesText.setShadowLayer(shadowRadius, 0, 0, textShadowColor);
+		}
+		
+		public boolean updateInfo(DrawSettings drawSettings) {
+			boolean visible = false;
+			int locimminent = -1;
+			int[] loclanes = null;
+			int dist = 0;
+			// TurnType primary = null;
+			if ((rh == null || !rh.isFollowingMode()) && trackingUtilities.isMapLinkedToLocation()
+					&& settings.SHOW_LANES.get()) {
+				RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
+				Location lp = locationProvider.getLastKnownLocation();
+				if(ro != null) {
+					float degree = lp == null || !lp.hasBearing() ? 0 : lp.getBearing();
+					loclanes = RouteResultPreparation.parseTurnLanes(ro, degree / 180 * Math.PI);
+					if(loclanes == null) {
+						loclanes = RouteResultPreparation.parseLanes(ro, degree / 180 * Math.PI);
+					}
+				}
+			} else if (rh != null && rh.isRouteCalculated() ) {
+				if (rh.isFollowingMode() && settings.SHOW_LANES.get()) {
+					NextDirectionInfo r = rh.getNextRouteDirectionInfo(new NextDirectionInfo(), false);
+					if(r != null && r.directionInfo != null && r.directionInfo.getTurnType() != null) {
+						loclanes  = r.directionInfo.getTurnType().getLanes();
+						// primary = r.directionInfo.getTurnType();
+						locimminent = r.imminent;
+						// Do not show too far 
+						if ((r.distanceTo > 800 && r.directionInfo.getTurnType().isSkipToSpeak()) || r.distanceTo > 1200) {
+							loclanes = null;
+						}
+						dist = r.distanceTo;
+					}
+				} else {
+					int di = MapRouteInfoControl.getDirectionInfo();
+					if (di >= 0 && MapRouteInfoControl.isControlVisible()
+							&& di < rh.getRouteDirections().size()) {
+						RouteDirectionInfo next = rh.getRouteDirections().get(di);
+						if (next != null) {
+							loclanes = next.getTurnType().getLanes();
+							// primary = next.getTurnType();
+						}
 					}
-					canvas.restore();
 				}
 			}
-			
-			@Override
-			public boolean updateInfo(DrawSettings drawSettings) {
-				boolean visible = false;
-				int locimminent = -1;
-				int[] loclanes = null;
-				// TurnType primary = null;
-				if ((rh == null || !rh.isFollowingMode()) && trackingUtilities.isMapLinkedToLocation()
-						&& view.getSettings().SHOW_LANES.get()) {
-					RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
-					Location lp = locationProvider.getLastKnownLocation();
-					if(ro != null) {
-						float degree = lp == null || !lp.hasBearing() ? 0 : lp.getBearing();
-						loclanes = RouteResultPreparation.parseTurnLanes(ro, degree / 180 * Math.PI);
-						if(loclanes == null) {
-							loclanes = RouteResultPreparation.parseLanes(ro, degree / 180 * Math.PI);
-						}
-					}
-				} else if (rh != null && rh.isRouteCalculated() ) {
-					if (rh.isFollowingMode() && view.getSettings().SHOW_LANES.get()) {
-						NextDirectionInfo r = rh.getNextRouteDirectionInfo(new NextDirectionInfo(), false);
-						if(r != null && r.directionInfo != null && r.directionInfo.getTurnType() != null) {
-							loclanes  = r.directionInfo.getTurnType().getLanes();
-							// primary = r.directionInfo.getTurnType();
-							locimminent = r.imminent;
-							// Do not show too far 
-							if ((r.distanceTo > 700 && r.directionInfo.getTurnType().isSkipToSpeak()) || r.distanceTo > 1200) {
-								loclanes = null;
-							}
-						}
+			visible = loclanes != null && loclanes.length > 0;
+			if (visible) {
+				if (!Arrays.equals(lanesDrawable.lanes, loclanes) || 
+						(locimminent == 0) != lanesDrawable.imminent) {
+					lanesDrawable.imminent = locimminent == 0;
+					lanesDrawable.lanes = loclanes;
+					lanesDrawable.updateBounds();
+					lanesView.setImageDrawable(null);
+					lanesView.setImageDrawable(lanesDrawable);
+					lanesView.requestLayout();
+					lanesView.invalidate();
+				}
+				if (distChanged(dist, this.dist)) {
+					this.dist = dist;
+					if(dist == 0) {
+						lanesText.setText("");
 					} else {
-						int di = MapRouteInfoControl.getDirectionInfo();
-						if (di >= 0 && MapRouteInfoControl.isControlVisible()
-								&& di < rh.getRouteDirections().size()) {
-							RouteDirectionInfo next = rh.getRouteDirections().get(di);
-							if (next != null) {
-								loclanes = next.getTurnType().getLanes();
-								// primary = next.getTurnType();
-							}
-						}
+						lanesText.setText(OsmAndFormatter.getFormattedDistance(dist, app));
 					}
+					lanesText.invalidate();
 				}
-				visible = loclanes != null && loclanes.length > 0;
-				if (visible) {
-					if (!Arrays.equals(lanes, loclanes)) {
-						lanes = loclanes;
-						requestLayout();
-						invalidate();
-					}
-					if ((locimminent == 0) != imminent) {
-						imminent = (locimminent == 0);
-						invalidate();
-					}
-				}
-				updateVisibility(visible);
-				return true;
 			}
-		};
-		
-		return lanesControl;
-	}
-
-	protected Path straight() {
-		final Path laneStraight = new Path();
-		Matrix pathTransform = new Matrix();
-		pathTransform.postScale(scaleCoefficient / miniCoeff, scaleCoefficient / miniCoeff);
-		TurnPathHelper.calcTurnPath(laneStraight, TurnType.straight(), pathTransform);
-		return laneStraight;
+			updateVisibility(lanesText, visible);
+			updateVisibility(lanesView, visible);
+			return true;
+		}
 	}
 	
+	
+	private static class LanesDrawable extends Drawable {
+		int[] lanes = null; 
+		boolean imminent = false;
+		private Context ctx;
+		private ArrayList<Path> paths = new ArrayList<Path>();
+		private Paint paintBlack;
+		private Path laneStraight;
+		private Paint paintRouteDirection;
+		private float scaleCoefficient;
+		private int height;
+		private int width;
+		private static final float miniCoeff = 2f;
+		
+		public LanesDrawable(Context ctx, float scaleCoefficent) {
+			this.ctx = ctx;
+			this.scaleCoefficient = scaleCoefficent;
+			laneStraight = getPathFromTurnType(paths, TurnType.C, null, scaleCoefficient / miniCoeff);
+			paintBlack = new Paint();
+			paintBlack.setStyle(Style.STROKE);
+			paintBlack.setColor(Color.BLACK);
+			paintBlack.setAntiAlias(true);
+			paintBlack.setStrokeWidth(2.5f);
+			
+			paintRouteDirection = new Paint();
+			paintRouteDirection.setStyle(Style.FILL);
+			paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow));
+			paintRouteDirection.setAntiAlias(true);
+		}
+
+		public void updateBounds() {
+			int w = (int) (72 * scaleCoefficient / miniCoeff);
+			int cnt = lanes != null ? lanes.length : 0 ;
+			width = w * cnt;
+			height = w;
+		}
+		
+		@Override
+		public int getIntrinsicHeight() {
+			return height;
+		}
+		
+		@Override
+		public int getIntrinsicWidth() {
+			return width;
+		}
+
+		@Override
+		public void draw(Canvas canvas) {
+			float w = 72 * scaleCoefficient / miniCoeff;
+			//to change color immediately when needed
+			if (lanes != null && lanes.length > 0) {
+				canvas.save();
+				// canvas.translate((int) (16 * scaleCoefficient), 0);
+				for (int i = 0; i < lanes.length; i++) {
+					int turnType;
+					if ((lanes[i] & 1) == 1) {
+						paintRouteDirection.setColor(imminent ? ctx.getResources().getColor(R.color.nav_arrow_imminent) : 
+							ctx.getResources().getColor(R.color.nav_arrow));
+						turnType = TurnType.getPrimaryTurn(lanes[i]);
+					} else {
+						paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_distant));
+						turnType = TurnType.getPrimaryTurn(lanes[i]); 
+					}
+					Path p = getPathFromTurnType(paths, turnType, laneStraight, scaleCoefficient / miniCoeff);
+					canvas.drawPath(p, paintBlack);
+					canvas.drawPath(p, paintRouteDirection);
+					canvas.translate(w, 0);
+				}
+				canvas.restore();
+			}			
+		}
+
+		@Override
+		public void setAlpha(int alpha) {
+		}
+
+		@Override
+		public void setColorFilter(ColorFilter cf) {
+		}
+
+		@Override
+		public int getOpacity() {
+			return 0;
+		}
+		
+	}
+	
+	
+	public LanesControl createLanesControl(final MapActivity map, final OsmandMapTileView view) {
+		return new LanesControl(map, view);
+	}
+
 	public static class RulerWidget  {
 		
 		private View layout;