From 24af7d973494468661a1131ee206300c34260ba5 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 5 Nov 2014 13:35:47 +0200
Subject: [PATCH 001/138] created layout

---
 OsmAnd/res/layout/dashboard.xml | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 OsmAnd/res/layout/dashboard.xml

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
new file mode 100644
index 0000000000..1a2cb73a52
--- /dev/null
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:padding="8dp"
+			  android:layout_height="match_parent">
+	<LinearLayout android:id="@+id/search"
+				  android:orientation="horizontal"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content">
+
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/home"
+				  android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content">
+
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/map"
+				  android:orientation="vertical"
+				  android:layout_width="wrap_content"
+				  android:layout_height="fill_parent">
+		<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
+			<TextView android:id="@+id/map_name"
+					  android:text="@string/map_Button"
+					  android:layout_width="wrap_content"
+					  android:layout_height="fill_parent"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="wrap_content" android:layout_height="wrap_content">
+		<TextView android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"
+				  android:layout_weight="1"/>
+		<Button android:id="@+id/btn_show_all"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+	</LinearLayout>
+
+	<ListView android:id="@+id/list_favorites"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file

From 80990295c5d3e0e9e07725b8fb4ed425b6a40bf8 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 5 Nov 2014 14:47:42 +0200
Subject: [PATCH 002/138] Added activity

---
 OsmAnd/AndroidManifest.xml                    |  1 +
 OsmAnd/res/layout/dashboard.xml               | 49 ++++++++++++++-----
 .../plus/activities/DashboardActivity.java    | 42 ++++++++++++++++
 3 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 6041398f06..a1a2f78e80 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -67,6 +67,7 @@
 		</activity>
 
 		<activity android:name="net.osmand.plus.activities.HelpActivity" />
+		<activity android:name=".activities.DashboardActivity" />
 
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
 			android:screenOrientation="unspecified" android:launchMode="singleTop">
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 1a2cb73a52..ee578c97de 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -6,46 +6,69 @@
 			  android:padding="8dp"
 			  android:layout_height="match_parent">
 	<LinearLayout android:id="@+id/search"
-				  android:orientation="horizontal"
+				  android:orientation="vertical"
 				  android:layout_width="wrap_content"
 				  android:layout_height="wrap_content">
-
+			<TextView android:text="@string/tip_search"
+					  android:layout_width="fill_parent"
+					  android:gravity="center_horizontal"
+					  android:layout_height="wrap_content"/>
 	</LinearLayout>
 
 	<LinearLayout android:id="@+id/home"
 				  android:orientation="horizontal"
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
-
+		<ImageView android:id="@+id/home_img"
+				   android:layout_width="wrap_content"
+				   android:layout_height="wrap_content"/>
+		<TextView android:text="@string/favorite_home_category"
+				  android:layout_weight="1"
+				  android:layout_width="0dp"
+				  android:layout_height="wrap_content"/>
+		<Button android:text="@string/tip_navigation"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
 	</LinearLayout>
 
-	<LinearLayout android:id="@+id/map"
-				  android:orientation="vertical"
+	<LinearLayout android:orientation="vertical"
 				  android:layout_width="wrap_content"
 				  android:layout_height="fill_parent">
-		<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
+		<LinearLayout android:orientation="horizontal"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/map_name"
 					  android:text="@string/map_Button"
-					  android:layout_width="wrap_content"
-					  android:layout_height="fill_parent"/>
-
+					  android:layout_width="0dp"
+					  android:layout_height="fill_parent"
+					android:layout_weight="1"/>
+			<Button android:id="@+id/show_on_map"
+					android:text="@string/search_shown_on_map"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
 		</LinearLayout>
 
+		<net.osmand.plus.views.OsmAndMapSurfaceView
+				android:id="@+id/MapView"
+				android:layout_width="fill_parent"
+				android:layout_height="200dp"
+				android:contentDescription="@string/map_view"
+				android:visibility="gone" />
 	</LinearLayout>
 
 	<LinearLayout android:orientation="horizontal"
-				  android:layout_width="wrap_content" android:layout_height="wrap_content">
-		<TextView android:layout_width="wrap_content"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content">
+		<TextView android:layout_width="0dp"
 				  android:layout_height="wrap_content"
+				  android:text="@string/my_data_Button"
 				  android:layout_weight="1"/>
 		<Button android:id="@+id/btn_show_all"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
-
 	</LinearLayout>
 
 	<ListView android:id="@+id/list_favorites"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
new file mode 100644
index 0000000000..e267f4d5d4
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -0,0 +1,42 @@
+package net.osmand.plus.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import net.osmand.plus.R;
+import net.osmand.plus.render.MapVectorLayer;
+import net.osmand.plus.sherpafy.StageFavoritesLayer;
+import net.osmand.plus.views.GPXLayer;
+import net.osmand.plus.views.MapTextLayer;
+import net.osmand.plus.views.OsmAndMapSurfaceView;
+import net.osmand.plus.views.OsmandMapTileView;
+
+/**
+ * Created by Denis on 05.11.2014.
+ */
+public class DashboardActivity extends SherlockFragmentActivity {
+
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dashboard);
+		prepareMapView();
+
+	}
+
+	private void prepareMapView() {
+		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
+		OsmandMapTileView osmandMapTileView = surf.getMapView();
+		osmandMapTileView.getView().setVisibility(View.VISIBLE);
+		osmandMapTileView.removeAllLayers();
+		MapVectorLayer mapVectorLayer = new MapVectorLayer(null);
+		MapTextLayer mapTextLayer = new MapTextLayer();
+		mapTextLayer.setAlwaysVisible(true);
+		// 5.95 all labels
+		osmandMapTileView.addLayer(mapTextLayer, 5.95f);
+		osmandMapTileView.addLayer(mapVectorLayer, 0.5f);
+		osmandMapTileView.setMainLayer(mapVectorLayer);
+		mapVectorLayer.setVisible(true);
+	}
+}

From 29b6cd520b06ea3c8c5c81609048d02dc913b69f Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 5 Nov 2014 17:04:11 +0200
Subject: [PATCH 003/138] Updated layout

---
 OsmAnd/res/layout/dashboard.xml               | 21 ++++++++++++++-----
 .../plus/activities/DashboardActivity.java    |  3 +++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index ee578c97de..d3de45695a 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -4,11 +4,14 @@
 			  android:orientation="vertical"
 			  android:layout_width="match_parent"
 			  android:padding="8dp"
-			  android:layout_height="match_parent">
+			  android:layout_height="match_parent"
+			  android:background="@drawable/background">
 	<LinearLayout android:id="@+id/search"
 				  android:orientation="vertical"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content">
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content"
+				  android:background="@color/color_white"
+				  android:layout_marginBottom="8dp">
 			<TextView android:text="@string/tip_search"
 					  android:layout_width="fill_parent"
 					  android:gravity="center_horizontal"
@@ -17,6 +20,8 @@
 
 	<LinearLayout android:id="@+id/home"
 				  android:orientation="horizontal"
+				  android:background="@color/color_white"
+				  android:layout_marginBottom="8dp"
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
 		<ImageView android:id="@+id/home_img"
@@ -32,8 +37,10 @@
 	</LinearLayout>
 
 	<LinearLayout android:orientation="vertical"
-				  android:layout_width="wrap_content"
-				  android:layout_height="fill_parent">
+				  android:background="@color/color_white"
+				  android:layout_marginBottom="8dp"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content">
 		<LinearLayout android:orientation="horizontal"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content">
@@ -57,6 +64,8 @@
 	</LinearLayout>
 
 	<LinearLayout android:orientation="horizontal"
+				  android:background="@color/color_white"
+				  android:layout_marginBottom="8dp"
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
 		<TextView android:layout_width="0dp"
@@ -64,11 +73,13 @@
 				  android:text="@string/my_data_Button"
 				  android:layout_weight="1"/>
 		<Button android:id="@+id/btn_show_all"
+				android:text="show all"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 	</LinearLayout>
 
 	<ListView android:id="@+id/list_favorites"
+			  android:background="@color/color_white"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index e267f4d5d4..c993b57762 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -2,6 +2,7 @@ package net.osmand.plus.activities;
 
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import net.osmand.plus.R;
 import net.osmand.plus.render.MapVectorLayer;
@@ -20,9 +21,11 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.dashboard);
 		prepareMapView();
 
+
 	}
 
 	private void prepareMapView() {

From 37ec1ff1ce2998c0806204820d17fd546bad2732 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 6 Nov 2014 18:12:28 +0200
Subject: [PATCH 004/138] Updated layouts. Created styles.

---
 OsmAnd/res/layout/dashboard.xml | 85 ++++++++++++++++++++++++---------
 OsmAnd/res/values/strings.xml   |  2 +
 OsmAnd/res/values/styles.xml    | 32 ++++++++++++-
 3 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index d3de45695a..6cadfb9148 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -6,6 +6,7 @@
 			  android:padding="8dp"
 			  android:layout_height="match_parent"
 			  android:background="@drawable/background">
+
 	<LinearLayout android:id="@+id/search"
 				  android:orientation="vertical"
 				  android:layout_width="fill_parent"
@@ -13,9 +14,54 @@
 				  android:background="@color/color_white"
 				  android:layout_marginBottom="8dp">
 			<TextView android:text="@string/tip_search"
+					  android:layout_width="wrap_content"
+					  android:layout_gravity="center_horizontal"
+					  android:gravity="center_vertical"
+					  android:textColor="@color/color_black"
+					  android:textSize="16sp"
+					  android:layout_height="30dp"/>
+		<LinearLayout android:orientation="horizontal"
 					  android:layout_width="fill_parent"
-					  android:gravity="center_horizontal"
-					  android:layout_height="wrap_content"/>
+					  android:background="@color/group_background"
+					  android:layout_height="80dp">
+			<Button android:id="@+id/poi"
+					android:text="@string/poi"
+					android:drawableTop="@drawable/ic_action_info_light"
+					android:layout_marginRight="1dp"
+					style="@style/DashboardSearchButton"/>
+			<Button android:id="@+id/address"
+					android:text="@string/address"
+					android:layout_marginRight="1dp"
+					android:layout_marginLeft="1dp"
+					android:drawableTop="@drawable/ic_action_home_light"
+					style="@style/DashboardSearchButton"/>
+			<Button android:id="@+id/coord"
+					android:text="@string/coordinates"
+					android:layout_marginLeft="1dp"
+					android:drawableTop="@drawable/ic_action_marker_light"
+					style="@style/DashboardSearchButton"/>
+		</LinearLayout>
+		<LinearLayout android:orientation="horizontal"
+					  android:layout_width="fill_parent"
+					  android:background="@color/group_background"
+					  android:layout_height="80dp">
+			<Button android:id="@+id/fav"
+					android:text="@string/my_favorites"
+					android:drawableTop="@drawable/ic_action_fav_light"
+					android:layout_marginRight="1dp"
+					style="@style/DashboardSearchButton"/>
+			<Button android:id="@+id/history"
+					android:text="@string/history"
+					android:drawableTop="@drawable/ic_action_fav_light"
+					android:layout_marginRight="1dp"
+					android:layout_marginLeft="1dp"
+					style="@style/DashboardSearchButton"/>
+			<Button android:id="@+id/transport"
+					android:text="@string/rendering_category_transport"
+					android:drawableTop="@drawable/ic_action_bus_light"
+					android:layout_marginLeft="1dp"
+					style="@style/DashboardSearchButton"/>
+		</LinearLayout>
 	</LinearLayout>
 
 	<LinearLayout android:id="@+id/home"
@@ -25,15 +71,15 @@
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
 		<ImageView android:id="@+id/home_img"
+				   android:layout_gravity="center_vertical"
+				   android:src="@drawable/ic_action_home_light"
 				   android:layout_width="wrap_content"
 				   android:layout_height="wrap_content"/>
 		<TextView android:text="@string/favorite_home_category"
-				  android:layout_weight="1"
-				  android:layout_width="0dp"
-				  android:layout_height="wrap_content"/>
-		<Button android:text="@string/tip_navigation"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				  style="@style/DashboardSubHeader"/>
+		<Button android:id="@+id/navigation"
+				android:text="@string/tip_navigation"
+				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
 	<LinearLayout android:orientation="vertical"
@@ -44,21 +90,17 @@
 		<LinearLayout android:orientation="horizontal"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content">
-			<TextView android:id="@+id/map_name"
-					  android:text="@string/map_Button"
-					  android:layout_width="0dp"
-					  android:layout_height="fill_parent"
-					android:layout_weight="1"/>
+			<TextView android:text="@string/map_Button"
+					  style="@style/DashboardSubHeader"/>
 			<Button android:id="@+id/show_on_map"
 					android:text="@string/search_shown_on_map"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
+					style="@style/DashboardGeneralButton"/>
 		</LinearLayout>
 
 		<net.osmand.plus.views.OsmAndMapSurfaceView
 				android:id="@+id/MapView"
 				android:layout_width="fill_parent"
-				android:layout_height="200dp"
+				android:layout_height="160dp"
 				android:contentDescription="@string/map_view"
 				android:visibility="gone" />
 	</LinearLayout>
@@ -68,14 +110,11 @@
 				  android:layout_marginBottom="8dp"
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
-		<TextView android:layout_width="0dp"
-				  android:layout_height="wrap_content"
-				  android:text="@string/my_data_Button"
-				  android:layout_weight="1"/>
+		<TextView android:text="@string/my_data_Button"
+				  style="@style/DashboardSubHeader"/>
 		<Button android:id="@+id/btn_show_all"
-				android:text="show all"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:text="@string/show_all"
+				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
 	<ListView android:id="@+id/list_favorites"
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 4b9bc5e9e6..7d3f59cb73 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="show_all">SHOW ALL</string>
+	<string name="coordinates">Coordinates</string>
     <string name="wake_on_voice">Turn on the screen</string>
     <string name="wake_on_voice_descr">Turn on the phone screen when approaching a turn</string>
     <string name="select_impassable_road">Select on map</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index e2b218fdb4..144a9e4f56 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -7,8 +7,36 @@
     	<item name="android:windowContentOverlay">@null</item>
     	<item name="android:backgroundDimEnabled">false</item>
 	</style>
-		
-	
+
+	<style name="DashboardSubHeader">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:layout_height">fill_parent</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:textColor">@color/color_black</item>
+		<item name="android:layout_marginLeft">10dp</item>
+		<item name="android:textSize">16sp</item>
+	</style>
+
+	<style name="DashboardGeneralButton">
+		<item name="android:layout_marginRight">10dp</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textColor">@color/gpx_time_span_color</item>
+		<item name="android:background">@color/color_white</item>
+	</style>
+
+	<style name="DashboardSearchButton">
+		<item name="android:paddingTop">10dp</item>
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textColor">@color/color_black</item>
+		<item name="android:background">@color/color_white</item>
+		<item name="android:layout_marginTop">2dp</item>
+	</style>
+
 	<style name="ListText">
         <item name="android:textSize">20sp</item>
     </style>

From c35f3f2525c2e4af38171d6af92bdca8fb3d9149 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 7 Nov 2014 15:27:44 +0200
Subject: [PATCH 005/138] Dashbord will be called instead of my favorites

---
 OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index c828750617..5084673c42 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -240,7 +240,7 @@ public class MainMenuActivity extends Activity {
 		favouritesButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				final Intent favorites = new Intent(activity, DashboardActivity.class);
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 				activity.startActivity(favorites);
 			}

From 6838aae693bcad39b772472fc9c32a81e8e6c24a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 11 Nov 2014 11:05:48 +0200
Subject: [PATCH 006/138] updated view

---
 OsmAnd/res/layout/dashboard.xml               | 28 ++---------
 OsmAnd/res/values/strings.xml                 |  2 +
 .../plus/activities/DashboardActivity.java    | 48 ++++++++++++++++++-
 .../plus/activities/MainMenuActivity.java     |  2 +-
 4 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 6cadfb9148..f3380d7e89 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -13,11 +13,11 @@
 				  android:layout_height="wrap_content"
 				  android:background="@color/color_white"
 				  android:layout_marginBottom="8dp">
-			<TextView android:text="@string/tip_search"
+			<TextView android:text="@string/search_for"
 					  android:layout_width="wrap_content"
-					  android:layout_gravity="center_horizontal"
 					  android:gravity="center_vertical"
 					  android:textColor="@color/color_black"
+					  android:layout_marginLeft="10dp"
 					  android:textSize="16sp"
 					  android:layout_height="30dp"/>
 		<LinearLayout android:orientation="horizontal"
@@ -64,24 +64,6 @@
 		</LinearLayout>
 	</LinearLayout>
 
-	<LinearLayout android:id="@+id/home"
-				  android:orientation="horizontal"
-				  android:background="@color/color_white"
-				  android:layout_marginBottom="8dp"
-				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content">
-		<ImageView android:id="@+id/home_img"
-				   android:layout_gravity="center_vertical"
-				   android:src="@drawable/ic_action_home_light"
-				   android:layout_width="wrap_content"
-				   android:layout_height="wrap_content"/>
-		<TextView android:text="@string/favorite_home_category"
-				  style="@style/DashboardSubHeader"/>
-		<Button android:id="@+id/navigation"
-				android:text="@string/tip_navigation"
-				style="@style/DashboardGeneralButton"/>
-	</LinearLayout>
-
 	<LinearLayout android:orientation="vertical"
 				  android:background="@color/color_white"
 				  android:layout_marginBottom="8dp"
@@ -90,9 +72,9 @@
 		<LinearLayout android:orientation="horizontal"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content">
-			<TextView android:text="@string/map_Button"
+			<TextView android:text="@string/show_map"
 					  style="@style/DashboardSubHeader"/>
-			<Button android:id="@+id/show_on_map"
+			<Button android:id="@+id/show_map"
 					android:text="@string/search_shown_on_map"
 					style="@style/DashboardGeneralButton"/>
 		</LinearLayout>
@@ -112,7 +94,7 @@
 				  android:layout_height="wrap_content">
 		<TextView android:text="@string/my_data_Button"
 				  style="@style/DashboardSubHeader"/>
-		<Button android:id="@+id/btn_show_all"
+		<Button android:id="@+id/show_all"
 				android:text="@string/show_all"
 				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 7d3f59cb73..0d8cf081cc 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="search_for">Search for</string>
+	<string name="show_map">SHOW MAP</string>
 	<string name="show_all">SHOW ALL</string>
 	<string name="coordinates">Coordinates</string>
     <string name="wake_on_voice">Turn on the screen</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index c993b57762..9fe7712676 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -1,9 +1,17 @@
 package net.osmand.plus.activities;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
+import android.widget.Button;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.render.MapVectorLayer;
 import net.osmand.plus.sherpafy.StageFavoritesLayer;
@@ -16,16 +24,43 @@ import net.osmand.plus.views.OsmandMapTileView;
  * Created by Denis on 05.11.2014.
  */
 public class DashboardActivity extends SherlockFragmentActivity {
-
+	public static final boolean TIPS_AND_TRICKS = false;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.dashboard);
+		getSupportActionBar().setTitle(R.string.app_version);
+		ColorDrawable color = new ColorDrawable(Color.parseColor("#FF9305"));
+		getSupportActionBar().setBackgroundDrawable(color);
+		getSupportActionBar().setIcon(android.R.color.transparent);
 		prepareMapView();
+		setupButtons();
 
+	}
 
+	private void setupButtons(){
+		final Activity activity = this;
+		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+
+		Button showMap = (Button) findViewById(R.id.show_map);
+		showMap.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
+				activity.startActivityForResult(mapIndent, 0);
+			}
+		});
+
+		Button showFavorites = (Button) findViewById(R.id.show_all);
+		showFavorites.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				activity.startActivity(favorites);
+			}
+		});
 	}
 
 	private void prepareMapView() {
@@ -42,4 +77,13 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		osmandMapTileView.setMainLayer(mapVectorLayer);
 		mapVectorLayer.setVisible(true);
 	}
+
+	private OsmandApplication getMyApplication() {
+		return (OsmandApplication) getApplication();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		return true;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index c828750617..5084673c42 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -240,7 +240,7 @@ public class MainMenuActivity extends Activity {
 		favouritesButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				final Intent favorites = new Intent(activity, DashboardActivity.class);
 				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
 				activity.startActivity(favorites);
 			}

From 51840ae83303438dd3c84a713fb2116a26fef80f Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 11 Nov 2014 16:01:56 +0200
Subject: [PATCH 007/138] Added background

---
 OsmAnd/res/drawable-hdpi/bg_cardui.9.png   | Bin 0 -> 1426 bytes
 OsmAnd/res/drawable-mdpi/bg_cardui.9.png   | Bin 0 -> 1385 bytes
 OsmAnd/res/drawable-xhdpi/bg_cardui.9.png  | Bin 0 -> 1468 bytes
 OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png | Bin 0 -> 1490 bytes
 OsmAnd/res/layout/dashboard.xml            | 181 +++++++++++----------
 5 files changed, 93 insertions(+), 88 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-mdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png

diff --git a/OsmAnd/res/drawable-hdpi/bg_cardui.9.png b/OsmAnd/res/drawable-hdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c589b465f09ae9c662764cfee8472bfe3376bbbc
GIT binary patch
literal 1426
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2Fxn4K0lg%v{YZEsYEfT}>Qa
zOq|_}EM3jqEKMw2E#Z1S^NLFn^O93xc4q?ZhU#^}tJli8C^fMpzbGU>KL?fy0y6ST
z@{2R_3lyB4!LhEO5uTZsl3!k|35q6&uU%4$GRsm^+=}vZ6~N(am5Id-hDIhSmIelC
zx(3Mx#=6NSCdRr+rWWS9rsihmi54biX$A&~N>KeN<c6O<&{6uJ#DbJ~U_!tY31Y&t
z0+0jGOsRRm98?6%Dl&WX-!d>TZt`?-45_$vCfwVP*^p<hMQdhj$i~E@j26!4Po*F4
z<1TCqQ)balnDn4yM^WtTGNFKtDXNz}{|McF{Cw9sKcU&XSI&+-T3!A?!2WO9g%zf!
zDubR~ThUa+ur8q?J7Hr_OnJjxMh}H~w#?QnYag?5PH<?pI3iZD?2gEcs%26e*d)5j
zp6(PrV7=hd+|7&9ndaOpKa`O0EAm?J)47|Iyd8?Ka9=rnHLG;*%^W!=j{KJ#CtrX1
zwMYNGe%Z65dM9cY{CFCz8!&xE`0KB~^g=n9?mz!~^juTr>CBVPdbaLwKR!9nuwl-x
zkH;nA_kK6GsCECVkte4qvfxO`Y!}mp$WwO4KM!c|P1&jYXsbn0z-o;x9ciZpGmN-c
zO`4hlYlK23I2f-yAX4^&Rq9T0V@mf84l!P~q6HgTQrf3UukuOWX})PuthVFMw{bq-
zZ!l?}_MRHQ|2wN==}E68vQ<)T4_C5@WWQHVo|EyEef?hBbV;3G+asFWl_S$myk<T9
zWm4*#Nhd>?qJK{5vgyyAqN4YE&cw6XR_zPEc+b7I?!$ZIPM>*~lwAvV|G&yRZ_Rt#
i$oBuw|EKO_kzhD(99E!vMllOiN_x8bxvX<aXaWGkAOqR}

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/bg_cardui.9.png b/OsmAnd/res/drawable-mdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e206978a9fdc08b780a44d2d59eb8ebbb2e36441
GIT binary patch
literal 1385
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2FxIjGfHfEZxj3EsYEfT}_-^
z4P2d#T^-$=P23F4UCm*7J@bl767!N%VRmN%?S|@g#jDrKxhOTUB)=#mKR*YS3Ia0n
zOY(~|@(UE4ox!oLpb?&#my%yztO<%Hh_78zi!#enQ{0O3a}~hhY?X<{4TeT0DV7EX
zX}Si<2FAL{CML$ZNv0O&x~Ar4=7|<2W@!cniAqrYDddKqKG0G6pu~cdcwj=n6bWL&
zvjUI<&rGR#z#LQr%qs7XtgT>RVC?jCaSW-rb!1wg-(druw$~~hwjWvqra$ny)3`e9
zuByZ%rVcg5i<3?n?+>4(aCXwvywE>4S0>M1X4m;<W|VpGW9wgwm9PJseMj_g%~IKd
zkT8yNhKOFNZ?hYWrKV&%B(OJx_69s@VB_MEP>ryTi*}f{vc)@twQ^ZVSj8TVU4P!K
zTf=c?q0kPszk1oM|GM@t89$luMe*fhoAc}M{XTy~;q|V4&uc5|Hx_G@nWuX?=yrdw
zleCD+o*(@_vFwWF_epa5BaZBIk>>SS@;3S#!}8C^)IWOaeLA2KzO2dph*sxz$EQ!t
z4=fCG^mI20D)Dz;_#sa^U{e6&3&FE~GQG=wbL26p2JBgUZJJcI-X`a?<pup73}*U$
z=2}}zM5F?yUsPIqwA#g{LrhJGeVNcJ`&}8&YvURczn#*!o*H>?Qe&|4hbiArD(Oc{
zy;}ZF{`X4p`{q^?JsK?or8mgWkZEGcdhC^=%x3>?o}}i2-|wav8g?y~p3C;o{O;`P
r<!mqB$<$2doX_?uYkRLeBOAlgIsXOs*dJH~D*QZM{an^LB{Ts5Cp_py

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de19064b58ff8ca7e181e8a2513b5bb4f0041bc
GIT binary patch
literal 1468
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2Fyy%#BQqj9kntEsYEfT}>Pf
z%?z9jOkEsJTr5moES+F_J@bl767!N%VRmN%?S|@g#;e!LxhOTUB)=#mKR*YS3Ia0n
zOY(~|@(UE4ox!oLpb?&#my%yztO<%Hh_78zi!#enQ{0O3a}~hhY?X<{4TeT0DV7EX
zX}Si<2FAL{CML$ZNv0O&x~Ar4=7|<2W@!cniAqrYDddKqKG0G6pu~cdcwj=n6bWL&
zvjUI<&rGR#z#LQr%qrJwrxY?UFy8TWaSW-rbtF92@2~++-()^tXATvIISs)I2cJHW
ztG*fcy-i?!0asq&S_KyGUfz>WmU?;z)hX3RZN2gD)6&kjO<K|#^AxX3ay?hv$ndrI
zf2gTI$%}Bd<1CVV6WbiOR!@7OJT)WuNvM-5hm)?rq}3b~**TJYG+P@cB(gXad1{?p
z)4(N??6s0VhIPUd!yx}Hg$&<UA7QeJe%1Mn!}yTm!;+mbaci%?uFigI{EcT`y7jhn
z`{(w>A6K17+P*~i(3AoPi#Q#z=^|^6^&I^6=J-Fob61Y`PLf*qsiPq5`d3*oo^Q$Z
z;>TB;&J$6(ZC&UV9QAebwJLk_$6IoLC-qn^KOTNa`r+NZ@pa!<RQs*hRQzMp8FjwN
zd3*8MlJg5MW!>qBUH_KFZ4=)Vl}|2{I2)6%isT>MKfy^QGC4l;)QX*k4So{aCu&Ws
zE&e0=^7g$AQ4zcHeFbk%pD((^+Io3)$gO3Wa^4;%-#bnyyK-#Guda=eYs0Q@d1V!x
z>RV^7$K0B=xLs?Fk^1MKf0~M3z72TvymDJ|^*8U3nSQq!l|KG=vAx?-lfCqoR^h8D
z#S<94t=eDct`LfimJXbFTRHL7mqYR;&2z7nte7cx`TMe85As8WG+ultJd=KOea-0_
a4g&`6wS5vIujO(;<*BEupUXO@geCx>X%=<>

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..688a197b3aa5f25028aff5dbd1e21469cd3a30bf
GIT binary patch
literal 1490
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2BFY4V;{u-JHxUEsYEfT}_<K
z&0Snw&D_ilOe_o?4cuUQJ@bl767!N%VRmN%?S|@g#H-iJxhOTUB)=#mKR*YS3Ia0n
zOY(~|@(UE4ox!oLpb?&#my%yztO<%Hh_78zi!#enQ{0O3a}~hhY?X<{4TeT0DV7EX
zX}Si<2FAL{CML$ZNv0O&x~Ar4=7|<2W@!cniAqrYDddKqKG0G6pu~cdcwj=n6bWL&
zvjUI<&rGR#z#LQr%qmABl@u5l7(aQsIEGZ*Iy3#O-ysKq25awwK}iOR$6C7M_Eb3Q
z+qCg7=@dWoSmM63u>OKZYyJc$MX%lGX6Vl3+5Pus$BvUNxz@(<>DJcP4iC&tW;@3w
z|46m{>9lojqbs|NS=51&i`*@&4t$|$>$n!ooSB|Fv7OZ+K|u9c0^_s&3UNv7GSe75
zrF=pdr>LX~?KqIgXu#g;V_}idSNz}@$CO6qk8fvbxNFEx5uS4SU_yc2{PXgYR4UJI
z(z%#(!SwF(=S$pw9b1?D$Ar5mQ971e)$Qe^=8qLMo8#6m-*w1gulXhO2kSmwPSSqT
zW8`G%_L8^#Fn7t9b=f?Z)U7v}*C~Z>k&&AH)N--vWx3`zC+_{|R1JwdaNFh8_ut#?
zOfTIqjk)a;xyk&z-_^YB>uVMSio_P#Z<?g(EtUU};lh_jt))rQI`_@AEDl&mh{&kB
zwRQe@T6!bv@5xsm&pi(|i_lwrHR}<x>u$~O$`4N!M*R_ado=0e6QF>5*pHp}vqU==
zt&N<hwv26hm`eIv*<QEnp$CE93C-5;H`_ATX!FfCc{^k5mS_Gt=vdPGJ^sVby^p7G
zrcT+g{Bz0SeVYC%y8MN@GADcPbyR5y8;IU@PGjD+%dudKZfLcNv`=`ZW2!mFB5jt_
uTsIe8TDSJo^V;|OUw`=iE&f?_10zG>-%GE`d}h>wN?A`=KbLh*2~7a1R~$G1

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index f3380d7e89..c4887595b5 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent"
+			xmlns:android="http://schemas.android.com/apk/res/android">
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:padding="8dp"
-			  android:layout_height="match_parent"
-			  android:background="@drawable/background">
+	<LinearLayout android:orientation="vertical"
+				  android:layout_width="match_parent"
+				  android:padding="8dp"
+				  android:layout_height="match_parent"
+				  android:background="@drawable/background">
 
-	<LinearLayout android:id="@+id/search"
-				  android:orientation="vertical"
-				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content"
-				  android:background="@color/color_white"
-				  android:layout_marginBottom="8dp">
+		<LinearLayout android:id="@+id/search"
+					  android:orientation="vertical"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content"
+					  android:background="@drawable/bg_cardui"
+					  android:layout_marginBottom="8dp">
 			<TextView android:text="@string/search_for"
 					  android:layout_width="wrap_content"
 					  android:gravity="center_vertical"
@@ -20,87 +21,91 @@
 					  android:layout_marginLeft="10dp"
 					  android:textSize="16sp"
 					  android:layout_height="30dp"/>
-		<LinearLayout android:orientation="horizontal"
-					  android:layout_width="fill_parent"
-					  android:background="@color/group_background"
-					  android:layout_height="80dp">
-			<Button android:id="@+id/poi"
-					android:text="@string/poi"
-					android:drawableTop="@drawable/ic_action_info_light"
-					android:layout_marginRight="1dp"
-					style="@style/DashboardSearchButton"/>
-			<Button android:id="@+id/address"
-					android:text="@string/address"
-					android:layout_marginRight="1dp"
-					android:layout_marginLeft="1dp"
-					android:drawableTop="@drawable/ic_action_home_light"
-					style="@style/DashboardSearchButton"/>
-			<Button android:id="@+id/coord"
-					android:text="@string/coordinates"
-					android:layout_marginLeft="1dp"
-					android:drawableTop="@drawable/ic_action_marker_light"
-					style="@style/DashboardSearchButton"/>
+			<LinearLayout android:orientation="horizontal"
+						  android:layout_width="fill_parent"
+						  android:background="@color/group_background"
+						  android:layout_height="80dp">
+				<Button android:id="@+id/poi"
+						android:text="@string/poi"
+						android:drawableTop="@drawable/ic_action_info_light"
+						android:layout_marginRight="1dp"
+						style="@style/DashboardSearchButton"/>
+				<Button android:id="@+id/address"
+						android:text="@string/address"
+						android:layout_marginRight="1dp"
+						android:layout_marginLeft="1dp"
+						android:drawableTop="@drawable/ic_action_home_light"
+						style="@style/DashboardSearchButton"/>
+				<Button android:id="@+id/coord"
+						android:text="@string/coordinates"
+						android:layout_marginLeft="1dp"
+						android:drawableTop="@drawable/ic_action_marker_light"
+						style="@style/DashboardSearchButton"/>
+			</LinearLayout>
+			<LinearLayout android:orientation="horizontal"
+						  android:layout_width="fill_parent"
+						  android:background="@color/group_background"
+						  android:layout_height="80dp">
+				<Button android:id="@+id/fav"
+						android:text="@string/my_favorites"
+						android:drawableTop="@drawable/ic_action_fav_light"
+						android:layout_marginRight="1dp"
+						style="@style/DashboardSearchButton"/>
+				<Button android:id="@+id/history"
+						android:text="@string/history"
+						android:drawableTop="@drawable/ic_action_fav_light"
+						android:layout_marginRight="1dp"
+						android:layout_marginLeft="1dp"
+						style="@style/DashboardSearchButton"/>
+				<Button android:id="@+id/transport"
+						android:text="@string/rendering_category_transport"
+						android:drawableTop="@drawable/ic_action_bus_light"
+						android:layout_marginLeft="1dp"
+						style="@style/DashboardSearchButton"/>
+			</LinearLayout>
 		</LinearLayout>
-		<LinearLayout android:orientation="horizontal"
-					  android:layout_width="fill_parent"
-					  android:background="@color/group_background"
-					  android:layout_height="80dp">
-			<Button android:id="@+id/fav"
-					android:text="@string/my_favorites"
-					android:drawableTop="@drawable/ic_action_fav_light"
-					android:layout_marginRight="1dp"
-					style="@style/DashboardSearchButton"/>
-			<Button android:id="@+id/history"
-					android:text="@string/history"
-					android:drawableTop="@drawable/ic_action_fav_light"
-					android:layout_marginRight="1dp"
-					android:layout_marginLeft="1dp"
-					style="@style/DashboardSearchButton"/>
-			<Button android:id="@+id/transport"
-					android:text="@string/rendering_category_transport"
-					android:drawableTop="@drawable/ic_action_bus_light"
-					android:layout_marginLeft="1dp"
-					style="@style/DashboardSearchButton"/>
-		</LinearLayout>
-	</LinearLayout>
 
-	<LinearLayout android:orientation="vertical"
-				  android:background="@color/color_white"
-				  android:layout_marginBottom="8dp"
-				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content">
-		<LinearLayout android:orientation="horizontal"
+		<LinearLayout android:orientation="vertical"
+					  android:background="@drawable/bg_cardui"
+					  android:layout_marginBottom="8dp"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content">
-			<TextView android:text="@string/show_map"
-					  style="@style/DashboardSubHeader"/>
-			<Button android:id="@+id/show_map"
-					android:text="@string/search_shown_on_map"
-					style="@style/DashboardGeneralButton"/>
+			<LinearLayout android:orientation="horizontal"
+						  android:layout_width="fill_parent"
+						  android:layout_height="wrap_content">
+				<TextView android:text="@string/map_Button"
+						  style="@style/DashboardSubHeader"/>
+				<Button android:id="@+id/show_map"
+						android:text="@string/show_map"
+						style="@style/DashboardGeneralButton"/>
+			</LinearLayout>
+
+			<net.osmand.plus.views.OsmAndMapSurfaceView
+					android:id="@+id/MapView"
+					android:layout_width="fill_parent"
+					android:layout_height="160dp"
+					android:contentDescription="@string/map_view"
+					android:visibility="gone"/>
 		</LinearLayout>
 
-		<net.osmand.plus.views.OsmAndMapSurfaceView
-				android:id="@+id/MapView"
-				android:layout_width="fill_parent"
-				android:layout_height="160dp"
-				android:contentDescription="@string/map_view"
-				android:visibility="gone" />
-	</LinearLayout>
+		<LinearLayout android:background="@drawable/bg_cardui"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content"
+					  android:orientation="vertical">
+			<LinearLayout android:orientation="horizontal"
+						  android:layout_width="fill_parent"
+						  android:layout_height="wrap_content">
+				<TextView android:text="@string/my_data_Button"
+						  style="@style/DashboardSubHeader"/>
+				<Button android:id="@+id/show_all"
+						android:text="@string/show_all"
+						style="@style/DashboardGeneralButton"/>
+			</LinearLayout>
 
-	<LinearLayout android:orientation="horizontal"
-				  android:background="@color/color_white"
-				  android:layout_marginBottom="8dp"
-				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content">
-		<TextView android:text="@string/my_data_Button"
-				  style="@style/DashboardSubHeader"/>
-		<Button android:id="@+id/show_all"
-				android:text="@string/show_all"
-				style="@style/DashboardGeneralButton"/>
-	</LinearLayout>
+			<ListView android:id="@+id/list_favorites"
+					  android:layout_width="fill_parent"
+					  android:layout_height="wrap_content"/>
+		</LinearLayout>
 
-	<ListView android:id="@+id/list_favorites"
-			  android:background="@color/color_white"
-			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file

From 9970816739232c9f90d427f0283382071c2b605c Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 11 Nov 2014 20:19:12 +0200
Subject: [PATCH 008/138] Updated view

---
 OsmAnd/res/layout/dashboard.xml               | 30 +++++----
 OsmAnd/res/values/styles.xml                  |  4 +-
 .../plus/activities/DashboardActivity.java    | 61 ++++++++++++++++---
 3 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index c4887595b5..2935d2912c 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent"
+<ScrollView android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:background="@drawable/background"
+
 			xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<LinearLayout android:orientation="vertical"
 				  android:layout_width="match_parent"
-				  android:padding="8dp"
-				  android:layout_height="match_parent"
-				  android:background="@drawable/background">
+				  android:layout_height="wrap_content">
 
 		<LinearLayout android:id="@+id/search"
 					  android:orientation="vertical"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content"
 					  android:background="@drawable/bg_cardui"
-					  android:layout_marginBottom="8dp">
+					  android:layout_marginBottom="6dp">
 			<TextView android:text="@string/search_for"
-					  android:layout_width="wrap_content"
-					  android:gravity="center_vertical"
-					  android:textColor="@color/color_black"
-					  android:layout_marginLeft="10dp"
-					  android:textSize="16sp"
-					  android:layout_height="30dp"/>
+					  style="@style/DashboardSubHeader"
+					  android:layout_height="40dp"
+					  android:layout_width="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
 						  android:background="@color/group_background"
-						  android:layout_height="80dp">
+						  android:layout_height="90dp">
 				<Button android:id="@+id/poi"
 						android:text="@string/poi"
 						android:drawableTop="@drawable/ic_action_info_light"
@@ -45,7 +43,7 @@
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
 						  android:background="@color/group_background"
-						  android:layout_height="80dp">
+						  android:layout_height="90dp">
 				<Button android:id="@+id/fav"
 						android:text="@string/my_favorites"
 						android:drawableTop="@drawable/ic_action_fav_light"
@@ -67,12 +65,12 @@
 
 		<LinearLayout android:orientation="vertical"
 					  android:background="@drawable/bg_cardui"
-					  android:layout_marginBottom="8dp"
+					  android:layout_marginBottom="6dp"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content">
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:layout_height="wrap_content">
+						  android:layout_height="40dp">
 				<TextView android:text="@string/map_Button"
 						  style="@style/DashboardSubHeader"/>
 				<Button android:id="@+id/show_map"
@@ -94,7 +92,7 @@
 					  android:orientation="vertical">
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:layout_height="wrap_content">
+						  android:layout_height="40dp">
 				<TextView android:text="@string/my_data_Button"
 						  style="@style/DashboardSubHeader"/>
 				<Button android:id="@+id/show_all"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 144a9e4f56..529f99f921 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -14,12 +14,12 @@
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:gravity">center_vertical</item>
 		<item name="android:textColor">@color/color_black</item>
-		<item name="android:layout_marginLeft">10dp</item>
+		<item name="android:layout_marginLeft">16dp</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="DashboardGeneralButton">
-		<item name="android:layout_marginRight">10dp</item>
+		<item name="android:layout_marginRight">16dp</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:textColor">@color/gpx_time_span_color</item>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 9fe7712676..f676729228 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -3,22 +3,28 @@ package net.osmand.plus.activities;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.style.ForegroundColorSpan;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Window;
-import android.widget.Button;
+import android.view.ViewGroup;
+import android.widget.*;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
-import net.osmand.plus.OsmAndAppCustomization;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.plus.*;
+import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.render.MapVectorLayer;
-import net.osmand.plus.sherpafy.StageFavoritesLayer;
-import net.osmand.plus.views.GPXLayer;
 import net.osmand.plus.views.MapTextLayer;
 import net.osmand.plus.views.OsmAndMapSurfaceView;
 import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.util.MapUtils;
+
+import java.util.List;
 
 /**
  * Created by Denis on 05.11.2014.
@@ -26,6 +32,7 @@ import net.osmand.plus.views.OsmandMapTileView;
 public class DashboardActivity extends SherlockFragmentActivity {
 	public static final boolean TIPS_AND_TRICKS = false;
 
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -34,11 +41,47 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		ColorDrawable color = new ColorDrawable(Color.parseColor("#FF9305"));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
-		prepareMapView();
+		setupMapView();
 		setupButtons();
+		setupFavorites();
 
 	}
 
+	private void setupFavorites(){
+		final FavouritesDbHelper helper = getMyApplication().getFavorites();
+		final List<FavouritePoint> points = helper.getFavouritePoints();
+		ArrayAdapter<FavouritePoint> adapter = new ArrayAdapter<FavouritePoint>(this, R.layout.favourites_list_item, 0, points) {
+			@Override
+			public View getView(int position, View convertView, ViewGroup parent) {
+				View view = convertView;
+				if (view == null) {
+					LayoutInflater inflater = getLayoutInflater();
+					view = inflater.inflate(R.layout.favourites_list_item, parent, false);
+				}
+
+				TextView label = (TextView) view.findViewById(R.id.favourite_label);
+				ImageView icon = (ImageView) view.findViewById(R.id.favourite_icon);
+				final FavouritePoint model = points.get(position);
+				view.setTag(model);
+				icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, model.getColor()));
+				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+				int dist = (int) (MapUtils.getDistance(model.getLatitude(), model.getLongitude(),
+						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+				String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
+				label.setText(distance + model.getName(), TextView.BufferType.SPANNABLE);
+				label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+				((Spannable) label.getText()).setSpan(
+						new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1,
+						0);
+				final CheckBox ch = (CheckBox) view.findViewById(R.id.check_item);
+				view.findViewById(R.id.favourite_icon).setVisibility(View.VISIBLE);
+				ch.setVisibility(View.GONE);
+				return view;
+			}
+		};
+		((ListView) findViewById(R.id.list_favorites)).setAdapter(adapter);
+	}
+
 	private void setupButtons(){
 		final Activity activity = this;
 		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
@@ -63,7 +106,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		});
 	}
 
-	private void prepareMapView() {
+	private void setupMapView() {
 		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
 		OsmandMapTileView osmandMapTileView = surf.getMapView();
 		osmandMapTileView.getView().setVisibility(View.VISIBLE);

From 8326878fcea72dfb7de37302afea1aa766358f61 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 12:29:38 +0200
Subject: [PATCH 009/138] Removed listview. Added favorites as simple layuts

---
 OsmAnd/res/layout/dash_fav_list.xml           | 26 +++++++++
 OsmAnd/res/layout/dashboard.xml               |  8 +--
 .../plus/activities/DashboardActivity.java    | 57 +++++++++----------
 3 files changed, 57 insertions(+), 34 deletions(-)
 create mode 100644 OsmAnd/res/layout/dash_fav_list.xml

diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
new file mode 100644
index 0000000000..a5e8fb3c50
--- /dev/null
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="horizontal"
+			  android:layout_width="match_parent"
+			  android:layout_height="50dp">
+	<ImageView android:id="@+id/icon"
+			   android:layout_gravity="center_vertical"
+			   android:layout_marginLeft="12dp"
+			   android:layout_marginRight="12dp"
+			   android:layout_width="28dp"
+			   android:layout_height="28dp"/>
+
+	<LinearLayout android:orientation="vertical"
+				  android:layout_gravity="center_vertical"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content">
+		<TextView android:id="@+id/name"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"/>
+		<TextView android:id="@+id/distance"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 2935d2912c..6bddada503 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -2,7 +2,7 @@
 <ScrollView android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
 			android:background="@drawable/background"
-
+			android:padding="6dp"
 			xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<LinearLayout android:orientation="vertical"
@@ -86,7 +86,8 @@
 					android:visibility="gone"/>
 		</LinearLayout>
 
-		<LinearLayout android:background="@drawable/bg_cardui"
+		<LinearLayout android:id="@+id/favorites"
+					  android:background="@drawable/bg_cardui"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content"
 					  android:orientation="vertical">
@@ -100,9 +101,6 @@
 						style="@style/DashboardGeneralButton"/>
 			</LinearLayout>
 
-			<ListView android:id="@+id/list_favorites"
-					  android:layout_width="fill_parent"
-					  android:layout_height="wrap_content"/>
 		</LinearLayout>
 
 	</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index f676729228..1535052ccd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.activities;
 
+import alice.tuprolog.event.LibraryEvent;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
@@ -50,36 +51,33 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	private void setupFavorites(){
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		final List<FavouritePoint> points = helper.getFavouritePoints();
-		ArrayAdapter<FavouritePoint> adapter = new ArrayAdapter<FavouritePoint>(this, R.layout.favourites_list_item, 0, points) {
-			@Override
-			public View getView(int position, View convertView, ViewGroup parent) {
-				View view = convertView;
-				if (view == null) {
-					LayoutInflater inflater = getLayoutInflater();
-					view = inflater.inflate(R.layout.favourites_list_item, parent, false);
-				}
-
-				TextView label = (TextView) view.findViewById(R.id.favourite_label);
-				ImageView icon = (ImageView) view.findViewById(R.id.favourite_icon);
-				final FavouritePoint model = points.get(position);
-				view.setTag(model);
-				icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, model.getColor()));
-				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
-				int dist = (int) (MapUtils.getDistance(model.getLatitude(), model.getLongitude(),
-						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
-				String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
-				label.setText(distance + model.getName(), TextView.BufferType.SPANNABLE);
-				label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
-				((Spannable) label.getText()).setSpan(
-						new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1,
-						0);
-				final CheckBox ch = (CheckBox) view.findViewById(R.id.check_item);
-				view.findViewById(R.id.favourite_icon).setVisibility(View.VISIBLE);
-				ch.setVisibility(View.GONE);
-				return view;
+		if (points.size() > 3){
+			while (points.size() != 3){
+				points.remove(3);
 			}
-		};
-		((ListView) findViewById(R.id.list_favorites)).setAdapter(adapter);
+		}
+		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
+		for(int i =0; i<3; i++){
+			LayoutInflater inflater = getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_fav_list, null, false);
+			TextView name = (TextView) view.findViewById(R.id.name);
+			TextView label = (TextView) view.findViewById(R.id.distance);
+			ImageView icon = (ImageView) view.findViewById(R.id.icon);
+			final FavouritePoint model = points.get(i);
+			view.setTag(model);
+			name.setText(model.getName());
+			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, model.getColor()));
+			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+			int dist = (int) (MapUtils.getDistance(model.getLatitude(), model.getLongitude(),
+					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
+			label.setText(distance, TextView.BufferType.SPANNABLE);
+			label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+			((Spannable) label.getText()).setSpan(
+					new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1,
+					0);
+			favorites.addView(view);
+		}
 	}
 
 	private void setupButtons(){
@@ -121,6 +119,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		mapVectorLayer.setVisible(true);
 	}
 
+
 	private OsmandApplication getMyApplication() {
 		return (OsmandApplication) getApplication();
 	}

From cd5ec404c5abdf916b61c009115cb225ee1a2a37 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 13:02:22 +0200
Subject: [PATCH 010/138] Updated size and text color

---
 OsmAnd/res/layout/dash_fav_list.xml                   |  4 ++++
 OsmAnd/res/values/colors.xml                          |  2 ++
 OsmAnd/res/values/styles.xml                          | 11 ++++++-----
 .../net/osmand/plus/activities/DashboardActivity.java |  3 ---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
index a5e8fb3c50..c657988f71 100644
--- a/OsmAnd/res/layout/dash_fav_list.xml
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -16,9 +16,13 @@
 				  android:layout_width="wrap_content"
 				  android:layout_height="wrap_content">
 		<TextView android:id="@+id/name"
+				  android:textSize="16sp"
+				  android:textColor="@color/dashboard_black"
 				  android:layout_width="wrap_content"
 				  android:layout_height="wrap_content"/>
 		<TextView android:id="@+id/distance"
+				  android:textSize="12sp"
+				  android:textColor="@color/dashboard_blue"
 				  android:layout_width="wrap_content"
 				  android:layout_height="wrap_content"/>
 	</LinearLayout>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index eb736b610d..bdb86e6992 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="dashboard_black">#212121</color>
+	<color name="dashboard_blue">#536DFE</color>
     <color name="gpx_color_point">#cd2c33</color>
     <color name="gpx_speed">#c79c00</color>
     <color name="gpx_altitude_desc">#32CD32</color>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 529f99f921..5babdfc70c 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -13,16 +13,17 @@
 		<item name="android:layout_weight">1</item>
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:gravity">center_vertical</item>
-		<item name="android:textColor">@color/color_black</item>
+		<item name="android:textColor">@color/dashboard_black</item>
 		<item name="android:layout_marginLeft">16dp</item>
-		<item name="android:textSize">16sp</item>
+		<item name="android:textSize">14sp</item>
 	</style>
 
 	<style name="DashboardGeneralButton">
 		<item name="android:layout_marginRight">16dp</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textColor">@color/gpx_time_span_color</item>
+		<item name="android:textSize">12sp</item>
+		<item name="android:textColor">@color/dashboard_blue</item>
 		<item name="android:background">@color/color_white</item>
 	</style>
 
@@ -31,8 +32,8 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:layout_weight">1</item>
-		<item name="android:textSize">14sp</item>
-		<item name="android:textColor">@color/color_black</item>
+		<item name="android:textSize">12sp</item>
+		<item name="android:textColor">@color/dashboard_black</item>
 		<item name="android:background">@color/color_white</item>
 		<item name="android:layout_marginTop">2dp</item>
 	</style>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 1535052ccd..97a62e1d79 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -73,9 +73,6 @@ public class DashboardActivity extends SherlockFragmentActivity {
 			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
 			label.setText(distance, TextView.BufferType.SPANNABLE);
 			label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
-			((Spannable) label.getText()).setSpan(
-					new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1,
-					0);
 			favorites.addView(view);
 		}
 	}

From 04d28c9577fecb4ab9911e1cc129b2b942b6db3b Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 13:46:23 +0200
Subject: [PATCH 011/138] Added map position

---
 .../src/net/osmand/plus/activities/DashboardActivity.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 97a62e1d79..e7ca56d44b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -114,6 +114,12 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		osmandMapTileView.addLayer(mapVectorLayer, 0.5f);
 		osmandMapTileView.setMainLayer(mapVectorLayer);
 		mapVectorLayer.setVisible(true);
+		net.osmand.Location location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
+		if(location != null){
+			osmandMapTileView.setLatLon(location.getLatitude(), location.getLongitude());
+			osmandMapTileView.setIntZoom(14);
+		}
+		osmandMapTileView.refreshMap(true);
 	}
 
 

From efde6d74a5350727b260315920e8eae21decfa98 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 14:10:31 +0200
Subject: [PATCH 012/138] Press on the favorite - open favorite on map

---
 .../plus/activities/DashboardActivity.java    |  9 +++++++++
 .../osmand/plus/activities/MapActivity.java   | 19 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index e7ca56d44b..a19dcbac3e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -73,6 +73,15 @@ public class DashboardActivity extends SherlockFragmentActivity {
 			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
 			label.setText(distance, TextView.BufferType.SPANNABLE);
 			label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					final Intent mapIndent = new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getMapActivity());
+					mapIndent.putExtra(MapActivity.START_LAT, model.getLatitude());
+					mapIndent.putExtra(MapActivity.START_LON, model.getLongitude());
+					startActivityForResult(mapIndent, 0);
+				}
+			});
 			favorites.addView(view);
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index f41b510533..8b671d56f0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -80,6 +80,9 @@ import android.widget.Toast;
 
 public class MapActivity extends AccessibleActivity implements
 		VoiceRouter.VoiceMessageListener {
+
+	public static final String START_LAT = "START_LAT";
+	public static final String START_LON = "START_LON";
 	
 	private static final int SHOW_POSITION_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_VIEW + 1;
 	private static final int LONG_KEYPRESS_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_VIEW + 2;
@@ -116,6 +119,7 @@ public class MapActivity extends AccessibleActivity implements
 	private KeyguardManager.KeyguardLock keyguardLock = null;
 	private ReleaseWakeLocksRunnable releaseWakeLocksRunnable = new ReleaseWakeLocksRunnable();
 	private boolean active = false;
+	private boolean intentLocation = false;
 	
 	private Notification getNotification() {
 		Intent notificationIndent = new Intent(this, getMyApplication().getAppCustomization().getMapActivity());
@@ -222,6 +226,17 @@ public class MapActivity extends AccessibleActivity implements
 		gpxImportHelper = new GpxImportHelper(this, getMyApplication(), getMapView());
 
 		mapActions.prepareStartOptionsMenu();
+
+		Intent intent = getIntent();
+		if (intent != null && intent.getExtras() != null) {
+			double lat = intent.getExtras().getDouble(START_LAT);
+			double lon = intent.getExtras().getDouble(START_LON);
+			if(lat != 0 && lon != 0){
+				mapView.setLatLon(lat, lon);
+				mapView.setIntZoom(14);
+				intentLocation = true;
+			}
+		}
 	}
 	
 	public void addLockView(FrameLayout lockView) {
@@ -341,10 +356,12 @@ public class MapActivity extends AccessibleActivity implements
 		}
 		app.getLocationProvider().resumeAllUpdates();
 
-		if (settings != null && settings.isLastKnownMapLocation()) {
+		if (settings != null && settings.isLastKnownMapLocation() && !intentLocation) {
 			LatLon l = settings.getLastKnownMapLocation();
 			mapView.setLatLon(l.getLatitude(), l.getLongitude());
 			mapView.setIntZoom(settings.getLastKnownMapZoom());
+		} else {
+			intentLocation = false;
 		}
 
 		settings.MAP_ACTIVITY_ENABLED.set(true);

From fc42493adf0122c6b7be7c02f779517c3c741d18 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 16:49:42 +0200
Subject: [PATCH 013/138] Updated fonts. Updated view.

---
 OsmAnd/assets/fonts/Roboto-Medium.ttf         | Bin 0 -> 127488 bytes
 OsmAnd/res/layout/dash_fav_list.xml           |   2 ++
 OsmAnd/res/layout/dashboard.xml               |  28 +++++++++++-------
 OsmAnd/res/values/colors.xml                  |   1 +
 .../plus/activities/DashboardActivity.java    |  16 +++++++++-
 5 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 OsmAnd/assets/fonts/Roboto-Medium.ttf

diff --git a/OsmAnd/assets/fonts/Roboto-Medium.ttf b/OsmAnd/assets/fonts/Roboto-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a3c1a1f1702ebf8f5771ae96197539ddc507f04a
GIT binary patch
literal 127488
zcmeFacVJXi`agWmxp!ug5CZAFOnT2GlQzkuO(wk;(#xdx-a~*8LdQ@<M35>?M2HBA
zh=_=Yh%73LjYVVuS;a<NRLI<UpK~Wc)?I(!{p0;}gXcN-&OP_k=lML(d7d*P!U!P)
zG>jOeN>Ikd&v2RHig5NB_%tygGb1N*$o3xy=jbD}=}1D(9EG!+-RlT{cM2gkG9$+?
z;5B29lL+B@D6h&>rWLe))0=^i(K3Vt*Q;78+Sgy%;ERw2JU6&e*E~?We|_LMLVl2b
z>#nb<sQyJBT?6mlg%n&5AL#v{D}ef(;oiBvrMv(87W*x5e-5G9r<&WUDmeX<LkPL0
zBBWE<QqkYeW?-lvCqj9L){2&zcjq=U2z$W$?6&r{uI^aXm(L*V1LJX4BRW<{AD6s+
zs(hCGpGa2+K0xTqkA_eOLVr2<_n#g(tN*H7qSFPpx`@zE;Sb&sHFGcrx=rxBRJVk$
zN&Aeatb~37bR3zXAtd<2bLbIb*pKkf@B|4q38YY^y*6h)M77h+Xe+#qh$a&`6vLeZ
z{iJ=MllBH_)I!7|R4dv<-~ry2L0b$Hz)Zp|!SIOw(VQl-5!J9akepqGss-0kmB1F|
z;Ubhx&ZA-S5prjiBWtz?De-A!L$;#?B1cOZPeh=61EhVBvLIzZ3WT(fU5UCOkAqYX
zsg&5G5&SjsWergjJBZe@o@ki4iR2=8R4m9rMgo1bULZrYf-tn6T>_~F?mJPV;1F6*
z6zDm&1NjJMz~{MWy$HjzgOHX$d0ReLu^c?RjFQ<epj-%=C-6Z=B0VG#%tjvUbtGax
zM47}NjWPwu1af_*2?a6FB8IF-{!nKTyATb*dStMpkWx?%xq^Jy<tQ849UwE%Jc2bx
zSs%z}pjE>AP__#Vuwzh`zPA!(kV}w@Q3`n;>9C!skNGDu6Wl{$R*3AGTSy=BY;p*N
z5`qpwZY{_{J;V+zVdtT0_9!Y7Y(b^aPfI+Bma)I0B4#lv6)I6avlczU+(7wk3tGV6
ze*yEZhZaB|%gKEthZI6KqjvUnw2t`>#lc*Sk=dw)T!#7G3;no(N(Gltq0kFu3iDAN
z%(+6eSaY9MqBOx`SiAEuZ(pNj!naT&yBF25Yf&tWJA-{1jR3DW5G%Br-H686YUD^V
zkfY#9w1!=V=8KM?8c`T3Ci-Y4xum%%Sb+-IZ75x^8_i?yp+4dY^Cd@x%x$!u8AqMW
z5R7*QT1XC~ev*bfm`~9lV~>(ZGa5liZ2@T*p-JFebtL5axK?dLO3_)UqmGUVcyF`d
zO=KyU3;Ys_9N0CeS@06t40(d!2b3(>kCcL9)CB97$DTzSSOX}t4CS&aq++d51?@At
z19g%8=y|pgnX$$&?>_@SE<?j?2(0rONIt-uDl`o9r4+n}GKA|<E&DR+W#?+X5_TY|
zfP?WDqI#WW$VX>2+AJ(a{?P6^feu<D6e4HQPN??^N)qe?o_rqoP!Gw3DwHAk4azJ>
zW1`Jyqv!$JD6~Qr!rx##BD6-3iJC;YXgm80^miUAW>=%tOc7el-bZf2US!9bp){EP
zC2T9K!zN@eWFUVU?%^}wF(<*tFvgGJz7~}W$IuetT{K@{0p;4DTs<T?$`X#knzbW0
zwnOtd8-a3!AHwsS@Xm70_p}~S60Cm)@KBxRy2u0ihtU#{M;n+6J&^((5C)?y!tY>S
zZle+10Q8*bH>g((YxpC~$y`(p{E{xPLbK_dPu*vT;-F3?>gMatMD6grmQ6+_tOm8f
z`qoaZ^;}r*-3UE!=Kk>@jkYf^0e)NxvebyyFgsz*UWGMwfH8T)7+yeQ!VM@;unR?s
zK7=`b0nOJ*fOYsMnlJPO-qoNAQ2_E4bRbtj4`5Ii>J}_Ti-pdxE@w371!Ab9AB_Q~
zY^MAmSO%E22j+Ya$lkjskja5H6QOM3PpDq_H&iCfL2`jR@?+<sBsL25h)yDfa0`kO
zsnL4jR@5h8;XQ9O2Y5gXIHVNJfi_J*(|7>VPUYk^z*arL*b?|`0bEPqdM5zyhZKDQ
z-92D#C1@eD1+n-Ps=_Cb6kkLEcppk(Oi(jpjiMPH6u_3EX!aRYLf%Kqm<MQuU=La$
zf-<BNHIoLE3s~j@SP;yVfJ`3+UO0xH0o*MU+(I3I0jWB^z-zjw1?G2yFbMGAZzvb|
zpjfyQ<aRBp6l_3y*w3JiMQAH~7=`P^p)%s5IRqG2!{fCf=mx-SRv$T&VzdMFMHT)D
z@O>Ww*@ZDnP@zr`^zT0O+fB2LouNr(XMl|F0E`g8nr=n9z)!vGFks6d>SeA&dI#?J
z0RLV?y?}d*nZF`uwirHt4fTRN^|F71bPCG1@Odg*0(l^cWW%A{D6IEfq$?C5ceV_f
z0-p<@e=)2rDulEFk^)jBBnhNC)&_9E7RewLK+1rA^*~>TA!#ub<_@kiAf-W~*C~+V
zp)YFyvo<gaG=N`*@ueXPGFvkaW9xx_=rOy1f9Q23wDme*&oY!FP=ai`1CPPFf==5E
zxU!J8M-$bFf+moMLDVGJ326zGy$<;ez%Fa_G&_P?*?csMJ&A(YCXg9lz~dvRi~SZ=
zvQiWV^$&pzXM)^juunqTfl}G^@Yy!F_C+~VcY!=oT}<_FKGmntMkCd66oYwP5BghB
zfJ|v(S8MK3ok^b8+~M^w)y4lQfo|sYGS$sfi6}JZ0GpqK{C!AoKGMllFF&5BK7K6m
z`k3n6KTA{(({VhOh?V9D)kToM3h9MM`j_h9#}nvYs(+^w)x9*)G12z^EvMsx_NeXg
zA9Ff?R?r3=Gwsj+kyD!m=0E#SbFgQ4n?j*^8OE^<=Iu4ecSHUq<S>s&pUlu`Am1W<
z8SEZ?(5GPgP<_hVKVXBvIM#zMT``r<;qx766`y~NR?&5!^Yh1??b5tK*M-j4A9HFy
z@ivS$&zQOo<!vgkYyQui=OM6t9?w5SI&|IXTKu=Uh}vw_ZUUQ)x0|MHH)=mo8}9L(
z+A-8_;q4e|vkYoR_(bu6;?18Wz#txfC<aX>JgM0O7_<oT=OJx*ggq309#0f^9#0f^
z9&ZQg<}q$MA4HAQZ9JZ{6!#uaJO*mkLfcP6dIQpJ=+DsOm`HJPI`RFZ_&AM`(|x2E
zIh`n0KAz~jOk?NcW0<<;v6PNy8cQjjLei;6k-Xe|qd6!v2Kn2gIWE|w(Fl~9I6)gC
zWWQ!9eNJt7UOr%*rtNmhvwyVLDUZ<g6@YC{af8PLYPV5a4fHahHX7JrfN^8IY*X77
z>}gngduZzd|BT8!l;LeODwALzQXZYcqc^F{Pz<K+Q#<TY|7bZVF8~{j?-$4;l?7@`
z@_Px21JFO(H;|_yUgoL&McbR&BTU)z_VgKVt5Lh3?hyc&_<aJ{YP8HWFaI&0=52m|
zMfY9FU{8I;%lJ!F|I>caJqADL6tk9SB%=AqNAxPp+f?7D`^DS6V5@5FFU?P|6V1@2
zdIRiGYCBHj8b8NipV9fDcB&9;OM3mNjVXMbmZ@o+<836c<AEm%r{8;2H_Rcd(GohB
zd_IjW(>CFB4mK{eL+Lv3Sp3HvY-8Sj1)G@Kt^C}>T7#TrP&=C1y?^ZIWB0S!T+OD(
z?*B8+{~7*IeLg+jKhHIPWm7a`fA*Z`JF1@)JT~|L5nms>cVovi&pmekuXsGYkNUsz
zKjP}tzH55_^=J7s@BLf86ZjhvZ?^#dQu*cg86XS%K7+~wtO?!6(6yS*soYT+nC6XX
zTbt@Qfk<<SCbmcOBU7ZgA&_f+VPiC>AMwjn8$7?mzGix@r+M`eA5dJVL4?}L)Yc>}
zXf<RQVfu&k(XTohq=R%c9MVO)8a2{GdO&BO89?=sKG2zHre+cuAOoPY&@7;{(QKfG
z$WZeT86hK}#>g0`2{Hj{3iJW^W=w&aBQu~D$Q-C8ve5j7tdJ#8Yh(q~23Z5OMK+pW
zksY!HYLD!IIv{(XV&tIt1vw%yP$%RF)EPMebwSRW`^Xi!0ChvIK;4lWP!FL0M4reU
zs2B18>Ww^s`XDb2>{gLCP(S1YRDyhg`XfKh1PVYBpi<-yG!O*<4MI}QJrs-rfrg+U
zprI%js0@W@enMd=6lge-0hOaLpb<cSM3E>QXcUqIjYbhbV^E~#2c$qzKx0ufP$h~1
z8iy2`?@>I81)6}AKoe0M&?FSE`3@zc1fVG>5ojt(0-A=BHFr@uN&%XIQh{coG@w~P
zzeU+79cT{90Gf+3fzCl$nr~1Z$_AQ`a)1_~T%d($j^-bz2;~7SM)^QXPyx_VRH(Uw
z%1{x|a#Rddg-U={pi<4(s1lU{twQBMtC0$54ba=D7F7VPLzO`5Q5DbzRIRy%8c_{U
zKvAI0s19fgs@L2^t*8NL8)^jFj+%gWpk~eAQ738v+J#zycB3|+J*ZuC1NEW~pna$l
zXg}%#Iso)5G>E!^&P6>yhfpujd8kiw9nDAmKo_6^pu=bo=t4AC^CfslhJY?Y^MH<`
z`9K$=1)6JU2^t2v6fFe042=L?juvVDhE||apexa0psUalpicn3ipJ1VpsUd`pli@_
zpli_z%@=4LS_$+?v<m2Y^aRkS(3s|Pv;nOK`ZQVtbR${|^cl2H^BLNNo&>rXtq1xn
zdJ5<kv_bPJ+KQeAx(#gvx*a_ObO+E+&`z`o=yPZ@&|T<Rpu5o)%@wo<Z3Vg)Z3DUw
zZ3p^1+M)R?+K+YueE~fO^Z?og^hLB=a~T~(dw?E7dx4IleL!DA&uczLhtYnZFQXTL
z9zh3y9tHXldIh}*^i^~a=rME%=xb<P^C3EpUIO|$It=s#dKu^&=!oVLI*E<~eG|O`
z^b~p(=v(NR<}c_pdJX8?=s3_b=yjm)pc9&l=q!2z=)347&~xZbpzi_w0G&stfWD93
z0(t?R2KoVdTXO+jL}!4)+dwa&vp_#Y?`qyhAE9$VKSu8Xy^PKS{VRH3a~@qm7l3|(
zJ^=bDx(M_$^cT&0=yP-l=ojcipjXjHK>r5x9J+=+2Kpts4D>qsE6}gd70tWo2Kof(
z-_fT)Z=%nD-a?;i&Z67s3!q=4t3dCdzXAORx~6#teS^LP`YpN+^e*}e=y&Lb<_!8C
z{T=8J=qAt~(Ji1q0eu_YL$`rWps#`cjP3yaC;ErxG`f$z0s0I27U-|&F3{i5cbd1*
z1N1%6hv)~OljujFYV?!l6u7JJ0o9-hpa?PAq%#UgPycM-6SyL-NJu>@Q~^vqp*Pw;
zjL6j0bUyv$kGZx^hV?@%c-e(W1R6vaG{+3k7&Adr%mNKz2%5ndG=eE;0&~y+mVo@$
z&<|TcdVAym=<W!p?hI(|3MlRl=<Nxp?G0${3n(oCbPfPi4g@p~1{4kj^bG^ll>^#F
z0?I}Mx+(xwm4K%4fTD?jp2>ikseqR0fRdSjj@f{UxqyawfPw{peno(KC4hEifO0CB
z3tgf|^oap6C04|ah=~JnB+kT%xDYquLEMQa@ghFNoA?qxA|V09pGZj%2_zvTn1m7;
zZU!`~1Z1qkt$<mJ0OuO;JV3H~yb^F|Azp^s@hbcT;AJ;ngcsvc^cG$Y_&5L(HVViy
z9}u<~FGWw{6(FNcXb`u9PhCKCh$SG*T3m^%a070{HMkZn!DA$x?8n`B0C(apypE~H
z;Mu`-xCwU<5t&7VWHy;ejEFHYA%?`9SilI)hz+qN)_`f708?54Z?*u=^Z~ML0|a7)
zWw5Z{09p#6S5O?*P7J-;4!H3mNb*^bw%fq59G-;@u?u#?5*&)7aSkqrcIV>-cpct>
z$MKK&A=VH}VhuA>NKTM<$$R8)WP-sA!{{=z7$;^0vx-^A>|n;3*O>R1i_AyN71o9I
zW8>HiwvugQ2iPU-MfMZ+EB2oPESN1Yw!?N&c8l$PvYW8`%|6XxhJ&etor9x;tAoTr
z>Ja82cThTXJ1lV6<*?V`fLI_l7MqD3#javsahW4=6gtjwG;*|Zv~%=wOmtK^*0`Mi
zp4@-?A<JnrYK?|xW;#{};K1!L7cT-fo&qGg1k(H?(%{+H2)kl;?2lzQ2IpcGuII<P
z9Up?RKERX20ysuH*0V6yPhqU+(O5@etYgfR%yZ03%yH&C^C65Cv97Fyjb}62Dz=>+
zWS6mjVLxSWu=fQ-U}%TzBJGClw%gsa`x(ZH9E=^z9UL57V5|WSvPWZm4#xVzzl^nb
zYOIEjjkOxaieao6#ySaO#jH12KnS!aqPU=W6U06aQZytvq%cUKkb)sm?`i;)!Q9W>
z*SH7f=_qL4L9T*}M*G#5)w|Va)Q8m1sduWks5hz?L&;IiB08ID0bEy4{x*3ZJkv)Z
zy$ES1q-PQ04nsNw*U;*%hFcytKf9%Wv*niFO}nr15c(?ZtJJTOzl!<0-&eA~yL~13
z3Sa*Pq3ht^z20-Z{(9~8;xAWU&%EyZ<-%)wzwG(4`^%Ou8^0|3Qt_qNm+oJjF&@*q
z2yD9^Z+wJhH=#Q;!FU11DR(0b-egSUmeYxj89d5-92JVdm5R^)lwc)&gj4AocvxEu
z+C=y|v<_iS;t2_AC1)UAhIB_;=66c2{(k-Y6}bRqA^mrMWY1JNz+KFN#0fy=MSvE7
zV`u@vfMaG<?m-f*&@e=cta<6TqtQdO2+&Oo_~rx%=K|=n7!b`LFii@076i7?Qoytj
zifS;9WdyM-T22UBK^jOSX(G*}g|vcAv<f{z`ba++AcJHs86xw*Dq2nElLcg$EF>dj
z5ydUCjyy>=kf+H;@(f`Ji`J1Dpm&}}`x$-o0yC2_U}jN-VaynF#sVE=EEy|wh_PmD
z&^Tj@USjOfVaA?uKrb_5ut<(Fj({M}j0@w+xH0aG2YQq7V!Y8Q#uF@z(_mSg0gK`+
zdYAD5JK{a2m64(km_T%q31Who5GE8*>=OEr31ixraP$!)M;|j0OeDI@M1iGn1%1Lq
zGcxok6T>K&SVqajG4V_S*b1LBiA)mc`rCjCcbH_*?%$wqnH13J-+?awfk{O_GHFaY
z`iaRv_n1tkoykIKCL3`~4wK8wVe&wbV3Wn<GaXC;CYZr2YsGXjU4Sme*aVw0-AoVD
z$Mj++?9AG;4y+|$tSg|bJN96$SsUz$y;u|0l<8*%SRpII-q?q=W$myp_G5KeT|i@h
z9Dt=b5C<`X%v@HFoxuz-^H?|5oz-V&;$R%Y8nCkfvt>ApwZP$6&YH32%zS16GmIl}
zBw(;Bj>6Hbm~~`lvxck_>x^TVl{{WQ0VuYbS%VcgmNjCHncd7Dti*B5US=Qb!Fu9&
z=6TkO+0VQ{^%U#FdgDG;0NM#O6VuGJ{7<|5PrLk2yHLdbpLY45cKM%n`TtqFJZ>^s
zz>aSZcE%g<9{dqOVByF~9;pWVWCb}-t}-S}Ewh9<3%b;uUB!OR-e&I!gaRvpuV6^1
zCv+Fq3U>)F3hxLxky2D5suzuk4v0>Ou8Dru3Dl|7*`xERuDh;Ww^nyZ_gUSOx>t1X
zf{WBZ&p|IxPobBsw@dH(47(XcGd9jRsc)bkpr5HfU;kPCefr<bG@6+?bJfgqGw&FL
z8PpoAGT3f#(%{-Gy;%;k%4Rjs+BfU^EN-@9_Q>oj;7Bzw++=vlDAZ`!XqC~k##YAe
z#+Ak+#)pmXn+Q$3P2x=|O_rE!G`V7O!{ldEp{a#wrRfUO1E!pruh|lFVqRjt!u+a*
zjYYggwne+eDvMnfmn`)xGc8Y9UbC{Ys<t|4b=%s;I?{T?dV}==>r2+RZ5(V8Z8~k1
z*&MSuYjfG=nk}+5v-P$Ov#qynw;i$FXnWoEzMYYsvz@|jh23#`WS?oj%l-uH!5SS7
zI9wLb76*u1#plF7I|exRJDza7>15_q>GZ7A_s$CE`OcSISeJO06)tC7?z!r@%3T{>
zH@e<+BW|v4d2YMhPPpB4<J|4sGu@ZCA926$A@`{FIPJlC&i0gh)_WfFyy$t?YqpoK
zSG-q&SF_h8uRGrQ-mc#9-o4)Yy|4I~`IPyL`F!MS;+yNc%J;bMWj`~&biXBjmn2pa
zxkM!ylbnz|@DKJM^gj_`7cf8Iv{Wedlx9n}OYa7D27VJ18Z;PmFz80GL9k<RVsJrl
zeMol5zL0C7CZPqPt)U~K2ScyQh|E<MFRPV}$hOKZ$R@)I!j6Z18g@V2IXpAGKm45B
zKprh`mv5C{h%kysj2Mns6R|zwVx(DQZ{+zXtElFvlhJH+a`dw3(=lvJe9TbHVFmlA
z{|pos3TK5}k*jD{^eaXcYZS*6A1Us~TEsfX2FBiqy|2_$S|}Zr$;$Q0n{n=Od*bfK
zE90Bv_s5@zzZic#{$4_ILRrF4!it3Li8hJpiQ|cv6K^K|oMe>bkQA7dn$(}vpInlB
zF!@G`FvTGyETuYSC}m^HN2vy>!Ks<4wW+&OPo$npy^|(PGfN9iOHW&pb~x=`x<h(*
z`m*!`>1Wb!WRMK23`s_HMsLQ!jLA%^%#zHVnXhE&Wo2h=%-WyzdA41)Ji9mhc=p8{
zha6Q-YtF8mGdUmSaJde->ABZ(Z_lxtQ#)sW9-Eh#SDQDQw>|Gf-tBzH{P_GO`DY9C
z3&INK7o0D+T4+)jUszkXtMFKnUQuFENzullE5$~|mBrhOua;Pp<dv*1xmg-mI#PPD
z^yjkZvc$5?vVyWzWv9x%FV`!NEKe@aE3YhXEgvjjQogQyYx(~2SISS9Uo8K;{C4@h
za!#eEGE+IKd{tqpcvZHlOx39BRgI{|RGU<LREJe3Rp(V#R5w)Ls~%JcD~u}aDm*KK
zD-;#!6-5=b6`d9HD^^r&sMuL?u;O^d*@}-Uu2p<falevO$}9I*zEXL*@?z!ZmA5PJ
zRdQ8&Rc2L=RlZeWRq<8XRb^F;RXeLDt97bPsvWAmt3#`m)tS{L)%Dfg)x*`Rsy9~e
zsvfUCQGKrZay3^ITBEGVtSPCfuj#HCu31&Hv1V7zc+H8Lb2XQ1uGieH`L&j<on32F
z>s}jJ8(o`PTTokF+g>|VyR3G7?e^LOwa04D)LyE+T6?GV=Q>oUUuRM0TqmiM*Cp2F
z)~V{6>-y_P>(<mgTeq+7NZqNr3w58?-K_huZn9pdKD~Zj{nq;Z^{>>QuD@9SdHwDB
zd-Ys{UV~YKV}ox)SVMe6c0*Z1V?%GlNW)meriMKYhZ{~doNu_&aHHY-h6jzpMx#c%
zM$g9JMnz+KV^L#mV`t<1#ubel8h17xY&_n0wh1-qH(4|}H%Xf0O^HppO{%7iO}m=L
zn@%*HYr5QYz3Fb#ugz?;Z*y34d~<elS#x7^Z}Uj=So5alJ<W%kPd1-#zS4Z7`TOPv
zEy5O~7P}VDmf#jeOL|LDOKnSM%i)%jE$3UVwA^U<zU4uyu+^y5uGO<OxK+`b-dfaJ
z+uGXN+d98>N$XhahSsgEds+{+zS4TK^=#|K)+?<yTEB07&?am%YO`zeYzt@$Yg4o(
zw`I4LwKcZ&wvDunwQXwK({{g&Yu9TxYPV{4Z4YP<Yge=<w`aGPwb!<{w)eKrZ(q_r
z*1n;AYx|z|gYC!LPq&}%(CL`nVbS5-A?XP1i0(-3$n8*dG<WoOjCQQ)c(!9-$B~Xx
z9Tz$-cU<kb)A4gB>eT5p>2&Dy?hNfzc4l^}I-5KDJ4ZX$bZ+e2-g%(&Sm&9}OPyCc
z?{xm$g}QXQW_MY1Id@6ALc5e*nO!Aa^<C{<{avG7Yr3B8+SN7Qb)xHB*X6G3U3a^F
z?Pj}YciVKkcT2iMyOrIU-6h@i-QC^8-K)AccJJyQ?>^CeuKUyOJKaC`pdOtblOBg2
z@1D>eWlv^LNl$%Gch7Los-BHKyL!fZPW4>sx!QB5=jUG3tKVzU>)b2pjqc6tE$OZA
z?d~1!UDdm>cUSLt?}^@Xy_b8h_ulROwNIzdqR+Wc(kJgr?91&_^)>hP_l@?g>3g<s
zU*D0wQ+*fuKJB~H_iI1fKfB+i-@QMuKe|7)zo5UmzrBB`e_8+f{_Xt-`j7RW>A%!}
zwf|24&jV;cf52kEc|bBCA4nX?9Z(JI8F*#j^uWb|&j)S~+#BEq^#;ub9S3~}!v^CA
zvj@ut8wYy_M+V0RHw<2wOXk|l4W3&xcX;lax!dO+n0svQnYowdUY&bqNN31(D08TP
zXn1JV&<6N-983&?YM7r%v=ELTf`1!f#>r4BpadH`tvrZ*fC&1yc|?CXCA7R8if$B)
zgQwdb$~!Sm#!f+EK1ms=F(gwbJ^?j$A}@TEx;OP}EC`#xhUt6Lucz-zzw~|B-yWv!
z?fWY1E4+!T#hbQb**3hLQ_-}Idv_~WOJG9}l|!`6hjkTh22VJ`fxg7emkA1tBq2dk
zQ#;1g2|jUh1n0Ji9WjS{69XbLbqazqQuss~5X?xeWF-pKv#s)=$`yIr=PWG?xMv%j
z?jMvYwXl$t$5(7>4hyYaTevNAeP`T+S6se#XCEH&j1LPi7iToCEX`e67p?dCRsE#C
z9W_za@ve43$=;qynbguLqhUp9!OEHl-M3HchPCYNNvoAxwnChsN^@7RT<{J=1iYZn
z`QVL5#?WDDfE}^L&_5?fUozFZND@JZ#18=f7i9!)*u2Ukqbn(;E8W8*y)!wvE7N1Y
zp;Mr<Q=p^abWV&sGU=lXDAJXb+zmyHoCBR)0>!hSh?7&0qajD;k$2~@8zWn?C6erx
z$h3%-EQutmCBiP$)5^*-)Go~~)XU1sE7WfCgNRo8s5K%zvN_w&FS|K%`ce9H;a?Nk
z&P3oN24b#v1%`q%5Z?#~Yn2~&h<3f`@agKz!Z;Gc@P#6Cv6}&=lOYHQ4#6S=SUfwz
zn3$P|M8XPdXC==)v0CmF>Sh*FJ(i!dq)ciPnB-lBEo~h>mMgAsx3e=(*0zq%Rp1*D
zJ%QY5dk;TLk$psAYN%g<y|>Lw6E~T&YnYn}ULM_0oa5!4ossF8zr0);SlFuwEKHAc
zNaT*lmZUDcR-~?w%OYAgF7$NAeP;IZAYUU%cBB)tKcFs5ZtCXgZ*LjkW?}6Y0sNTF
zOyU{5tY{?#&#>C|nqUz(06sv<ufv=_*(ods*`VWRL(B~bU3eoqY%cN@1P%M7Rkw9Y
zC9<xv@bI!OnMB&zR-NWUGS{fD99mLlIp($DD);#blM~$M*EaetwJckD@XF*`sMj6p
z&C=EjY{ZJ(B8d^O5AnrrA$9^&lI5FL*WMK<3GFTmk5s`$U{`xxnlFhSdw6AhS-Is>
zuZ>?~cc>V9T-)fm%(8shOIIF@(H#ax)+CMT26;As8<!9PBV}C71;(No;HFFE{t|+H
zXT3ZNdjxam&#gUjcpY=0;Q1b0!0qfhP{7@9#17m)YPIz!(K^<XeFY+92#Za{hE9g!
zAhDs89K=K1=v{6E&%euvuW=dprEB;pXxD~2hD#xeI1?ckD!OiwOa!?4N~{9ny%w3e
zTF?F>GN8Gx)Hz)omz3=XK6iL00X)IE<O3S}!%#cPRZl=fNEe*a7-HA|#5*Bu2la&n
z21^6XOihH8#g-<=DwC6y;vi?^fv~i+Fj<O;GyQ%I(JUeyj2r4Qcf!)Q-Xsxk&J+4T
zI|SnRcUec^Wh%$uUDpaOOt@B*P2Hvi*N_LAND{<4Du)g=H;vDaQ_dT2Y961boUoVY
zhlb|M?H%L=p|ZSiJ5uxFPfshAPyh7dw=e$qltS^;k1x8kJzeVIQTlWn_d)9>mAAKQ
zQ>%6^_dzE#f};?%LSiRFL6D1-Xzp>FNvJ)$cJKpwHXK9r53$kEM`wgQa1j1oZ~z#m
z`bno1i`nQ&AN;vI!_U|@Br`CoG{Sx&X8y6>mi;{u-s#QJ-0Ni5ULsJ`%}I6%m=o#b
zo=_F8dVYSAtp2HD<>JxBvD_}cy$qNWQ)mzHA4>yZ%z>^vc>POjS{Qx|=7Om>dttm}
zO;kywT}!(pTkbd!H}{2_`U7*7Hlewpv87?w$%|gDFMn|~eZn!aAh=`1HNGlx4U-@a
z%MPgTvJFb{%UjnZ531i>>s^$SWNDsISQ}isy+sySx2Z;wDYNhIj4TSb;nyt?=A;1D
zRFCIo&_t9A-GHmah9c&<qemyyD@COHp?VFTXGBDAb0@HJJ@e^gK2bUFV_XPhq~C#p
zXoodrVkQ!Xss%4PCO4_w)X=pMB|4bF7^qLUJN2a2?P`~Y_Z=B1-m@@U_^rWEb$DU8
zoj9f<+A~VxZcIKR*FNHQnYb#4k9O9)v?vuuQ`6YtozbF*Y)tc-X<=`~_rDw34;H)%
zF-jV(GNtn?`qwT{CS;`yeLyi&yAZyFQ5p8V*b}W6y0N%%OKm{Zz<7J#EAyhoiJjX&
z9Q}u9T9luGo1!2fBtOEzF1$eS>U)aLXY#@$vzCpQH5^@%R=V|KXL<7nM>n=csFSR`
z<&G)&iwk_b(wk!<nzJBiM)?h*ThO<0%9Fa_&<F8jgVo11Bu+hx`AOjM;1l+{x2Ybe
zpOPIXh-)XnivahJaRsnuh%csEoK7q=El5)eo4*xK4~!+P<-rA!;>6*DwY3KqCW#{o
zg3DSIz0Xxt?CMo~>==<B6r3j)izD)bTj$!_2B!L!HroWI`1z#-+OU$Qy%NiWq9%Fm
z=EmUQ#?7_zrlLd($=;@lr|W`(>Yi5X1Q$j*IYku)(@7a3YDs38Lr;x=mdxH>mIWA4
zs(HW~0l)KW;Q|aFqE%VbeWwbY^#aMGkEWFt?K+Mfd8su}7_xRw)0PHlRR5ul{+IjY
zHj3tLpFUxNS+~Rp$!yn{JV{7in7xfG|Lv%@jRj!|nM+?%HN3VWvwY_#{TU7Ck8Es>
zd=GzN;Th&wp1-8XSCZ2fC2!4zulgZ~d5!?qZDF(ET*2&z2+k(V);wgg;B#NV)MfCw
z8+>vbqBTNf0E~s<G{G)rluf5=hXtn4XHy(Z(kEYM;z-~13EcA*?w+8yw-#43KQLEd
z6-7{z;x{Dbhsm8x8BL7-dG*+PP~R}x&0L?V&xO_&M7~jPU{sUa$<W__;8wlGt@?qt
z6*WII8(|JzfEU1mgNdRrHH90I%(QHY46ulK1X_UFuDHz5Ez-v^+{dc4$XOXIp1`p^
zTS{uSw#q!?izFc~_-7+0saPy^GEP(|67Ye9hWvDIad>3BS6P*bw^CBJy23xOdQGvS
zv%175pf81c&qm^G0>Ez*lAKKWnV@1WT==nI4dAE>`eq=2R;P>-=p^l#IV02xSV%A^
zT98FdL_$#IROUdlGfs}qt}q~hG=McT!a_6tb7NXkC_K-Yd&idcr4$d^N|z=lw<p@^
z&dlzAIy*EkKHN4?Xz1i)9-J59#OTC6b8p|~U&d=hx~bcKc-Ff(FWte_si>;X_cZt6
zg(@9kWYdNd*N5N29%suZg)@`0OeGQ@BOg<L>$X)y7&FpepX!~Jl$sjV^<4GH$4_P&
z+PRsjKZs28njO)&I%gbPz0=rth5Ky$HSVi->Sh>Q8!k5&o6VT_9nSw^*{_#h7>HT;
z9e0@fXxS4+p2`6Hoz4uZTL_$MK>`KHx(JXI_<#{p2!)(^TYaII`;EB%ow#wos-MMs
zKE^rRi-Pe7nZ%xyz`G2b5JT*9@U98$58M%w8j5)YeS`uSKG13p7qHQR8@%v(Jkfh%
zB(Aw0l#^ZDqSt#NIBywQ9_`RM%w7Gpck$ej`+{*l)l;?A+r15A3L0e%+nR#OT2AH=
zo*mFUbiApu8P*W^vKFxCTi`dUwdn%+QX^XnHRevf@PPp}$EH@5{Z=n??1LpsK6@rR
z_u0QKA33)&W5%S8TViW^-oiXD*Ub3^*&WFqy7=>^qoc_cFLPUaw`h)3rYt_z64#pM
z9y9kySAWal1@W%Q&GB^3=(s<EanFQvK-y7bBdyWT7*f`Np13-##|PK_^rEW#&@WH#
z-VLsbz>8-D<CRA>XlvqDsGPm|@OJF{S2~lwd%%x})|m=*@-~$rwW|2Ue68M3UY|^4
zUQ(xmA9w{9eO@qrfuqI)oDGL}{NWwCo8zr8`WEwr`V}>^MXe&qq(S{OEu8^n8)3eF
zg!%FV8;qYXOuK2MRXP7YV-yY8AI-BD9vxhMYgcjhrfW|uKD#V^=C8V*NlnRxi}Jk!
zD^?c7ltz2Z<SrBUH|&z4yvhz^cCTs=791&y8+xHuriyo0EO@QAvj4UD3PUS<18jQ=
zx~=WEz(PA#uz6_DfpuUrYB8zqQLD+yNwQQuAQ)HgB=k%VhVz05Z-eq+zd?B^-ZnW2
zcNk8;-eqpWl{q|@8cx}6k2YOF<j!Qmf`fJShvp|tih+Inv%|%L@kyq6e|JP+^RBk2
z!VoKQbQyfh^szp{#utnD9))1BE*6vE-D>qJydMXs|4!sE)}BKg*bVAAFJewTck-`O
z@3OAY4>&pELRU?S*OI3uTh-@bt)`v}8{rb{Ze2o$YYbY|7;=0S@50aFgh@*-`zV)V
z3B!80i!FJOiLaB9hg;bS^#ab}Q5^zvxP-M9J7L;E3^Qh~R`<~vd&ufO`~_Z~U}pk<
zf@}!vV69Ez92#h4!fUg~)*Bl=vTLVg#3)E$m%sJe(k0h+6c%o~wq)s-+w#?ZMT>H>
zMvDFYOBQAAJ4z1k;eLCyvhr0d+LOEo>l~}BJjVUHhYY?xKPG1W>w~F-Cl<tDIO(UA
zkIVdcVRuCPs>KDctzEQ$05+8vuT>MD1@A0NNLcpH0`3x)BsD1Q?UfBl+$CbG{<~m2
zZfJjX<G$|5_nj5R!P2rMkaVb9rC}l3aR$!df#n8c6Pb%#sPX^D;qjX1_t9A{>V2?_
zJ0B6hSUbYS%dT(B=Z@{mT3GBKP&|_LJdE!z+=qp4um9)Fe;eX`?q3GT_k+sbH5lV;
zI0J~Z(l-Tu*c9-S$2~es@&b2TP0+kEOXHuIj}y3`)Tc44tW`QXDC!b9HSt&fMKCUF
z+ts}8ognp&nPk#Ax*#aDIK~Nh5>869D`2eDK?3&Dluv|LrN4Vb%%&V7k6Yr*6IO8p
z<@MtW5>u9)?3#OKY2u_<S)UMF8Dsy<mbpjz!jhJr>TS5Nvr6qhr#p6ZG4At@3k$Nf
z&um;#Sg^iXo-nwhIH)kj*)BNQE34Vpxu9)je#w({A+oLm-Emb>woNbvRQ_NN#$gV4
z3xX~)V8%EX_K=HY7XiN6us7*>APlFK@3L<|IY3MNNK8TIr>$B;_Ki8~&vx{@yDodu
zBegj;wk5>_1T|pZiTP1c^H0oUE=~rdcO*MGC3mDV7qx9uy=4n^@;0iNTB+nII811!
z{`sHk`(UO-uw4%_;W=#|%v#|sxTdmgEX7XLsFfOHsX*`gLvH*Y_bqp8f*XH$1DjpO
z^=#sUOxEq;XCO_-S%7<ZAEb!=2fPp142baPKe8N7tT=Ot_%!z!_bzvq`y9W`C17V}
zCoxd_svU`$`Wtc$elvmA0dvG&fjV^fI;c=UkK1qtw%{x{&Kz43jvSt>SKlEP3_Sss
z3FTKod60LCDM8dkGsPo}-orEGC$$M{fByU~Hu}PLTK6b-g4hVh_;mnapjv>~?B31Q
z<Bft#zdiqkh;{+WnP?U<)letkD4hnAABpNm!T4_<(`WjyL)xRQ!x-KVk{UYcQ=i@5
zy~43yecuq~Lzy7*850EWQ`?e(DTHY}diWytdI5WW!0zFs<P$Xo9K>j1U<}kkKmux2
zZk%jlo_Z5b>%lXB_Culz6~Hro(R9yq_pmAZAqK@n<+}(l{UO+!UT{JdiNWikRqoUj
z4~NafltDRdK^mHvoAL&G5SU`TXNl39DX<7n$nncsRuQ6@|7y=OWh$?Df9r{;?%lP;
zo7y8i)N0S9aPOImmM$~%jxr9kv-B1l`{(z@f$i;=kXvK!7Hl8gR~qV9y0VmWSeI{j
z$jsT#;zC)TIMf3a4ejF)@N)o+!4$0TDW8F>n}}+$sU4hFI)x%btqB>#281+jt*crm
z)xSC+U0K?&wJCVQJhU`^PP46TOI~b=%z_y8pI?`qpy&}I^+)pPtaa}XBn+!$DN&pv
zDm|op7%W)~--@`){F9#>#1C5f|1x}t%sWlyL~bz&eOrs>y*5`apL=Xx<&Lfx<`%IJ
zN%v1yg_@d%mLIhCSGuRKs0+_qf40r3?d(%|^5zXiUg=?u5tZ|!ofPvb!3zLmral2?
zddyl+r<pm7*lEg=p7z9s81e=*G0g~X+geq$Tsm=8KXA3Ga!adx!aBS}k=<Z#-<Y8&
z4YwgKb1$sRj0_{54^VqlT+X`pdJ`9@LXzb8qC7rSwJ?cqHwW6C0b{nOQYd)b%(KN}
zJFwn^se#To3Pob@2b047Q%e$4M_;b%J=htlju3by*F+aB_FrU`RyWdGJ=YNbg|Q6G
zG09wYs?B})FKaV0#?JKAM>VE-Cq~V4OOiP;+g8mpk`%`Ad<^(Tt_V%FR-RLkRJ$KE
z0|y_q{B1GyI()QycTnXM1x|4eLK8o$+@h;jnI%VRi&mBS>*<_i*@8K>M<xeh{<66|
zILDR_`=bz$KAwNU2l~ir0p}j<Hi9ECudAm$$H9+gGh5!Vy}EKtI^&DPg-4rxTH9-#
zyW~%#46Kr_D6ZPpA-`uES*FOYcW`LPP^cp8v~wF9+4Asa3s^hGUP}LU36YByB+2B{
z^BgC`S7nN+dB$*#8!^A~>x;m3%j+1xC@OEj#?;zq4&7LqF;WsRQBjuKBA%FF&cq~n
zS8Q%oCz9jsrSbB~hwwHiI$+c_g1>@%&ziE<e)rJ1;sp~E9G9R_B+|Vc8-^`IlaoV3
zlIT){8|)~Tf)~TPv#3`UGzI8&SGOR3VuB2r$Lkr~z0E;sYwBktk2d|ix`(xU4(aNg
z60k9;?52OI8*~uhX)yHgkM<qD+B`9lioF2HTk#vP8@bfRZ4;u&73DaKi%>78a<>Y|
z0(f`Y{)AD$9foi0AmM;k9<e!{G&7!p7l}?CXn&YH6SK!|DC$>;f;ZPyJ?j~~yCZkB
z*nh%Wn&6YuV2a@)(I>seW`Ygth>Fk1Pc8DP*x00wB`4)+zD9+Kf*As}A9-DtE-{S`
znf#Fjc%*&c*A4nWZQy@zoi<n|l5MX{Ur^*fVJS)QO=%ND3-jVqy}$*jjw5e`rb$c_
zBPKb%Lam%fKz+PF^uLK{WW+5z-rIL#p;Ec<_1?bM7sgH4MOP_ftD@}fAy-yJ+Yz_k
z_txj;u79uBwD<gzIXO?B?@b!12o0?mNit1bSP>Rhv5>|U09QE`oGhnpKZdK6`KAZ<
zZ@4N6Y1&d#x+-wux*mW`-PWd%d$#g2MP|L7U0sf%RBl6zXp?f8S|j+pH7Yi9?fY|+
zhE*X78RsC2lU0mB!!TxOmrS?&m~1*3{)seZgtcz3EgO>>d^#arR#>yGHEhC0UaH8b
zb8x6nRg^{85ZAdE)@CXqnjW~~$>6Y@Cjr|QR>)#Q@!jBPXqGZO&p+e{v}*`AJf!fF
zHpNNgWeb0+f>!H^J3^0vY||ipri5jca<vT`HlRp>-@3x|J9Nx>ct0H8|5N+$QN&DZ
zAo7q&zAy|ZPRd_hD+_Dctg6}39zJ0qN$~Sk`k0wW^J2=Lstb<n+F8~1LU;IG#yv9K
zLsgAkt$f@ZXBh>j)hiW!ML|KO^ONkueXY%1{H?7$9c>Lvg3}w568rNdQMC(W1C*Y|
z+A->A?vhSHj8>v4U~2t;A*NGPYY4b%h+lm3&DnMymX>}qZPS9~bt#^Q4+~<r-;Stv
zx%gV@ikK5Rvm6q;b4lY742Be)yFM8EFTk_F_b$^_O<9zHnxK~$ed&g}%td8^6E=R4
zj%D4p6So@W3ZIH+n#c*YB0SB{SQ*afK0FI`nSp434s}tXriKw%HV<w+<d%QTEt$lD
zjPT)EDjXR6gGg`zE~o9t8MLT1ma@_V-*KOvyL0m#_vv?suDyyg$hQyAlCRa4Y?#`X
z{GGlF5me?5yi51@#?*$Kq1|5Mi`alWiu1UiKm7zOp*-#ttWU1sYW273FK{O}24CPY
zrSI!=De&D3e!TEL@A8<!#z+!{u^9hy6*FA+EdPwo4EqR6U0WTW*Z^k(CvFrAaS6Hh
z(9xqjJ7k9F1i`bMLOe=YaMRIxv!P$7pkCd7u``EB^yE6?qQ1psoIbscd~#+JEgQ;h
zBx{8c{Laf4LO2xSg0%h)t)C3`Tj2b`{I<)SRMf4=bu#lyl1h{O%$#yp)JX#4JPfmo
zi*gJ-;sUviwq*mWGu{u#3bQ|KAC@hBKV$VksqHGms5y1A_p5hGB+pg7FRPmq1=0a+
zAB4%7qqSWzRY!C7?&a<YPx8;Kp<g}PewowIQeZGRp84*9T4l7GKvS(l2%PEGfpMOO
z`Q_#LhMsYOlDd^S(8pw{G#UDsv$F0BZTq!5eSCJ+YTI9BTS_}B&E`9r6+k;$W($4l
z!Hd|dj34OqDJzif(Wv{7JPOR1Q|$#lF!ri{;b5X?k}}T4H{HiE$i?I>|9to$C0^+y
zN%eLNaW`X(@}6vz8#+oIz5J{L;ym-$)P)*328expY=aVEvrEttZasd6P1EXDV=1r!
zuOfqZ&A9(V3r>SYi7`~U#w3yr4>>_dXi7?GNJ<LywOTWS)f2cPe^_VePzczL+7LR-
z6WsD~_J45$k#w#7NP<h}C7r8WtCC1mYb(#C&o7daf43l&gB41HZ@w|A7&~0$RQ2*$
zh0#~n4dUvTrvIxYiQ)Tdh#eBV&HL@lfm_62w@JZO>;^dCHf`2F+TEJNo<}XR7n5W7
z;n&%g4n`u;j?Fr;1AD6KceaK7Qyh}$<`FNo)5ReqZ#<^W`}}#KcSM~1YwzBxd#)`!
ztZ{u&NUFrtPM$Bj_b#vs%wehKmLP-u3BIidb{LNwV7j~Ufr{V|w~#6D4KW8chNvQV
z7p9$v(|&(8BIQ_J?W-vZpI9mh43n;TVl4SkW#voBYsc10L#2Kz$0qxu+cwOZ^Hf`O
zblX#N=4@z-Zj#3;<fChrryQ=XKbH37nzbSFh|u+GpH6+HuIf<A6Kl!blAZl=as4|>
zN_O-qm3=#4y<o4*o&tUcYyz;L5i0r*lp$=W=s(y!w!oJlEVw>AlY0)Aa?ee2TX7{M
zOZdo=2_!@6;EgMu=03(gPp{ZW&coQ3fef|qG6W!MY$&y)lC<pBty|nZ#(MG=a}Ivz
zh|W<F=L&nzGw=<>3d-43q-jte6bKs>GQDY^Ryb7FrUNB^JgDJ9_iykn)j`xcp>xQt
zD#}vCC5|5NRE+f1rg+{9%&iZMs#G}HCl8gh9UP1<$cj-WjK1F0dtx+x!ZEfgMp+eY
zZ=Eo=qGNm@O8tRXhEr&ub;6L!Gu<gP+&*OpzgxE4(|=iY;fiv9BafJ}d09BNAjr(h
zH`>)LJV0V?7hk!gq-3R6z_RK&D=LFRTejEx&xvxek;FKAMFe<T*(Fvko<GBKrfHtc
zJ37$MM&Ep<d9KVoDky;G7xqiWNpJyh8#ImaV>YPEW7nmz;o(YUcz7&62b5kZ1$hBV
zWdJ1qsT`y>AN+DRU|!uIN>lthX7Ca?<<)uIZ50eC!8@>7m^YTfiik!81MFB>4Y>DZ
z*)qTUp|q@pMgIOp3$xPZ<@-HbQXon4x3u(6k`xxHXO(QfGMKetq&d~oGqrhSL)PGx
z?InZKl98=PD=Uv~87Yy%^%i=)6|PBcMsK=XXzl8}zPzzonH$`xa$I6dLi$5X6)sto
zi$`zmQ+a20tlUvhuwzAgrdRpio1=|y?O9qL7+Ah^&s&Xfy-XDts9Lt?EuN2_ATKlY
zoQN|;9XuU#0l1pl$qT^^sdd?#8p4SX7ud_eKAs-)F(axOLi@@@d1;h*-;1@f@R+0*
zy|X(L6ium~`Uc!~_gw25?<jW@8F|amQS9#^&kbxHkVeKxB?eLmY&*r(#c^l-3%p01
zEtebFxtn?V(pXwPTEQ%4o=2{@^IM3efx8H_AIRDQ+{>J1T&VvRB!YS@PM=dRW@2$K
zW?z8QQq${Z4d3C-hVR?*Cq5ouhbf_Wv`zvlr_-?zst(P}O`Uv6Agr{jlN+xPKoY!g
z{+}(y;D1^;eBx<rncP3eHzGVHP^7n6AYfwBx2|@8(3z1(tp5o4>`xY>@joowCGHTD
z4N>bDd7-^+dwi&?!hH5jcTd+D!3oMGvuwR=odfJ=!rUws7%^p2dY8^jnc9PVA~4!Y
zWn%$zh^&P5HKz9Z^j={KDahkMK^Jv_XQC=NxGcfLBcUufSe59x(!|ln$_kt>#$s<P
zD<4M__E<<ol9yLfMM$VB(ZeHA6>9AxHZ~IbT3h=$85=u+hltSGXC~N5kVn{GK7RUy
zI>^YgIG=m|6K)f({R9V09%8bXMelM$c=TO7@Q^)2*IG_Clf#17;d|TgHk_sSgHH*L
zlF-vjVsaQlUiJ|I!GR9G_Op(ArgtQ)e%4x==D!Mek<Ih4C}fU}XOOYj%QB=g$!oaF
zGchi~vjgf6A*;#rg5%WZNH_Gn$4dCf9H1)Y5t!0lK7<mrfibLK5EU65DTz7mm)R^=
zwrBYyL?@;C=k+LME%`ym<K$5hNihX%bC9<a)s;CiJ6qYDkgx&^lfvZCyl{JKS#gYO
zP>5%!FR(Q9qaFNgiP}9Ys1It=nsVR1EkxXh+UM(F&tngEALtj@X;YZdn$5gB$BphA
zN5SmyDsHx!_)_HElRl7k4~*IMMeR{$(K5#9;n_TCXb2Z6_#E1T^8!pB@Cd{=Ktq9#
zhSvvTLo%AvcWhpC^t@wz*oElC&pS|4ePCX~gG_j5jKtyR;TwjqiqojdYZx+?92=Wr
z>=GoV$9Ty3u=MmW8-E(m1q^}rTDTbe9$+aL#V*sQ4cvHdyQ^CWj+|i=>}lnhJ(wl3
z4RA3{$aG+W1?C<RUI95_4$Jk-#1=kIf|azMVX~bN!OOhO?_?;V=WfVr@8LFM_&iLq
zu8;CsA34l;1AqV5d*MDw(QszgaFIk(IGmXYuzbkWE5_R^+S3$rFRy4XQ??>~q%0_?
zY$QDmE&>DL!Y4Jv!678oC(T=X;mybWO988%;jyX<Omh)@OMX88c_HjUMg=b*H~g07
zGx+UAH~1F4HF%Xp_zZc6E-m03_>Kh^1PAFe_zt)ZU-lB&3}sHkw^Oxc>Y$7o<bb}v
zk1uluzDG)1dK*cgEFHgsTfppw{iPe=9*wf{r}y~achHpUkuEe1^cz2Bh>~7x=o;bU
z5awl7S?Cf^Bl^mot;MxF+QPiz3w*7eOmu#k_Sul966*5OeZ=ypB%iWUQ=d3V*_w&~
zY31tD*sj_VAIsqI7#IA=iiJMGFXJFlKJeNs8oBns42@WWVPwoFh+B*DC+E-N^p0`Y
z;0v(V)q{q_S$)%lJpJH1JYbD;xdVdncewg@xL{mImH{86p)1T?b_w7KG6pkJ7n|#1
zkuFZda_-D}`YqG-+!>y5@8D*vz={prNuF>gH{ci!oZ1YWA=@Dk3%-X)kOu;zVJhNA
zUBV%*kD{#9+b1$JG8KR_z*;x9IM5BlbVBe=OoMN^>!XYJttqXg0l3N+67u)1PtBf;
zb9Tb_^Ow>%969ODS)?{S3dOlPKlNP+HaVh=#svnfnJDEnJCYmsMls=YXvAuF=j7jl
zX-E#%lE$m%!@OzZRS>2IFBL$Y7mY-KDacC@Z0GRO`$MNjVq-^64c(uZxSv=TV`mpr
zmnazL?!@%$C@<g96T?Ahk8|OyJYw^G{R)*Hl%X*ElFVIpGx$nl0RzDKHKo?UP66wW
z+AGw0By>B*10EQXV9IDsYN06}ycgNIqcZQw<_JS;J8MHpVs4^D*1SpOJ|`o_#DBJb
zc&t-JktA_WqQn@!>|<=@6YWx1#b&iX-zoDdSW+CAD);vfaduZK;<Brw3Kkdn=oy*M
zd|S`lcxGO#cYKT@vpUu@CR7>};p!FZV?MY7)+|wTS2)UMz!|qR_%#jiEQ5K%A0znP
zJOM*QYoAcJo;gg|l*d`S*X4InQ|1bs1ftfNn740lFFK<Dck{yZ;#DgD@Bi^;d4VJ~
z$o5`L@1B~L{UMQi>YDd;g{za`bWl^0tS~9uI>{uVYX0OK_OVei(>G*!VRmNTN`?gI
z%3VOH%>yz`=A_z(`B?kq52kKCkWgG_=_#`}P8=u*h*d<#V>oBl@kCThrjMbuc-EfT
zo-UTh3~gLYKD73ei|qs5%*fa7@s%<=|GX&JrV{uKqq}Uh&>Qxw5wL7#Q|A_@F&jLX
zV6yZ3A?lGf4>4!t7~+mvtBf~BNf4vxUy?lfN>j_xg$Xgeduvig1Fed}FQgw(tW8Vl
z{jlIj`f6<86_)HBT@~vjjwzLgmqd#N=JU8C7xITMKb@O8dbqap_-K;9XVDtj(w0uI
z2$Q!hOJn<6)IwcjT~ilZL+|X~Bw1s&e`w{>bXcoc^duX?UVtmDXBad+?D411eYzSx
zcFl%N>N7v9hqNa_W0R+I5`P){$Wl{fvXm6HPFQMcn2eqdVj!;3%SNy#;I~{n=*cCm
z6+=apcVket<>eUmIH0V}c{d&Kg*eca7hTxd^Zw7Kf`m17sv7D7l@@s>uBokVns5+f
zFY`b<-UF&@Ys-D=C8b_btvA$Z?WN>z*7E+)*#_$`CI0YK$|8SKF+-m^L*s`0)q4!7
zf0W7=K_j56sqfm7-!=2H<m$$sc$EG>Vot%-H(IhP5KmwTIu$>1j%HBjX!c{y(NGnq
z5`2!&sy~%QOgl(pLOGjICGQ|5$N}VID`1DQ_N0aOtR>(Eb=~nNH>m9;up1tx=Qjoi
z=?RX>0kTrv!yer6aDpD@U}x^YgyS$#?|hw(3De(g!y{mSO#9SFCcrHXpN|1fHNh42
zvC%V~&;su$!#}j$yEg}CVsEYjzs9|f4{*6`7?+91)e~xnVA47r;az%e5zYnU5K|F<
zf<_bs-ax$L+i&TKjFAyFQ=f1wfwMYKs@#sbk*B8LBYrTy)Hg@pqxJxOYtvItO)OqK
z!3+i+3sOgtCck5T<ZsZ<8ZJek3+=$K(oDs(!S>+86cL!>DICoZ==zr~&UKPI8JNgS
z<x%Q|lapit9G)^S8B+y_^xhQ;i|5E#(}&+enE5ViqV4~DE(LxYfyRg)^W{%1x3>PE
z>97K{f=gxwZ>i22Et5)07G*nzI~thCjpfl+0m+iIW+#}<4Vgufy63vo4n?cV{Y83b
zg~Gf!<XTK&utkVu@;b~h<*gdcw;~_-9)mTF=6g(spR@pO2JV-sb4c{`{&ZxInu{Wz
z$*r+#Q%9~mGbi_%zmB9n8Os#Y6H4^7(!=>dH4;f}aQeIgKS{xSotgPtua08L=+&+H
zGj-tX(m5{LMkHcGL^=UA8>+aA)f;NSz5q@r228#OnCt@*pD`_q{}FtDKf(9txDW5|
z<8kVDEG||oIMzFSDk|pHmX7B;Wa>PDtFkgWI6o=UI>S1pYA|WRX+_kV^ZQ;~ptxrf
zS)q(oMcUX#R4A3@kv7a%z9}+SU3}CcFjFhDWjVQJIAP(D=GBocnZ5>=j>cOpe4Wio
zva?J6V@v~AyTz4<SW3Xzpj}@uJjqj_BMs@PF<wPZ#}Z8qS4zv5=ewo2S{i%VW#+Kk
zX#`PU_cejAbk0K+!kU|03i%k`1$7H@@rWsSbxH+M>w=lC4`P#K^gX}A;Vh?chgl*^
z8%v$Yu-&_*<ty@CQ`{_#{cSVT-(!|c1{N+am5B7-WLTCIWiuDFkxPBu69PfuoLb5s
z1>m#TFZ2c5hVJ42?JN;p9asW>S2KN9Uh8nBX3gx!&lD~AC?hZK^?@O8zyI@OQC`-}
zvEE%DI^})<KhE;+=Zn%ohn--bhdo^2V_d@U{V;>pwZ_JO;EZ${tLl0s#=+f8XJ1iW
z%>NOxN{^r66_M_{<cRZv-T%+f6<`9KaS=ucF)zEOU=d597otBo>=KpfJ^QG8@so}J
z;nd3)LhsZ@W&Lwq(E|0ZKRp1$$3Fxf?0WEH^1f#Pt?58KK<1<U9PNp~!!EwJ;Fj=@
z;Sj0JR>ZE)UQieyoV@rSLL<ur;?N9GiSYlsfVk|FfEUJa^GDXhPfCg@`iN)gT3TD_
zg~zaA50`2I=S@bykg_=}geVF8D&t+|SCDNn#Tm>SQ!qnrd_Z5UH8AM+LX4?zT1-8L
z1ogZ=5}!EyVl5S2vR~j9%ZqM=O@?)9)nJWJip))yO9AO*GqTpa)8*cGZe12m82*EJ
znop|S;>tp&q!7+bve%hdSSL7#1E=o6L=VDJCid+OPrZd_t!BTS@$9oR;Ww5r>V$HE
zQ{_UWrm%w!lH!lnUE=<+f&2ENpmwt!_YZ6VTQexz!(Jc{;s1#Md(wYnz990@C$}#p
zr7zd#m06BKZmz-NS%TY<^(h`6DfN-oQde_xSE;oY9~QD-;-wJ(rhAdcY?_72s3;{(
zg2JGLgrLCqc$m+A_6Z^tdj5C5mww0aEQw!MxFh6#63AQmXq$)K|3}$(07P|Vf6smI
z4X7wc?`7znfnkO=^xlTvL3&e=CZH(Tv6t9mFVVyjjp>?Vq9!q>nc`-XZ0e?L{%ISD
zDKhi;e)r7`VB6h~1ex;QyXW3}&bg<bnfkxta=*+7i6kP^&p#vF**QGJ-^$zB+|1eA
z+RDep%*=(d9gz>8PYyw1hHY9x6S=7I0?`-ncxYArFtXk?%Fou>+bPi4(l#d=4g`s9
zWL1(?pj7VU>@m}Dqlu%PEHl_km67Cx=M8Y5uqEP~f^Seqv~Zb^8wIJRz?Qfw^Q0jO
z5fR>=^6hjQJ_*rro}LQv_u;dWJRKws5rI>}s#CljTpc2UurBG`yRb!!;WUAbn}#SM
z%gK#t`I-OymCfIOc1}FTzefW3_psnpu9{7L9D5OK2=AQrgw7)9Dq(ut3_x1u7@X+o
z5g+W}5FGE}nHcQYD0PKjM&c^{*&_}{Ea)R1G5)r;{xKeszyMcwDXc#tqOsxr&Zi2n
zfM>HZK6Tg5ce%e47|V!e3HLF7QTH7n)ZBdQu`K}Z6X@^i9`2K|T&#<s=-}vI6g6;t
z4EHVnpuu8+2EDYFbhj{?`2;p&smU`;kGJ*?b1^)A(#}`mz<s+#?BHhMU~0IqrPN*S
zX2B(6zUt}R*JGj3Q?+Y@kU0S=!)yF?V!*gwx_OKHnoQ$=C(|&V1HX+A8e2zkQ9KD3
zH4b{!{a1>Ma^NCCZ<g=LR|fG^mIE=l5%%--n+@XmN9dW}4Ey<cgEM%gmEH0E<mXMc
zqLZJ$S+<3Lgxb-mJ)J4mTh$HD@P7-s)0_@Fht7t?phE;*BUAwtabb|l#CRjPO1Lmh
zjhfv{V-fK&ei(|o;)8g@3YH(pmL3wqbc`@Dw-%5h<_jMAuD5cpvXD{*c|>du`wxq|
zDA%G=?p-IK)4if;*&}=$d5LsRKL73&Q@h~O+W#@C7Q+j2xEWxFs7if80G`>!@8o|a
z{7o{(|C>u1eV#&(d9tWhE8+r$c^c9^1Wy%gBrN{6u@}`b4b1PFX(jA~>gKCg+3Z(Y
zpEv3H2x};|z<r<|=<&iTiY?Td#cI?w)Gi}(^YH9!Tmu;$a3DBwDnW3fgs={LFZ2B9
zE%G`a#(t%lLsm1_G`FtqWD=OzU2kf}C|ppw#HVquExZCj7*Lxqq|4@|)+Df5aDQu4
zV^&OEOr|j`yJ*4NaH#Egdx2))ot;HRJKq`5XkPWp@5{*O%lBjF`Q^>a$e5Ss$Bi-h
zTi#r>@apC~=J;`vv-#?x!MC>NF=sW-IfKPPggMQ?E|-(HxKzq$@`<!$5c5p}Je7cl
zM)88I=;28ZZa33FR(L}}k+E6JH*2!iUFuW!zPvU|?U~vTt7a0dUwoMS%9|{Edwc10
zel6)WD&79ha{5XBvTEgY7CV6F&%s)K3V$agTo1uF9SH8C%T2Jx(#Zrzy4GAGh%SbR
z-()@yD~)yaRdu8w|G>vBt|FW_{JX4B>5{+W-J!+r?JST)705o|XTD>SyYj_FO)dLd
z<?`13Elq<juFN%l=Z)Zj4ZCw2)_r@lvhwJ+>l$)*Zx{%E1Gry2_5*fN1wDx#>v}0c
zVBmV^jLsJYW0ltL36G3k>}NH|Dw#ROSZw1G?W&q<AN)XL)4n<3VQu@HYt{vu^A2_q
z6$z?FXP1Vogvv-eSc|9nD4eG=%#-Fu*+tofs&y~-SPp&gU{Oxma?OS01?94gm>J}J
ze0FrpS{2rc5$)jnx!IsMI~w~*WrWG*a!+cM27*utL2EdI9<C3t6uc>NrnTu<Z(M!p
zf@Sgj#~L%Y$KJ?Ta=bD;S7vP|Q^}<H(XKv=a-*u^T%BM#Um(65*1V;>dXLoqg=MoJ
z>WcLC<HN;|AVf4y^Pp3>O6r{%=_XMYgs8vt^!H3CmxorS_?#2=)P=7`9A=~-Lm*y+
z>S8j+_{ULx(+Iz5lteLOqyOgR<Qm$+2=gk0yc%xc0(=J>*854UEveKa1g%<6GQ$WP
z5QZ=Ub3usH<&Jv+Wh}2LnzmGVCC0?KSwtjec&f@xd@_}vf0hUxr~mwtL|JKXJX6uq
z=M-C)m{1er<eo4qGNCTknft%Ao?JhJ8D`Tj8Jd|IMTeSt`uJJq@ZVjt=)Sx;KX2p3
zE{mdF{rNM+-fJ|2sf%mE!)q3&T7-AiBu@{o83f1_k83c8>4-fD7i5!r`+TjUXd>fy
zQlB6LQ`w-VwXUQ#VZrgHio*k`H(VmJ0~9$jo0`_wUYp%bw?bYN<$NP=`LUv=GfUD)
zNabP|_XTO$eK|e>g$uHrWFD3_UNSpn=A)@OjtXB}ny+5Aw7}cHZ~@?|<%d|BW`O_+
zM151K1T`Y{T!kK#3eO+{S`IY}GndHOtNal~L4>23N4RI3vN6NQOPMAalm?LKjQo;?
zDz{aee$XII=K;PVwxfF>Jt#5I*~kU1JXMTuMRBHWqrA{v5^Qd19beX;y_Wc&AjX#f
z!w_F9=<V<j-zNsIa(ei_daA0AQ1v{g-399T^3+_Pn!P=vC%J;Ce3^AZxcV1CCudO^
z{6|jfcW|PfHN8x!qfL+nqN;_+OuW!aVRFttaZsC;oIH3&$V%2kk`D&DItIuGy#K<^
z?tZ5G*vJ8u>cGgccaPoJmzA~e#xW!5+i$$__AkEI-hKBP-Q(k9zcIDraz3^8DJJ5y
z$llu{w75w1pSs|zsm3%oi>0n4RLK9C%MgzWdI_wF1ZI&)q8Adq5cC9dB60I2RM;nG
z9rK;YadUt7sb*6+Q>mjoKQ7ezmEZY4$kJlVaDO9*8LW}S&0RcNmN$AiAeg+w8CXd3
zV;DnC7-#af%!_%NH4rlbem3xZ><8c-aR34XP<jC-OdzCy6L4W*Sgf5EB_=`_tgPAP
z@lBD5b+Jy)2`w30Hl2FHH>DzEc3g9s7x9Wpb6sxZZZ{()Evot9-q<6X=PpVfdZMFf
zbp-dZskyCxlmzZq`&Tz?jx3GynQlANO`aX$L-D1-F2L8<+Rfj5rhRPv_Ra?`2Y7F+
zMRAH?8(4e@>h}MN+PRT}{Cjs`96ftcZ-YB=@b-o0pS*FBLupLS<F_q8Q>k9g4!%J7
z=n~iqgTd!@`9E4Crj~o^!VI*B&^Y_#f)%s(Hdbwrjid~nYU+EuUpZnMQJxT0D7STP
z$pbgHCx7+4yiOGpq0z9PFTAuSt?0oIhE!`?qND2;#_<1E#LCJSP)31xGJY-lJ;tWi
z0?NVlp*(^U+=;cOr>k}kU{)3|nhCEy&=dEyZHOuq8RB+3cEz`4`(e>jT^HN9SsTSB
z_CD69j9vINrwVJ`Svww2v|^8+xm##XEEYP;w$U!Y$Jg4&*TkWG@$orA7(3P>A9OT?
z^|e72ZV`<ZAGZx?NeS^&T9Y>3>Q;ms;&1vUOYP$apYH8Hw<LikurW&YYYs6r$*^QQ
zI3T)IunzS}@@wWqS~i_qpHGcHmfaUO=4t*u9@m;UP^nN<4kQX|5)0iI+2(@vRC3#~
z3%yB*H~5j?Wo+wa;TT}y8C)t$Xi4|vPqUA*3p9_p1=>$Do^saS)FWr0m`O)q1$>t{
z$EV<V&{}k-IF3Y5nzJsHMiJC8Q_^kg7v&mT6Yt8zN`JNXbvBQje|~ZGgL5KrGPfsJ
zEA3J`*QX8>G8ovgbX$J^^+U5l+mFv<9stN#yCmLKypoHDJp+=9Sj#{WXm5xWv!3MM
zp`wyGNJ@K_F^xN}EsY%N+2s}PZbqC_=N0;9Hple6v?@Jn#q|eAMoQ;rxDeO)nphWW
z<C$|0U77O`5f^OnESXgsn6!9KHXO#0HOZc(+b_*-y0E*&1f?*xnWQ)L$0RSB73M*W
zq{x8)Ty#%8=-lbRL_h62gf=$6q(4)_#s~jw<1ev@Tz-A`$iSsF86&<~tuf$TgELjL
zmnJP6T@cVVv?;g!>ftsMK7?E|F5dp(Ch|RRS+k)oY6iPZ7!&z)1_2loXCD+Lx&$&R
zgy;<|cPzeMloEWS<Qru+XYQXW^G*tJ9CZvy_L8Ogn{!#pUmav#)_%1IdV3xU2sqN+
zd$88e+DnGu-a&qBShcYY3H`l=B$<D%us2N-*S1kLX{Qd(>S}NAnsxAcfBv?m9l&ku
zS08Yl=3fU0vXcQy22ir6_!XwZxM&=M6GsSARRj?an@MB*ExBEhNr?+iwzNLFFzH80
zOj&qcJ6<L#YF6gtuc!=mj<VOBaEdC92#*L&WJ)ZI7R-Hgeq7R`lP$!J;XhH<C3_Ap
zUu0f6e4@_0bX`qIXycYy{F`DUL*f=XD@SQc6lJ;T1+XQ333+%w<Y8*J0^-n^c_E#`
zP!OXi=QaR;K<EVUjETK!6PBO~^o*Byid~K4o%s((`G1&7U1qp*?#}U^eyXHMTXqWh
zR+%4cHDks_hE3MgX#PU&_?_+&mU-EDhFM@<ES3lBBf}oTVF1~Z?xLGM2xDTi6k%Yt
zI6Ax}NKqf>3o?3&(A_pDTw?3wUAeuz@8N)ehx^*MS9m+xb{I(bR~T1E^{Wo9%uG+E
zzfY>%>6TMys*k_Yb0)hy?PyK^^@Fo|Iy!pjZdD&kdq$%!I+mY*tVqAbUwx(9VBogv
z*bOl>I2vaR{Z+dN!afQC4%)Q=8;2UoZRX7r)<g|lUYn_0a%DX!YKyien>Hm6DmDBf
zZZ7vVKhM-Ms^?@!&9Mc^7wA#eziQ@8%{-csM})c!zX-T8DR=sgRA56Wbktc3jg0%5
zW>2qN^|6pWy%yQixyYXOM)q|6V6l`Vqddp@<}WPD>&oz+N<Nyc%c1VwM?^@X9)7kx
z1xid**O8X1jmP@py)uzR%}{-MN<8N3B>1!@GDP8TFr_*+$}MP#jNm&^7-i7n8N_GN
z#o^S{;fsqjpYU1HLl;*Bd1p4q+OwyKPfBxw3z8~RkevH#%A%7EjVBhSU?Kdk@gKfe
zb~R?*X9t*r8c)q{{u$M>kXdQ|TD*YGU`i_Buo5s5xx2T6A~<u#0U$e>C2GKMX*eZi
z_!3~yEK#f3MRe>$7nj856jWK5qj@i(@1eT7WAl@k0nIR=nZnz6CzS<DOB1~5n8<+x
zN4<hEVfLHYXL>%<Lr6%sp<BF#H;rAFw(ylT8EUuW)|B{-iE4f=SBoj_nPD8-b#@US
zPOfA(Ds7F8HQCx!OFVlEEEqHJY^WaQf^SZ%!*9_rOEr9^hKGG*)Q<c1RxZB_72p}v
zI2Um*<9dA_t2S&6yaO9CY3VtCP3@$`|CrrN-|LqgFdc}SceJ7L;rXZ~fC-!Vq*Tg6
zO5!~Q+H>c3i~k{v0qYCA7m#dN#QZ`ahpP-{3WgHD^KW(hZ&P~hlcNK~9_)^D>NT8W
zK$I)f&KJ{gE`B#7wX53w<pHK>)Q)+e|MKCbGR_Y3h0tlZ2hXOqSL!c>RZFmqU?a7T
zLvHMd`UJlR;TzZa3?yt;?o;m|Wh9tak$3r5nR%M^^p`bcj%yAwHNtP1`VV2B(65MF
z3|@t}7^25PDp<NrG8ImQb8+Ji2MCxzU#2y=F4j?!*pjNKO7>Fct$Vh4{-rgU&QXPm
zfu;FduFj8J($|>br}j>7j7goF<-KX`NjAeJB3B9#$IVHR6<ED<b~vqt6H=L%VB>po
zanphJ2+M$^S@Sak^P=6{q6?%8JFWmU8rvc4IjqshgNHUs-KN}3jYhLnqoEcdZpP>c
z_WcH~1>FhP3buS~1#6%qHo70;8EQVs)G(s+)WSIL<T8b=fvs@+I2CcRYd!%P;W-hI
zK|aO01BdB)8w;@$@PaZSlx%560&@^$Y;AcX+sNYiCDWapYz-L$Yg-#b-*7M6=}x>c
zoJr3xe~lJLG^voi&5$doD~}`4F`aXVohWDQG6w$<b{St9sVy7`lo$Fz#YEJF*5Hgd
zQW^F3X+?dy<@#-6&zLOz^l(MR;ZK*EjF>O|^iV~`p--2ZkMOsOhpU2vtA>lsM@)-W
zRU)~4Rgu`Uc<(=kSAM*w=)#4<Js+(c{&ZjQt9+-TX=_#GriM_~ME$G0adSo0mL}Lu
zF!wF|Au-Koo}e*UHBBV~jXh@ZuhDn4G&bs>xlXEaJ@sk-jO(d>i0v`PAx9792|o?@
zvpVx+<-*Hr)77pZ^}HukblI6`b1Ql0*+FVfqh;r;ESQId@pl2|S?%~BQ9MWci<-gD
ztI0X_U)y!#3v`a_D9pR~Lx!l{LF4Tv?h(K?)!%o*;?uuCrj$Jhzvi0HNVRY~_=FAc
z=6$>o_yo-m7R)nu@d+Dd)nqoo_tE!yHUZY~zMf5RKWW~$jZI+B!HW%OO($c-c2U`O
z(ikx0Q@8pAC*C!A7!CK5T0I&!F%r96KMq~UyI9gBzGtlE!V|MWRQ$v!8*Urr-p{{-
z-C?cgKo<K|cfRV*P%w0zlgo_?Jun)N>mpvHWvX{ZcV6MbJYQDBGYl70Je04Ro8~n|
zZIrX_wdHF+-CLOd;76;5-`toxjeL~SmgyBY??}U&tw+0+KG}0q+MgZHtb1}yw6AwR
z|3q!Zil=5{eh0^XG&BSZ_JWmFXSHU$bRiWw8160uVQ5HA)`RcwuQPgDt$spWb>O3A
z_cB~-i$N3}`qx$sD!^#E_Klvdx^F!Q7vMidBom57KppT4UCw~S6tU4!APQFlwvPXn
z{|?6N<iVvGYc36te`&b2Yk&A*{c6TV^93^}>f-vgW1W$=a@p?}u0<{k=2!t9q%<%G
zhlm5VU<=3BG@7NQO=x7I;D^N-g9t7#3S2Nr<6{Qe9_~>l44v!me|AYi>e46X!Zze|
zIka|dacq0B(j@VCcw$Yog99Q05^JL!5gEYpSu3BJZP|5ULr%d1uk~88iVMX4a*wr<
zl}n&o#k>qZGh=CPZ(eflrQm|O(UwW`%R@uU=O<Z4&n>{APwn4`d*Psgp=ORFYC7G!
zW{wawJYF(q6M3ffk-pffipb&!$H<NYP1HkETV7Vj|9)k5W9#h8T%>zuS5{`f%k<!Q
zm0$L}Y%lT_Kavs`lYTlznS`am;-F8Qh|R{hVoFzFLJ~Hc_r1YfVf)l;@iBfFkr)3W
z_X^(3q?`(iCmhi9TIhI)458=rQr}pAJFyY-%Z?kGjNb_(nwk-gVxIrL6j;%{wS_EI
zuhytZ0{<c-CcmHly?`<-LSwBBD)HR$Gn%DmG{h79C*;C$@}(n7{^I{ent2FvH@ioA
zekVTsqoftix+nN-`itf+hI|P*PJcCO%~kqb^bKS$!zM|s#dii)>vS~XBpyE%CLiAH
zV<kBi)$tJ3@(v7U-*8Z52Zy9ftt)FzpAL%iHZ${04E9NuIo?R>*;7)te{K|OmbSp%
zWvD89L7~5Q!O}8XAJf)X;h2+h#@s#F$xh~FW9cDt%34qu;FF{EM-5}I%`orV&Slo+
z#tpvo2BN8vBKV#r5ZZVk=0fqJ5!b?}BFHg%@r7s>j*QHKIPA|aAdesxbt3NRmgY_E
z-hx-69=y&!Pq)^X^&??))?wzH#Rz}R$k4Z9dv_>tm&d!$6yws-SJ^)PkKNzzRlOD1
zu)mYMCEy5P5O-){!2Sq=1V|IbB*sV_k&f_xJIY@lfe7WtngI4UHKB0tNO3*g3p!U*
zyvCU*5imx3EODkIe8tEJIXXfRMSy^<Xv7!mucvEcIDWl^GaKQ{N6>Lfi;{#&<m@%=
zHCmiS{=qf=&<KB&+D6o?*aa|$fTju&zee-3-Qm|rq4wz*sBCcCm?B1SoGA$Y17wur
z<n_=C+Hhb)wU7urVLZI4P*%UKE-U6nTyfpD2AQm3Yi&TL%Z=!qnr-zmF5E_5q_pud
zmB^5CVxvB96_T$EkeGT{DGOv)j4^d@IFPsbKo@Etv!ph&nZ|rEIc6t#Kd8mb&_EM8
zjhf4-2V@%ax>&69e_##y3*1rd8tP<s;eZ|<A;(6xT70U04|a>y?0nFehQwpdt1<a6
z(8n2cg*BffRtS!HxUIez391imJ>C~L(%Pn|k&cj7BcqU}J*_DB`D9<+bR!1XrrkRO
zRy!_^*a>-J0m&aB1vhRj*N@B2*QUbao+18%!Be>BUh+hj_P+BLpWZq@ajO<=+=3s5
zp6}fM;f+@B5X_R)VgVK-m)Jtu)2Vz+#!sz>J0c=F4!80y{1wLUCwY3Hg+*YxocSuO
zc2!=^s`?1F|B~h#{)l5xj6@O_f(KKapt$@xp0AfBCXJwzCC0}f%O;I6!ljOkjGnv4
zFqCRQthbHC2z2Wzj6=1#$)ik~#qA^9^VzpQ7d1b@+x`VRD)l>0W?SP&+_<(8Cdd{H
z@l6kR`6ju4UrFE7i(=yzKGjFfs^2&&G6SQEBVEMctOW*=$Rc)~uHuKXc)L*XV_UIu
z&h~P|YPd>sTO%F`Ysd`1{%nT5Bpl=03zl4HYm-PRP$x&+c9?2I@0PzcBWLlcR((By
z_A^UV)7}96pTDap!0P&k=O>L91xOisw3%08c_&P$lS%{7vk9B}Io8<(k-CszA;+K`
zwN8p)LBN6#Va%|f-}vWu>am77%FZLrm!K_4fBFKcz1DQ|$OgWLJmtH$F>|OYlt1VY
z=4VgB9RebNFJ$av<X8U%9ukB%5=*V^1yOVp;ZE3Fl;?nwPR(W1*64<yJL;?L=Wpst
zV-Ok&<rd{?Vy?7^iX+-W83zuG5F_sN|7ojb{7ds|#X1^|dBMQ2syJ3(I)giX;t_;P
zfUZ#Qg#Amq@A^Dl%Cp7|clsP%t$l`}F*g69$V)<bgabz^_+w(nh|>F)dXeU~gg+AA
zkOgGZ(Wb#}tTl~^##&E8YS?C|3KmNcnqx}8(UB>8YZ3|ZKLykupr=hk8S~dTvV-@p
z3awh2m9?x|p+9_HA#Z;~-qO6nzw8*ObaD#wvlGV0Sz>S&<4@RRZUaHk1jdI(m#(8D
zlSjvK!|eJgG$X*$G9V+AIY9PI3`{=d-GF4b4M@<fSX=vq#sKK|UZ~n}=T@)dzr4K)
z%DQzU#F=~Q*E>t0a8I2$bV%6GVScwD1K?cL^HzF10_tNU{8J<R<5~te`YN?@V9vM<
zxfDMbP@4=)RIu-ZD~{Kz99J5#?s$q$n3bCvyqvu7k^1)2VG)ma)E=Fmq;U*Q^GAVG
z7ebuFvH}CMP&@juQFX`h&WQYig8Yci;~g9~s-{I4ouaE^Z+|Vo&^h*l_$R>Qes37)
z2_pcbeIfoSx_w7!^)9JwUv0?)v!g}|Qwo}XtIWx$z-s5U>}d^6#ZPGKo)+eeCa=4#
zt$X4xhC^P@7dQ_j1~wCWKB19;(CC>o3Eh|@{AZK4{PgJ&;)+l7dk$24J)&uSVZp|h
zC@%6Ok@0V7D)?nCp~)U@$qH9te!IqgGI$Gd&+u*#9e2B(v?zknEO|<OTD6I6dumF>
z?(54Zm5<C_R1_?RyTFQg=PoJ{ib$%3Qj;q_+*QOp3FBby=I<XW)mM^?Xxra-x%JV3
zL|RFb)|#Ak=Fi=ldDv<JreVa|o(Jv!|G>0h-_+y<kM&F{>=a)X;mDy9_j1sDS^Oma
zFz?Jj^3;8xj_!s>muBe8JO!$n!cK-aWe4gDL1ip?w1JNhP!W6=+*YVNXhgI7!2T%X
z9j_6(eCW%bP5dp!;3gyDZ)v_D1&@#u5O?q^7%*DMpOl|W!`>$2fkrs(_0Q0j50kN8
zhRoMhmnvHRAjiKWC;#9p|7@_eCDsV8#IL}$FB5}?2CNT*K8qqlDHh9|TK$Ls1?(;Y
zM6gIuwjg22BWQ5yC&05&3*9dM69nJa0XC+YO-F4-9fVYpMwPi|wJ`1j&#?iF=0a3I
zx*H%iPWx<hJrJHvVI`aSKPi~A1(4g%<7E3u0QfS~hXY0jwia~FS}ox4$Ku&@0k@l0
z<AZn_1^XBcQow^Di~0!_Cxrvl6vaK3q^!6wFqK~ktLn<Wb4!!dE(!IC%?9eBg!%**
z#_)SSh|~<8ZVP5sYvwZ{?WY#<2T4svZKSo4<_uG59a)>fA7mrRabeBi!4fxMUar(*
zCPay&t|f+cByQBEJ~6Z-!O+VTEjz0DAK2gc|EqYQQ9fcHRuJY+ZUlrEDD26~?fl=4
zcOGh07?4kR_bFkm2j(6>o{n)@zM4FQanp}8t%Q;n_UZ`i>Q7+Kp7acnn1+T48zkud
z_nSBKN)(UMo~)E#^`EAGxKZ;UOb!c~mH&16fCF-%VL#^YMI%HIHler;kbAEJv)#dt
ze+Go|5dYJESc=@CV7?T*#+&^8KP?A?xY;=NgyCvL&L#tI^=Br;Hi5_KGlKnyE*i)%
zkfnKNQQ9l1DH+O~E&_RTN<*xpQ*2EF{|&L9`^<{;!H(r?(~y%OPmOX33bo9Oos%0t
zf-9Eh%9PdduDiBwB4T~eGOKb9R|Wc|E1X{qse7Qh^KgLg$t6t(=SD;Zc!c{nOnuNi
zuB;;=wKYlNsw@azFz_0CKp*7{{~4dkt~RiTuAQi#gQwg7#}v%Rr?69ru!8n3I)SE>
z3zKR~XLly_9jy<}h;<4GvB+06s-%d`Ta+bL6h=BPAKLk$9)707(lgX0JoB7ac6Vm(
zd^eW`McE4q{B_W8v5YI86PH*Y?`-8Mcg{#Z&YJ3>$MG(z25+^7J<Jl;2*{FmXEM+@
zPHpB$AYl>s0`HgD`mXrRhg5?Vp&ax4lxOxGcw(9+Ni44zx=&?P@;i0Feg6IE)o(tV
zd%RoFdsq?8T~LC@TZ&w$=Sv?AHX+v2U8jSaL+Uq#(NM@)(96@bz83j2syx=iP%~!e
z5nCP^Sr+SQ$cUzR#+Kcq&KAGdFRMkVY{~LtKK09Lii~W^!l0Nw<;2{G_#(}sMVcS=
z#9A9t!4`q;5~kMP{%hNqoQC)S#v&-nlHc_k%=I(Ky6z6<kGz3gZ}MSm?C3U7w-A%c
z*<e02poKmMVzNF7g+5D0{%K(`5V*a`G1S(Yv!CG_HG}{CeSXU*nOj>+Ufi~Eit$Sf
zr|?yO1sVlN*rz_RHS$epjIuW81biJF7*V1BQyp8@<<(coE3Y7D_CJ@i<yMdrf2ENp
z$?E?#0GESLVl{FFpVYxdPieqKJLq`m96}SjsO?Lmi{2ABJ9GHiXW3_-(LDBF>!q>w
z<iT4Xkb`6YQ`s~?L*>P%3~3+vV)SqqETJf<al70|A+)55<b=?u^FL5gk{U$J5xa*!
zw6GzL1_c$lWeAByrw$>=ocj%eWn$v|qqXg4A|lSTQ!z6M@BGt39re=YO}MXu{nF_N
z>3*{%#p`=&eFGzh2j@n%buG@(d?#@`?i3IPpOUiw@m|eOy=VKQa_|$?f3}w~??u?r
zn=Xk>$(o;%n-X29TuPSngH%SPpEBn3Q}WMYj{r}p!px(y)ic0@U*((XS>5EQR0PbR
zc+HCDL2i9l{7-oKRibk3TIhB~@9Nj8QkHa{G{m3ok<QBx{SMmQe_Myh((UchQLUSc
zX6+0P-Z86ab8A#|`}WfGih@MXxFEY9?SkUG5(+EQUvS6#YcT&+gL9+ibYlKL>gLa-
zhP6M`cC+nBdstd}T6$Rf5xjY*J?v8NqMM6)?G=R)uf7^lsIV8_lJ9Px@yf|FMok~8
zD;S!BT0${fxdbVDZgTORyFY2GCut32j4fpNV^6UQ|Eu<3uybHw@#63PKU4^uy@C!Q
zJ`32WCi5R)yF;5GJK1nCfA%TX@qSu`IE;d$`LC)4>csQwxu+rLLo5NcB93W1c*%`w
z@;ZWuB5dgBoKph{d0XEZ8oIhZQ@wG!&{`>{Cu1MKo}gLXzPINSo0VT2u1H*Ru5a^>
znD%W&{I|v1+G8o+5m6<-26ahPg1$t@8CTdRN5D}t1#^9*dP{xCZ3db|#7omenJxSp
zGTXFv)06f0s>E8a#5nC>l3T?wLLP|N&;v#gbn+2?Wh~w^6-1K8fBMv!FZs_?iN{s`
zvvlHi?$p=BBa8onynJfO3I1iW@#K<|q~+wYlO%<ob8_(sz^`uN4v$5MHPjwUEWN@c
zUe=Zx>$8M$C1=GhL*(Z+@((&sb&uG3tQ~oX)RP}Vs}UjL4(x(1C2f(R-Y%~!$jnIh
z?i^Yj733J5oL$x!=`P-9X6IsO*4pV|rjQCRq2j}`Ew<vj4Qd3Rgj|MNTbhM0kf?m|
zKUVDMOv3j^@%>)i_g-OMGE2=L`BCHru~ky%juoOQx7=Y4zaTz?vsBxIt6j8Q^q}Yr
z9<AfY<7;nu_b2+3_di{8_g(+XCwD(tV@jKm1*^gwJB_S8?d?6Rr;*Pb!?LBpIbn`n
z(`-EL?cA-Wr8$PFq{2nQCmz;D{2RhW^gi81MjFIGPkNLcuF_=V#@nCH<LP%iOD=pe
zJ{~~eMtqV(92`QDeJtD^Oidl!E%+bq`ef>zpJ@KN^ArB-J3kTI-T4XsKRgHcHRV<|
zUr*MHUxg$v6&fei#vDPrkl4i5z;)IOZRbds*wO>IE*Fz94{I?o6nlBFUhq~CYjZ=E
z&ovsTNr{|}e;CIZB%41r+B<`Pf|Rp+84{NSWpISyUrHvPex}>vUqv^aZ3&l^#&9;(
za)*scK7WumoxZ3pHH!X2PS1QW>56)z>4V8vn6DX<lFVOM|C8aLOC^5eHjBFZ*es}V
z@PD^ih{YOSZ?h1KPd@&*dh;ZUg|^qm$B?*Kop0O_;d{^?$6e%;D(iC}&*j_ZBG~7?
z_4VBv$b|+z>fTlM+3`B8H17%GBFa!8`cf-SP)!&qzk)sPu4=3S9sJG?()QnKvd*X{
zhZ^etYh704*@M@G8qO5_XKvc!ccwBfbPAHXn6o3?Pg7}H7pW2WFRJ6PmEw5<|Dvj<
z1d>@LZ*hbCFrxJ*5v^@)5C1B+59_Fny&AVG>LTofawrm-Hg;<L=X(pH247l9@>-Nu
z<nbp@35jHUb=LNeHY|8&SMm9nmQ`slUDm9^!@!q^_^;ScAj4{Hh`Q&}_HBfwMQfkS
zrtrQ6y{~M{HS>xtoSRhG+e&=1+Y$-{H|#gD3!m)uEGsX|iZ*@JdvkMgYpT0oh7s05
zOzRpz#zy}L;zlE2=th`Q1GJ2YXQ0H@qx{SK`|(H0G@7y_VZ<H^a)tUP)BgSUnyq-f
zo9CG(VV!6!%4xu<eHMGiv&=bK?xvW3<L^OxN^aaJ+2e)ybPcb$LQXyYxVGTJYp)S1
z_e0t+I1HHdRw1Z@x_~S8sZ(m+i@CmzoFWQ-I^%+d4xO6K=ozKi%QR?GHPjtSW2(f*
z0mnV=k6$>#&tX>I;q+wtE(_Hj1h1zM^JKUJ<3sEta2n~b1B-&*8|&B>%{HNz2%FE$
zx-@F8?I)tg6LB-fz5Bi{a+JyA4-5WErk`B8tX`}2Sqk^<;V&Ehg7N77-WzKu(upmW
z-ibF$waIgA{GEuiW;~y6i2ugmIUVlkpG`4GYoHO38PDdXtr&Q7TY+!I15HJ}tpNo+
zsVlVpQf50voyc{|=h&V0dZ0PE1&9L^`-ES=88Y#Qf~_+it3GZ_)(gVpVG-JDMbvpJ
zcufrqt)O+$41Yl`hIK;xVb|-W=|`)!jXYY7LI`seg;CCm=B-u1KJC5Ajy=_|LdMpX
zSI*XKY^+xm)|3{`vUGQIbDw=~bj$NA{`qjt2QlqCN?vS6mXBc_F+BKg@0D$ZMGw9|
z^!8SDtp#Jd;(A*0n+v}@eew*ooin0Z#CN<7nJSceb?<`Pn1=I1M}e*`RC~QQ+*G51
zkjK4Vdo(q2WoG}y^;zM~n@S`ycXQ9QmUtALNlgnZ9>_wm3Ta|Yb}4Th9VL~SIQZDv
z`8XJxIoR1dmF|9bAhYSwC23a~pR~Hj?A%rL;e=#7-?q47H%fIcI94+>`{`6uvZ-jj
zTsoY$L{=K_DN*K21-uF54;efQyfLA8O0y&d2dm)Mg+J;L`vQLek(ol&7%1e@=%)z2
z(#MT?@)yLB@bA)l5uA*=E1)q!<CGBlo6O~Z=>5WM|K-b?%yG{!UAv{A^Di+jD{wkW
z7r>)QE@JJ%nX;Bgj*vI+j6Ne$<`Z)CJ`re)XdZa&O~6IZ2ayMT_HB=*(mcwiFdH6v
zh_u|{fqs*zR$srT8yY-eC19p~I`C9#@z)(QfSanP)Er{EQk`*XB2LbyxTMGn-0c#L
zlY4v-A4XoMadHMmCet)!SOcrE?-5T;dqjm({GnbnC;+sM59C8#K_`8DH|-*T4bqKd
z$^K*iuZIhA=I8l7m6Tq(``Y|9*Vd(|clplRJ}0K7B-uXLB%yI7@4>V=r}h-7`tp3N
zs~-7oZSwTQmUV?iy;iHfeyD=foV~SYjl5)6SG=*MjnOMpo$M{xHfPnErl`2~tp$)D
zuEG|y4*2asy^a(<q(%wg>AkHm1JSjd+~DA&{uhVSndQSLLKLPYLx;-$bDsm%n&;Y`
zE^JM0ux&ch6@C9^2ehWm1@0%TJz{kPD?c_suoF*?KSy)N?Nc<GF7h}D;a$6*TAUa)
zczHF+Z;rGgXHN4>mu3@o;~}O}v(}{Sf!7!JUE5uLF}7tz(uJ1=TG+_{AD0L|M?JVO
z0z;(GpO5;uG}xZr${(%{^{LzpCO4aSr#Hu)rgeYfNdQx8o-ubzWyJ8}X4^+S*4D+%
zigV@kMSyfXIurTY+Ou6C6`jzct2%~{5F5LbS*#Ii^F+BBPqm{ZE8<X{2XHTE2FJ_u
zpmGJNC}IxN{#kgmaK2}9Qvo}b8}9pT93dmRVmv0=XU8M@MH}^UM^y~+8x4n{&t~B3
z|3T>2q^pg==}J%ir{Wl0j}XzLr8URCShDNeJu3DZ6O2kf@f{Tzj=?iiX0P9$ySQ9F
zMHA#vjQ&AQ&yMYyw~K$OkyM|#wPzFU_=)liMz5kMmBlS}%-rq80#a({Nn`3VF=^`e
z1HVE7-$YK4-l(OEZywWZVILs;aKoNC;n{0n>@0t5U9s9Vwp0;YpXmPJ1M3l!euU4N
zp4z>yj#`<6n-6vB1DCh0JcTu_;(NIiEQ04<W8D=?{hMYFyPoi?>-S=;)z5b-``Zvy
zJ>nKu9v;`2?7n;JCddbS_{8Zc-Fs`B4$O_P@=u<%AS0+C*4;g(C}hX-lc*OEiX~rz
zxp|6C<%>`S_Uc1EsCW1dp;5iGZejqR&K?%v`L0NW%7|CT_Kgh)R~U`)*eBe?Eyw-Z
zm{IDJ1kDPCcYqS~l%dBFJFL-stj|(F6x)ZXO$pA<2~DZ&9>(%kZpy+FjSa^KlF-Y+
zz&E8bL{^;v;|L>afjo6aSa$>pjz3r6_XxyOfHxq!3k4Y6JSK)>x-kwi5iTwwzUoXx
zc8Co_rkGfp+?-)+ZbX=b`HwX7=lH*+Hc|i@Q}shLmZNrrW<hvW*H?Ra&8n;MZaXy)
ze{~W-jA+)__XdOT#|DZL^j2!2-wSP&NCEQH!(*VgtI2hFm*c0hr`Iebhc^{13mzdB
z9tw%FGFHMcE>1sc!OL6qc<sW|0kU0l8j(iMoRKsn)4Xw-MV{I0!ZF%tD)fg*7|roc
z3bsdL@UpyyHyVQL8=Gb8-dUZ*6xJ5aQmucvhj>cEl}&3@mdW$WLZao)9>6Unc>h1K
zo**%r+^0_`q5K_a9fFdC@Vh{QKr=`EbZB>KHv_CRbI>`eAoQbys`eyj$GFBc{xF%v
zlPSvvQ);5@h*B1si#T^o<ffe;!{n?uRh>HorvO<HS{&{AmP15QL{N5^(_8Pq)pIP^
zEUvgEDlsCR1eY()1@LuOo7ca+CXw;TTMX+Y;0zl3ile<Z5aaGaVIj9Ktw3t17>tlm
z3c1&~%Lt&egt!Eh*RYI)E~y1}Jayi#!u<!Q<f*=Ao@uSHLU&aDmI0aG`cP+Nd9flr
z!2Ac#5N6Y2)e)6fPHvue*TWrQY}fKkW!wwtF%p!ZzvQ34AS<ua-8ev*?gI%Oc$v<h
z6KZPs(Jo}>_kjd>PYWDVqnD=}O;-kA#~ayBa%IPI=lI4H{tK44EqGyhQg0WnKV~@7
z-r|<E-E?NKn|XAi3p7)CX<lb&Nwn*w@HzXNx(~@L63g16=i5gs<!06vN$Clu^SYL6
z{&`2QXcP+Kk8}1|LoJNR8@ktO-4DhmzL`^J6QYvyUvk8)_2GHZWko2yZ_Z7(m^nJr
zYznEXX68<SNcKLFl^}`mwRt(Pcu<ws>t!lS%nc}-;p6XRWI8=a7GPAMD&n`^0V4J}
zVeETD6o3=rxdapZU08=xg}ONOm})8(qo2DZqD%>*kvRQs@5?ZhWXjezMi}t3<h{?Y
zmiy4KWCV7c_ezl3PeL()I()0PHnR(O$BX>u7iPT?xB9~!jP5Lp1#QD|ISH2AunrVJ
zVKD~LAkc@p2e@hIvF<jjj-8<1^!fXW%QiMdiup0Wn!TNIoDZ6LBeGNzKxvgZ_CWPZ
zvjS(;)Jm6L7>Z?ls~%`#X7INVahmf!398@QM&6`M7kV7lh3awCCwJSr2+WRBBNR)j
z>q<<;)98XkmPNY=3!>v9tIyVzZfJn%av8k*sBn7wVoWd#x*TKlJf{b}cI<wv1C2{Y
zoGElj?I1E!fy3z*WSk|ic6=_J{f~i@(UoWb(K-G=$sg-bQnmr>K+f|x%lJg{!sI2W
zx==g50K$B$aK1hVT?}>=D)H&e(K?rz&Kf<=1?ce1bF02MP+EH6i&gU;ON@=*R9dj2
zLMp9TQ82iiWgM+<ntKtZaQ(BEvyOhXk{GP~>gcQh|7Rs`@tr#g`9F(ycEvL*=aoEO
zTKsrf&&f{6!C3R6u^-rPA$JCV=Ku{+%Tnef%v2DO1>5O3Kms>s%Kai;XOgMYelRj6
zOmyp}!oio9C(*$9+6@7LfeTV-O0-i#%Nb(sE|bW66pC&|@lb(J>GsQQzHOJcmAW~<
zVDF4v@o3+eh4s-C1_}6cIrd#b*Iv+z=;3)6QILP4ncxyWMoS9O0x8_I_hWUWfPLrw
z`PN(NRrezRVZKRY-*azZpYIs!PNXMm_~+Pl{G-AS*Hc{oLCaRt=kG5r+t3&(Mx^N_
z&A$Z%UokIZUxr6kmdcZIQ31h)v6f<g$FRRj%<CSdFlYb*bdbC3)0jMJ6)+d}9SJBJ
z%uDXd3sBb`xYE4z@B2#EEsv~>bIsfS?$WuJw-svwvRjq;ec2w8w65F>%(Bh_X#q_J
z%M0v0)EpdvzC?>p`r0JqRnj<LMa1k~)qz<GC$~tI9~!8;AYBY{&OWA{+r<WpQpoTZ
zqO7;#=x0lrcJVdsXDdZbO~Pj!AIm<7S$T;NZOrqiI}}go-qmw1WQT#BkpG04(CQ9w
z0@T|}6MYu>$*yyc1U1){NwQ-%l&lrjM8=6oqk*=*rcUU`;XoSggd0Mxi@V2f*i4@v
zf=qx0(N+3<YImec0=>S04zSQS@Z;2=#=0_BRqXnb6~cTn@%%wNKb17WHYIwA#9>&>
zsf}}CegT}Gq!BhJL()jfgwNwR5%UtR_asd)0~zA33f#b8+>6W!(HO=>{==k^#gl=s
z4NCA?3?N7f1!u8u$j7O{b6Tq0RY}{c&OJNv67v8U9OCZiJOus%Jg1C|bK+Nz@Eb_a
z2$|1zt2eUUS4baEmkRe(qIN?B?m>Q@4^`ReJ-Yj-?SPA*_im(}fk-#*=U3ymh8(=e
zJb9Tu<gzA9`<&H`0h7f3AABSCh%s309GNEzEuj6+^FwK08`eB1C&I-gA}1(3NJT$Z
z1!4Wxj@@KCu;b`G&SITJGijcH_H(iK_~%~Q&*}H<Fa|e3U#cGrYd`}MNHy7_dh{p*
z!_|6Ds5MDvUNW8>*QocafZfo~!5Fo+oyi__G35|~zgDlM-+c|Zp*1V@&FxOh>T!4P
z$wuiLU*FuWG}SzJ_wLMeywlkGs5(>9yYYEWcUo$v%9q^;?&9VVDlsv23w3joyPA^M
z%-rR!lRp{FM!c`PTd1ok{tDN8Fvz?%NE)N(=1G+@nNpfJH(C|bo+pix$)cor?J?}q
znD%_BG`~G2I~pJ3qiFS;PT{_Gwy0mDqA%=xbuVuFg!$Gfj9wJxluc7iXtkTs>uFqf
zns#5?L~EgA9LFk)h&hT9f-aPQJPhBS%fpN<-$jPa2{wU<3UQsi_BwME#)0c(l(_I;
zJp9KW>~Vg;oF5>Y$Yxv@AZlm3#9pxFh{CXTC+Mu&>2TO*1$rf15I@GC3^mAO4*(#d
zR%SgjhW-XLmr?Hs0GbLrB7{W~;^NkkuB=IPf5l7^>=c@0_KNt_g4i^-%z1gdn7l4e
z3$T#-Xx?L8gy&U*Mrc1E8ciX&t053VKWQkGU=-C?60xLJX{{w}2<*zvlR5)2M-Os)
zcZw%92TJ$yMspwo63f3T#!7t<IME>}?12TF58c@#=+Nc`fQc17h}ic?&>+?GAeRed
zs1HY-)V;$4tyb?Y+d`vN$<|wB{gU$ok&y%Emu%URS*@_JP*i7bVZXY&&l%&O`C9x~
z(!jC0h7${u-}FnX43<`;_*LDv`x$yDAum~qH4CI`MomQH^>r|~9KY0lG=759NO4OE
zJDcCjN(*~Z=T<vJ4#v;Fy0wTqb?VfkhNatIUl7x)bO>mbr*;=0nzf$aOBxuHs^tY<
zk~fV_lGePrX2X&VE3d9fGBtk7#N4Z3amj`ySSL=@1-r!>L6(U}Zx!%RJ@MYh`7Ok3
z-%aUyvjXmdjzjfmF))!i>zOtuIk_#v%PXD!P4_%*>=fXH|BX$Y0-T-v9gT^NPfkyI
zW{=9pN7bE?(Ua?QT%cRIK*^w1H&e|miqM>gd{&w-CBbY;l;}hvxAJqbptO}usm)U2
zW1)$oq&!Z>l!Wi1)<5-h$cVBaLv0rS1v`mUZ(D?QRZcCRI)oKi8R~F=X|YrrqCRp<
z<`ZhL3#^eTs{I2?7O4`u@&l1#RBaiYul&F_#@oWrrOYy}|KX<TQ>Q&Q!-#xVw|h=R
zV9~;C-`rD2w}xe-wwF7T<WpT&AK)Jw_ae3d`+!5!@S^x7!5$kVbc@D`@xQDyEPV8c
zA*M3Jotgtot)}n4Hn2dW<KOrhzY!zy`wg;pI}?<>tSU6LYFTz+_R=butZHetf2P9O
zS&`{q=$9Gh>>QTqH+qnpHu^gxbK0Gpp0n-jHm(HpHC>1rW8GLPd!vsYlJ}`!3#M-N
zUyEWEb*x#sa%Bf^y0&)%T*6cNbz~mDo^jxplR?eb=+&7_o&)#5^LD_F`T*ovXOTC~
zZNbPb^cT<`G!mgmoFWY37)pYpnjL3RbiO`)cwSAChfjKa?~;V(Cx=xUQP_IbtaD}j
z=FANdjDvj5EP1qdM$_P??Ced0O&Q+#n_uk>;-8g8Ma8nd@e%wF#3?iyJhE);ruYr<
zgF=sukC<WFPeU{cs0_&!R)W9uyeu5MY0x5m65m}CIWpVmHR!pay++tVTvLH-D#efB
zyH`ZhnXSS#>vh*Wu6s@?uCWsz!FR8TT$zo+HQ<}VSe^75tVJE<&qUM?_10D`Ks|p%
zuxk}^EXSm@V}VAk@s-YALr+>X&<!u#5j7)jR$qcwLQIUSqeDzaMdaG|Hl-&Z>ZSkL
z#R)O<&umB*l3{Dm+%ww2&@H-*<6>iK(BRk5*nGw_(`_xLcmIul>!rx`zdqiSyXj)L
z<?N@2GcSe|cg6?_v9WDi3d(JwLSbRVd2(#bp8E~BfVdMe^>5&p`|UT)gNUX1M*P7o
ze}nCGUXZ2u5ur}SbofA#q%l!*a+Bs~HfeM*lcPDyrK*2t%$P(?&!wHr73S4lmoz=}
z-u+BF`wL`SoN-jwV1J>VftYq2YJ~RA<hEe^DfGEQ&^Ou$#gq9T@z$^W{aw;b{J52H
zgv7ssyJsP%`g7o!k0?=8g`0Jvimq|QIMYK9!pR2~XK3jp7FeG|E5LAJ@<6e`=L|nj
zU2(3vY-3lUvvX1Brqb?n%TrUAo$D&w+*w3F*<99zPkwPvYKT*mrpP_5IL_Kbo>C&G
zHqTpCZb^;t@{$yV2R=v8Yf7mizCOu~G3~svqa?DbFIw4O6<M<5N~cxlm7S##RlQ1O
zZ&gI;&MTd?1*&(PDl6X1-8?~+8}CCqOlK^q4)cl6RVA3ao5g3T;=IFZmZa0QA3KBE
z<BuTb#|3*N%voRV{&wxvz|xd#7E++1C1$4n7K!P%)ilqk7%ualI_(AVl<Z>e*Yb6<
zq(Xi3%ED0-;B6xzoF)4gWX42DtPm0vuqkQXAG%hds264k5~jIX_xr9<x+1|lS|N9F
z3YJBBB=k$AJqaF>vS23{d04b}!YZkB3BC{0e?K6V_Upe_;QJL)c4J65F|x3qX<}<W
zEkXHFNcc2!TN7BTj7Wm=jsNhSfTItHmaxBYv>%p;NYF$BjEpAdp_w2;K@5R+ny;3$
zS3O1~C>Y3?4!768z`r{PFL}e)F~?s2{OZrKXRdxu`Grzs!EWGYi<+r7Mzk(Y6tNpL
zK0LNx^RU2AmWa%e_t}r{u_K~g<KKU!IfnNPwcWF5EP%Kws69l6cK1^Wf=bClml068
z<Q0C1eEHLjA7KgcqRqU>-*{i%hkS@zG4>(RN%Fkd5IWyX)Jl4qO7$W;4%CU~)-#Kl
z7%l>ofcIe4+C)mxzI`NS-#%tBwSbWGpsD1sW>QWJ?$qDPEwCg@+`V5v?_X7(=bRnU
zuPPLtYXcgz7GlaAsppRhF~S+D4<vRJI&DiZ;0s5OBC)S2cWaJE@Sv)r;rex^8Lg;?
zpG>OX*&=tfd)?Hzwl)bJx1sG@iOTqH!ym<`p#!<2FHaI`&*maRwo=q2nk||u>PFSz
z0nrdLm)D{~#}?5J(QeUx%u7er<K%2<jyyLMTGqzt8@LGvxh{BA0r^`OYe^k<)bfbK
z)DqiGlLL_<2dAwidRbvk#8R+JdV0B;Q*(#zmrQzXE(;ONy$~Y=DUL3L$E4S6m?XMT
z7FrbT>Z&Y~$?!Mv`MPdj-;mJON`6H~d|XCGLR>m~z7io_-lgqT;Zh&PUzfWsi@jg#
z__LkJFN=R9iVk(<P^c_8SbU9GX)1`N1|5W$X%nxXuj-3bR;hpO5`GL_JA@zdL2z!Q
zi%Vo~aHlknzQ~jE&oUnA*`6^oXQTvVt4Lb1N|oG6{~<a2uy?G#O<qBezrtVrI*Gd4
z)peDB#lV?3&O3g59{<nd>ZgzUdwB*jY{op{=dW<>aO~w=A1D5O_0TP~<zGYEKfvNj
z&2_^Mr}O~te4wuc)9STTQ5_hT2NZbF$&7|tp_guxF>7h<W+`JKozq{=hP|MUS0`~M
zViQ|SS7m^`UtV8E+}r{wd4rfbx?4nq%e|>)clGMkO!PtEID>q3usWE1=T}>A31R?3
zV>5i>n$x|UV92&d?V7mI&}=AZvIJ?x2~8F^Z9mKj(0Ok%C!o_<3f9ECaL9{Ff8$8Q
zobb=>NJNu2fBa2K#NX#)!op%=!x4cTQ?w}0%PVhD(ayp}1>W8TiwdWg=j4>1uFTG^
z1TQ{-f@43i2~@Awo-%YOFKVR?gz32Uw>!g6eq$5v2s{DF!S|fSeau!GEQcOBjnXm-
z;d{u$v{-uO^#cb!AZ~~FRr@~tl>2z&##@yH1`JC71KfAqI)lx+dvH1K5(<9rJ4D<*
zIB?)PEBoy4`@~<~+PD#g8g2^rRB+o_OM@+d*LH%o#&eg^%Fav1TGH;7w2S3aX5Mju
z0dZbtkr&<@6+afMt&$&WCv~^7a+lhfyiehP&6sN?#|``_f1$CKRQs_sblYa@6Y8+s
z*_FJ{{Ty6Vm}ps`=uaD<aDxkS+qezjT9~VcgaS>|99TA%cdEWgKKz_q|D87=g(v>{
zi`y{T1NZiMjKk8Z;@mXccfVR4EEt1OtHTQxTY+@@$eG#4`(w*0Xn|X0_tDv3f8Eqj
z*8KAa74^-HuW}o_a_8sgEO(osNGtFw8Z7WZ?X=g5;xkK6Flos-DRgc*WB-Pae4mhc
z3wP9nMHa^)JS<uy(%M17xP&PwLr=`>e_>^6`l<{4J!coDOdSzBM^(hHUE>_zlp0qV
zBQYQ=%C^l>svfwuG;`^-EjclBca~90;Q1%BO4d{b+sjpm<iZ-!x%y(RGqlkc)X$`~
z#n4F#Rv1sWKC*D=y&VMwJ3m;uY+1=rp4a~4+=jfZZw<-@-`bMPzOMdDTDhu3{@Ama
z2cE}1h39E)UtoAbjFyD0=BF`P>X%ui<{9!k`IEnTk=t;Yzai`^y=On}p{JH03DUdR
z3f_2x_13&WZXoT<gI;|d&o9I}rD2`?sKkH2brQn+(Nh%F)Y2?7yZ5)ue{Ew<`s$bG
z_n+xcF#2hVYh;OX{pN$)LefGdMt_kXw%SGnyJT*9Z&mWD_a4ZMXx>=lpBiF+{^`_b
z&KsFpOucdzU~1>awP@#tLy1C4-4imdWkmBEvc{&5XaVI-$uGk7h-)GJxE}H+J;X>q
zs()<2bKJ-N%{Jf_l^1l!2n=7kbA;&{L5z8E)xNH{-)f69OSlc{FUmL8hWeMUt**?Q
zRW%6?$izYhq0AJyeY6_azgLZn%q2Of8Inle=RYH#EaxBLHfS`%(479zEYi&ZTG$2}
zd+kAYM@Cv1KlN857qK6@@5P(&67hM6Im8srK{Dp}3+l)tDiU+UmOuCif5;Y7Q9s3I
zf^4FgNcB3l6Lp<l8Gi=XjF;F?i5sEIgu{_*zM)+uq31Ae{+e|F{!zT|z<yc^l|Apz
zKPl=f<XlJAx{JNN7dNO>_}h1JUG|L~tA}@aXU<Msy^Zl7{$OiP&ejixWh<|5&&k<-
zeI@hEOD{bmFW*oTa_MQhhgy917v^V==>oR#NZLsj9@08OzM1=Ie{5|3qjPWEh%5}V
zvkNPXyg?r1F|Wwx4TVK(YC<pD1;l!KCd*yubF;>zTpQ+LBUGfuX=H8aVQ?E6qv#Ti
zme=cDm`vN;`giv6zlVg*yR=@Fz5e37zKiR#f8DtzVRnX>cgF0*HQO2gBfqBYTK)Re
zJ7*PKy}shEc|~AeX1chqiHR8!#3O4NmLFl#J|7`h+D`PvP**oG<JElV^|rRwj_b6<
z4!0q&Y(;TgQ;yP-_b_7SRIBo8fNwFt*IzI<>cGLV3xWKejtq$HLevno;_7WXEMpZ`
zmD+ruJv^@WaNX=v3*txY!wbUX*)kh@WleJP-c~uadQ_ZUSNxlMVs#|tpCrUt=I3E*
z8(Y+!l|E1wEU#IS;}IKVPwS*Q26?-g+9s6uWuYEVKtScjT3LFam6c}*#a+n1oE6r9
zN~sieA#8D0{Ll!$oV@`q6~?{})eqM-1LvG@9nMnt9(8tS(6UyLGv%Dp7oTowIX#s6
z>rh+!A`p<MX?KfU-m<%i6=_60EiFBuXgr6WFWq<!bV%gDf&OR?ov*nWaV3OL`JGQC
zgoI~jvL&NExQb9Kh4>r1qI63Wjg4>vwSRCKXMW_r{o(JQ{J?+v<JrIe4TW~<Mtj(J
z^#zd0Ubcab1z5QZ+)MeYP&>&;AbG~?25~_4$a?;Zv0MDtWGNg2cFZlZRr8|eDT=O4
zCWAl@Lg}4TXkn$Cf)ca@sAx=#_^KOx12JL-7;}vw-$o8GKjQj$@Z=F(k2z94As3u=
zWInS{tzz0V+u4H`FK%F!m*KsjJ%0YpUJ_{74MW|Zh6Op9y%dX{k9CLU#R`89_r(6z
zFsrJurLwA?e7WSg0i|-_xg}Q@Kfh3^T=@KA>n$r+Zux!N@bEUkv;%`(228MlgP)3N
z@7BvBkc-S5*p7lrr-ePiWZ4e^3vj^)w%-Xs@%HMCVhQ`9dL=n7OY$+b4v6;!-r4@9
z?0I;0!@l+iuk@C<F%gq;lxz&hiVwGOh2P&%mg1YUVRkf4v5jhJY>CpzB$PIu$9V9t
zYKcr|%ABYbsn7Ejyc=4&5aJXNRoA?vwb3dtB^X759Y*52_m<Zl?2fIk?P^XQI96MD
zU}45@4)Uy^`WBbS!q6qm@sbpmFfS`JSE*Cx{K7!L!bSNx!yYc{8}b*I1bP=PD|1nJ
zTbHH<#QNZ1q5A?0CF)Oafb>J7tsxR4fL!7QAxL6s$mZ|fJ)-$!8sqz?<~<T+L7u<-
z=bw9+TbdxUTY|L)jj-?HUVo9up4wdub;b?d?o!XOVB64(;j7b`OT2-^*e5hvGHYA2
zLf-aJN8#@IS=`T4+6raqQY*)>{7|n5Kgmocipjq+Vqh|3s=R(<dG4mUan$vhk>nDV
z=^v0GcQP`w0+LhsYXHNC+-{Mh&{dhX7(h8U!NhVKj<M7_pz{$?wSYA@x%$3o;Be`z
z^;Ln&&O?o}AL)(Bd+3jc-%D$=gJBY*$Q<lK(z)HQ?b{a=6FqxlUeT7e=!6BQW~+Am
zdb~n&B03;2wkj4z%nW~jWHnOyiNIQ3)8ZbbAFvkonuZ6KFq&3&Cnp{qrQC%@-!v^P
zI74H>J$KY6qh4T0j9SkIE36&bCQ!Oy1w}#k`WO!Sw#43pRaFQ365D3wRYtdMFDu{C
z9{o25)b}WDZ7naI?NF}DE-6*1O4;I~<zC*KY6}Jn{rn0C3+gs`do3%<S(xwVm%mW+
zsE5+WswgwFsEA2O$jMGh%*zwjHfQX2_8H)<Gwoa}RGiTT3G09pgh0fkn8UKI*R|*(
z6Q71H^<h&27G=%aR3oLU+j68cD(k@SC(VCMYOryVr}_k@1>4yKr$6JCHYd#|B%*m!
zanX*hgoH(B=cexZ<!H&vWFXSFEUGlh(KRY3z&|tGh3<7Pca8bO;2+>~h=bGfknv*#
zjfS;s8aQxUpD5;!fP(&vjQ)avGbV0fKHlN3GdJ7%N4tB62M0@>eOqk&qdg?yp$Zo#
zfAM1>`B4%{RDK9rT$!Q8l@&4ZNC<JXvbPHHuy;?CIn!6}*y|+#2w0@!Gn0EnYdb_!
ze1M-HU7}s6rAFX0R1Xkrds@Q(U;2sPx0^V9ei-!1<9I%3Sa*2Sso$5Y2&|PBz5Cz#
ziIeyKw|?S`NP&4?U@h<FAu_okQ(aT@9KUBOX@8zye{Kee+<D~40`eE{@heU%%pnJJ
zIE{Nf$9V{*BCHJMg%d19SUAJFQ1T;x%3@}^|MK-7ncdlu?S-M_92*xZ@pqV>m|*AW
zU@?U(COdX)Gqe~Ukk@AgI4g@40UorSe0b87>Bcw~7}N&5$(&<df!EYa2A%;M`2CrN
zpeSJHm=GgnU3#FQb6I3eb*zhDPG?eTZ((4<{Nqgz1SFUwMcD_qn8vcM4_X9dD4gJ4
ztc{3lNcZu{ov#Y*I5szoFLAea&qy_=pa3&4ce-wL?f?pQILa@W)BK~CNdce5%x6w%
z3Yo<?&e(DLfipB3>T}eYn{-0S9sB|dbq{vI>{QC5Qv>rl;^RB=15=~rO5d!On3&cq
z--qMn^0+vKJkBCS8YGiRrNK;mM5&!abwWgOgo6YANvL+PD~(VThC4cj7xFy;QfWYd
zOh)E=2L||f3GK|VrYU28Fh_ukj`TDLgH{+ud4;E*kLg)On7}HuRA6ECWmIK?mw{7m
z;Ls|%oQa*e{?R?hW}6)KjWA9KwfA$Hsa$L7oe*s2ymm0MSry=uw;(UH=b_f%t-P~k
za$3BVN3eZZlCYMWnN@7SBs+e9rk>fytU5v0ZwHsg9EP)ig=d;dA2LHXLmdm#3!{@e
zx{>F<y}5mvqb%9WGcm-`F(lE`3&kGmLp{*D&D|r^VEe_-yyAoG?StaIJmUgwZ3E*x
zJ%WQhyks)0!vd~@IVb)QvJ}nCFqc^(Di=GX4TB+TE8l;=lK*8^ey*>_S#BkXGvS{r
zu2|=r=3SqdFU+G7wVrZBPXSgDp-NHC$O!6NLk|JI*r1lm`-r*4I}g1atuwd7#zUoU
zViKAmwen0XlciTXxtWG}IQv*nHFxo`O0bVhNq3XyD(oFiHX4{3TRWK81^IeYA%KiM
zh8~U^MQ>4E(?g#fu8)f+8wIO<q{LX)!|^TtH(k$I8VFxpL?EdOy!ktBn!y{uWjhMF
zU^BAT<tgc#(U}mo^5rKUf0<Z4cg`?2+`=`;!EnubD~~`M!hLu6@U3}+VjD+O8xw=p
zvP|ayCo>if7`lJc_zc8ws-RmGh+65>$NMj%uO&TjP!7cj5!QNw0P<;1(23+9YY7o@
zn<mQuh(^^KOJL5`No1V;S_h~2zN3wK$ulj@(O=_i&Gu$R`uaDQ^*uEZ>ll*YVQp{W
z;%i;rK)Xm4Ws)w<u(h8BYJA4bip%QB@-p>J3FY6UIk(a*g`<-qTPn>~II#zPsufn5
zE9)c7OuX%_9nB0qGCMMqgH7=PSq))<s@PyNYo(XFGT3Wo@cwG6+~FF9#pq`&XPzc?
z4E3^h3=Fro^K&+3o^*{1c5(`ibG34hlR7v^;~>FO{~$Ktaq&}Fd-ErBdjb31yLgZ9
zb$bzZ&%+UDquUbSt><ZzK=;sqKu3F@aw~6z#4$8D#D0dI`E>5PjT?XZ+$r4O-qOa>
z-`>V4BEZ4I)?$W*9b`t}WelH%`lK1u-eMl&#5q&N#T*^NtrTH~#<WFv5TTv_1Pc`n
z*m_x>9~0<iH@)J^oBV-SY@!29WG3F`3hS7%WVub_pMR1?56^J(M}IKi8H_^`mjPeA
zGTQEK^0vmCj}K256T-Y|Xuz<c`LiRw<wfjtvcx&e$C_o%Pk~gZ?PXRCe6gauNbB>3
z15==QG%u5}h>g+hJiKj!3)GUW4?VS{`CxlQ_}qi7gOA7^K5gsyRP!1QIFBrhaGPrA
z8d(@gL(nfbchj(Pp;=jX<0Z{ka5w*ja-E?Ovlhe$B@NX@>PmJ3jso~wL*Z-j6rm6R
zG;Ajp>aW&vrnlXNDMHZY%?q;2BvhnbkZ>khvX}TmW8aW4JJiLK>q`+wckZv7He;Gs
zd1=0Lhrax<0~)%Ux>=_-#382aWn&M&K+E_Q>vt5Q^~|Q+oV71>SXLifQeaHn^YZiD
z)~Hp<3o8_giiOFRkqrg$mK>*RM+2DmKnJ`5m|bZEsMhwO^>0wXVP~{N*%>XpAgfpx
zOHFpF8K0YD%X$;a6*dN@_LjWb+IBkY990s|ze_AOFLjKqP3AwP9iYXJee~A+gHns6
zvi9g+J7tvI%+5S1Bf+#QtUSi`YFB$`k&=4GwY>&uJuh$<@Ih)t)0XUK5>KhscchQP
zTQ#0NO7C5YImmIS-gz(i3Vp&`i3zmf17s8bE%}J|G7zcvlKuSuWA8iQt16cN&+gum
zMhFmk3xwX%8w5!25K5@h(h~>?qyW-H1O-G91jW!Th}aMj6%`P%Aqa|K7e%~AxPTBW
zD7okV-Ewa(<r#jzzwbSN@0on|?m2Vj%+Act&X%*KLCp)?*T{7FIf}dw?UXD;ykerw
zNqEg;^fv4@T3M5aRByxbypS5WW0_`qtcl<w=Hfj$+E#Y)A`TSjhSjNG*ghv`Y>iFL
zt}H-$9yNRzS@_MPIBs$-+O#(w14muOv|brAQd4go*7G?p-w3o{eZ6vbJ~7X@EnsjT
zAD=#h1DbT@ZPl(#-rsAdd5r#Sb^*=K;KuG2?ZYi0e*7>)v_#brq4f#<x#v(En1}}Q
z(_S6IyL3hZCtQ;H5AAPWzoB{8kd_2VsZTsjI=5-quubPC&8N|(E!sAnFet87=aycq
zHxkCTJ?K3Mx@(9VPh)-J8y4DvV7DX;u>_5|b3#=2mhSbd>wBk9U!Q%YhMhB<Eqdd{
zXP((UzOr%)=|Q}Ht9XO+Px#&-hBKHu#4S*9@A%?o--u6GBl<*rd9%rIChhLGX5RJ9
z!=tfc^tMIsEK2kI)vasN<N+x&hx-MMnV-Ju9^2QnHEloR@Ixa;Jn`$M&Fg-B@)jHf
zk{2-{p-aE%Pfp%4_34Vp=brP~%hR8Pxl5hI+$D7e3g$HvzG*n`S6;&a>KbDQ_l)}v
z-m&<Ht>ec&{{52qhwmTZUgPGMUN&&}-B}@FIrj`7I5n-O8~Lnc=lrC+SBU##p^p*w
z*Yc7VygVhoWI$Jp&rb`-K}acG(u$zM+VrvVPmW*zar%4=%h;*Ohy^c{-}m#5{P9mz
zEna-^-oc)i-Fglz9XRZsyzqWgD#!F4pXld-LfH1zHp%_F=e|bjZRxm`c<s)!t085{
z8@G18b>HG-ujZIO)e@TE_6dI=_V}yETOAn64m5}Z38~3|sX1!&AC>1Cvil)IUnwYf
z)pmKq&S%QERrHB0-&$hamcPsP`}%I{ZC7^XVNJ6o_0E@zdz9|FBazeQdM<^Yo64Ma
z+QW%&9&&@jQ&C+ROD8;Oy?e3s>Fgdu%9m{(bNAUNGk=dLxNqdJWrckrvGdNz`|`u-
z8|!U9?VCJ#A8}vbt?;#n=Z^_2-e>!19i6&+$p9=zo7$sv?~;K7m+UPSGEUN&;6v_b
z3yb3ev!bi(r1<NPauwWkNu3mP9(!N6jc&)8%6iJW_{J=~Rq*oq+x_;g{K;gVw2#!=
z)P583+*eez&vtPWt$2NLTH4~*D>_u{TauQxWM2i>J<%S7lFl2J^8SH+EbDx=Z4HfR
z%L->6IwEk2QRaFW*4I6jW$1Bb0y*W^yPZc9zm(v>p^@#X<7YorFzJ!v@OIJTB5hSP
zc>~$pC8~F5n>M|BwQ7UinntWD#^G(VQzCLEj1Rsnd8%)Fgz+yFK41`b*VwTJ(5WHH
zx22=&Yj&~ewsq<EPV7H&{U`G#zEKd7yk%6z!m)u{UrfR{$THhJkL1!d<8Oa=abi&L
z&aQp|BX3Q5V8txhMTl*`;cmz+#-uv(iIf<pwU0?1+qv^%%}5j7{98>9+1hm98#ukC
z&q{XrN+_MzP4bv$+laB-rF<+^j7u@Ta?0L7bmCJs`pkEYW?gG4dv+-uT<}<F-?+OD
zE}DFJY)a(A*#j%myR^r-e}3_S?L9~ZYx<#Wt9M&M;^yrvow(<|jEKnXJwt;>PLJz9
zc~DQU)?N9TGqK>^OXivC)8Vj{oj60dCXgL6n10)B#N<rKSZ3Q{$S`a~e}u0;w)dAX
zDqcIbBFckcw-JAS)d<TE$+O1wuNSdm@T4ay`X|qOCU*)f`<4x#%uRYA&d<N_1^>ZO
z{tY@}5?08l=#K58#xC}saDR5so^Ux+XY9EvDRJ4cdk(*BJN@$5)@^s<xQQPcwd>ye
zsS&pi@7`nRjI^lI;TZ6d^Tif|N4|&7^`7|J10qly3=0R{^Lpvjeai+9zW4R1IQDMP
z#qI+N`=guLy~lvUe*Mwir2ST%Secr-^2937m0zz)O<nc%%7&TC$NBk<Tb}8cwS0n~
z--P8^&?9OTb{cg_ZQq!kuKDN^?NJlQwi&zr_Ayq(a~@}7eqRERoa(wx=zO5PpnCMz
z?L?B$xAf8c+?Bx%KCBM9dn`XFqq=Q$c5KF^wrwY8#Af$zOB+mk_x_<NaWhR?&4-au
zgO(qhm3sU5(4@Y$us&(w<L4#uvN;IpYG`9ZGh$>+?FM_}dWy#M7|^=|JH?V_Y#2S~
zl{x+U&v|7whPPt@@(E85NXhEmtZARDf4m8E->kV&zA<yM__zW89%jXy7$vjZQAn)6
z^hI~bc?8+9ZGAdUoys1)IH>w)gWwgJS&vMMscwf2LkAc7_)HualM~aPcA9l?`JjFg
zwCitLMNHz*``?|Ggn3{IeaOcVaiQaHPnGG~h8vnf=8k+6!k%uJ<Le|&_~FA)eeuEI
z##}^Ado(v^d63r!vGaCK?=*7s$j%{=cc<QaN6?a6vLCI822WWrLkoO-3I~BX#Z!EA
z>6PX)ch8S?Z{pi*n{U^(Ynnv#ll+Yj2Y;VN#5nj%gI<P#KVh%-ot7N!ZO1^NY`*da
zc3RS%d!|j_dsk8ts^IA;7Z-iw^W$Rk<9vA>mxl>+oo{NRJ=h`EX2glK9c?ags=z<q
z5ht!+=_9#gmj+jV>KVK|Gyl=Dz88Jta$*J+w&mw)X2-Rcb{H9M(~O@@jf%J1VRV?S
zX=qGD=IyXU*aFgRVo%p8PaL~0sILjNwh&dZIe+{zVg8Fo<>FA}>h^KjF#`*H+7+b6
z<i`3+TZrvn{97k-CA7ED_3fDvQK95gNWZYm`P>%dUgYPIuHF8z4*}2gTKmUNrH(I|
zG`dGpXglLqZi!P?j+nD+cHe%pcFh_0;N)o6uUy&$BnPBSh-lg*BJ-Kn0nr`(<ED)Y
z8ou(a60yx$IMVCYEiIybZ3*E0DyzXAX}9GwA>`f-4zDTZygO}+fSx^_Huu1?w6q1!
z=Zg&y`kDO)m!%9_5zxC?!sscp@@9LHBh7+`c@JK;zr4$w1NRO{z3Y{d`TZvj?C$5Y
zxlyOKjo5~JX1DMk9)pa<dVG`t1JeFqmVv>&i`VDm-WSy12+F`T-yuVX_=beejk|X~
zF9Yj}dtYpcA+d~tHrxcpMz)lBkq}jS#bf%*b7Ne+TQ}a;y8Qzy+eh@Zmx1I+@<H!-
zM;R!GZo;syg)bjnBu+E^uN&Y*d$!RvUq$G?`04(gTc-yNUYOO_HR!(aIU9<5$IRMR
zoV$I&fH50BaUE9S(>Zo@V4o4aTlw_A#kjvw;}=~U1m!)L;~$c`V0(V?u0?4HcYm<-
z{1#%|KBgu$I&|*%#iP3ijVSFORg{j-IMqg=ZC@X4KEWUNoFU3v*azfl2cU?m_S9%0
zzAJp1JUzoNbkTr<M@u6UXFriOX~+EJA<N$^i@!Ifd#}6)dnEPl?m2&||B%S`K9M7z
z?ltz_@xA<#c$J4Do_yaY%WO~H`|16uZQAT?*oJ)K-L7YgP0u~sBZF6X!vewEO0=c;
z*?W$*?sfBA&|+9go>_5j>zFZ5UV8Ac$BG`x?&UXO75ajM)_k|BYSpPV>AaO2kXu=J
zx~MW6!^>ReiMqkq0(sJ0owwv@Ue*?u8&syo`qL+$f7Eu+C&qW-=j(<KTl@LKMPIDV
z_`T=Ic^NpTzL(#q+XiRM8_|Piy=J?dwrgdz(UiX4y6*Hk>xMytHdxouDI4?r{qr_X
zu}<BX@9&?#aVqC!G|mwC9roLm+ebSbX(`JsZ+76sH2Hza@dcrQchknAb_<b%%8a>r
z8k<BU3=0^%C^M}8+}CbfI_{RSxz+v4AIrnx=>59Z)O1Vk)1%(B#rKc!4)<x%%eQg&
zA=6U_Eu0XNm60&GU)1!m;hi$>7;7`F7}4O_hHW}F`Yw0)z&JjJRbe<te>YmFNn0z%
zw7BN*hkGXO6R9iBpoegeaaG8HuLp)7kyj1)%1tpZl+V(z&td1M2g0`CjnEct&~7`X
zp+2+X!qXGRKl{sr<7_pL<*&^Tet-XSgwds2>CCJbbZvdodVNP0U25wWJ9lSk%Guv+
zd_4AFl@8G_LY^k5)A@(QcJ{Ul+Pxx2oR5@PX8Zl>a|Ry6`8h_z+qRnP4jOoS>#}9s
zSEC<o*altk5ox)I0v$O%xfJ^ay?prhqeroh_6}R`!>r+zbFAT3(&gYm+b0+ouF|b^
zp)p#Fne+8bn7ewzHBEe3Q3LYyo;{y@a`kc4AAY!fyD=K8l^)w_t5zpcyVU0gf|Hh8
zAKO99P%-kpA-s5uIh1zdDPd+t3_ga0-T+=k_Bp}B9Qc*m8&2>Z4){jxO%mpyLmlt}
z?VJ<-N(X#B8A&EO@Sn58F%@(iX$5#5P9ZsC+z)t1!RK`HuKqjV+;60r`vQ(Cg7dFc
z5x)N8T6h_`%L(4kfnTXDa)P@$;04<A9In5EeA_7KqqgPr^#=w1BQVf8PVh1<MBu*%
z_)IgWFYzn&Fah5K_(C(MFX07xmY@SZjZMv5Z}^f3`WvAit~Z=*Y-}U)1>ajmzVsG)
zyB1zXK6Qfge3AH-+GkF1PG7<|YF{|f=lLSx1;i-u=b#RIO{9x<rbriO1cRSz;bml-
z6P%|j@hi3GoZy_kgcl%PP6uXZI4<b-5%hV!aJcY|CJp$pGF|OyVV~E+%Sf6NoG5&g
zRyhE#+36U6cEC5L6DRmV2fSd06TWGjBi;4dNiEn;$28jxC+}%h`uBjR+aj^Y)<D29
zTm)&RBNw?HiguCUKT+|&Nu+x%yo^LS!8!jNAN)rnvePkgJ|(=MNWk?Su*0Rs%Yb7_
z5Ab8|z@Px|;bdr`6TGaQfa@;;o@e|`;hVKe-B-U1dwvq|sm3=Q@B)1xhhr@;&RP+A
z8zks&947U~`#XJwT!R7U<!h%%_gZ)v8Ri7%a&dgfH5?J>3w%Le!Z(g|qA%o?^b7b1
zGVrIPuKY!$J3^)V><!^%WS|qAr_1q?Zn{iY&=K?{ykMq;d*EE5<AVMzf_@okBIpRX
zz~^w2R)7ghoFCyQO{YO$`pIH#H|Y(yuutO-z`5O;wBjT~Exx&x1AnddbFH1DuC?3w
zT5TTQqgq4T5F^g$#e9W!;)}E==IZfD1NJ4Pe1ihk4o7_8hqa`g`?c@Wy?NU%ZF*tL
zsC0hXP`lV6Wi<z<*<d1BWb;ve&PS78{vmDJcJwmeTfcRSpwxi=Geb$T4X2G>DWPL{
zd&D+Gv`1oiUUj@tdj$Qos~RM}H(-lTa>ra={^c9H@8~Y>#%6sIhx+kWO3d6BD;^p*
zp?g9=%i4BIx9d2Meo?es?zn4FlOFxe4Fg&>@6oPNz=&z_BkmmSmza^;v~y@%-hA;J
zd-qtI51KF62{z-)CLR2m9UM2jU3k}~LjUlShBM|==vmemWn?c&m3GK}68SF6Zy7;9
z25^a==D@GiUU$OhcE#~wSA3kyf#21Ezm7akGVJt?UnzXEwvJ$*R0n=7{WaPrH>AHN
zTGHqB*N37W=>&ioW5M~NzCbxL-iNkIC%*S0Rv+aVP@jOlsP9Y{kZxyzU##6hq5&8F
zN7$$IC&iJ{J_WuR9ZrS6R(nOzm-yU1CH~s-T7J^Z=oBgZb)=XiIOubEIX;)SGv*{>
zEr4x^Ar1D7(t<V>mfPIGa&Y7aZwR$x-`8xVuasP87kyJ|?q|={q|xDYi7o2DwYlE6
z93S`&+As<WTOMkgEc&Ive0?Pbkojtp>k5$gd?qJ%wU#Ti<?_>Z_!P;0YkN!7bu4u3
zUh?d$Xh;9Gud#bdZq(?70k$`DW;Gy(S@YnbFZCSS`dZff$Mi4{Tk_JRF7pmAPj}kh
zj}Bitr=kC-cxiJo4|rQa=Ghu;Lv0?IYU_qIBV`^;giZfw<~D@)q3cTcAa2t`&@c87
z_{o67Mx&hZ1048kwF|ZQ!UswGwPnuu+@>Y{b>vZD(}KRRX^zkHxRbEyi8a;e2k<tT
zz$eSeE4HN$ex3ka;FC45iMfD7USl(1)4ULI{!a>dMcrfOb#RJ;Hzi|HSMd+(_nCtL
zmu;qvdIaeQ_y)jd8_xsI>q4}d^p5&(fWOS~MH!Iz#d;tw1NvhE|7iz)vED|n0sI8u
zxuOh6{I&W-&X4{c;De1P9QbSX;reCRw1;g7*#Mhv!M_RI$iDEMbc6qOHWWAX%C+_p
zH8aGx8N5?n2hID8$3PS1{2x-~$3E~+!M^P~k=rmY?;6)1HK5vNON@z0N{Wd|yf&@A
zGlC7Fq<MHsN_bduGWQkhP$nM{Wm(F-PHQE~@*~(^p%dh@>$?X<<p=yZs4F>-owQV;
z?=<Qz;5}iFPnvn#55o&QKXJqp+HyKh6s41d{#Hx4-bMe4=f5q^*bMttbmF}t_^#z-
zo$X6O-_H;#d@^suad=PLI~*TAu#;#j^3J?jE5lSi-d04e(=79H&_UfV;4R2<L7y4G
zKi~o%bSB%@0zS;f2+kq3<CEo@mw*fUPWX8=Sl<TxrDzMa5<XVY$38SKI()1XeUyU(
zH6KZQdZrd1@SK`wIX|Lp&-+%gZC^&t2>yk=3x0T83vv<kcR7BI&cFBB@xlKWw$*^&
zYGdqI(dHERfJfW;N8f?#U(#QLt>?IYBz^8bIKD|+GZ7K;<u%^M6MjO#N!}9K1`~Y>
z(Y6T?{1j`)MB7HT*?8MVw%LjY%eq7ML3rCn;;+RSG(262&+873Z^mfCVj-8r4{_jc
zBH2#(x&wcch7!s3fPDW-<a@B7Q%0r={MpENS$AhhxauRUv@ye1LT>^e`Y9IrNw+b&
zL+DN5Bj4TZdINo~H%Whuwph>)2Yu|z2RO%v-rhn4eo|oPO9Ve5il2K0ek$6i2Sh%i
z?JM#TUrrqOoW8`b)RsBnbNU<~ewufIIKC~~fc-!n_|pkWDB!8KaCSiOFX>Mwar!SD
zzvi+tKIC0&Tfy;b&O74+?r&Sf@df|2{H)P7-;kd*Fhibh&zdWI%mVyioJy3(>9$pX
zyVP8!rN(H$d7~cXRC`CH+tU{3jE_Fi-5TTgwrKiTExtBg`$E!3{%#Zc7xdA#SuOZ+
zfj-BWZik<d^z+Cs+U=kt`<^|JZWvEj+lan7?<32$J@4zuw*AJz(w+sruxE*1tUV>{
zS>khhmiWaf(w-%KZqE{bt#(TABk{RCb9`>k^9BDBpO0Ng{PiS3j9mzP(U+9?>$Ov&
zFDdc4{Y(5!ME2!@Z|G&@_Al`_X`dh+0)M;M@EZKEA8z=NEGBYY-<A=ddHA9jIe7`2
z0lwBTZbI+A=~s0MnzuGqyuD(`m9A+;v9Xg=yQ1wMICybMMysx)!kl^rT?TaQKljx+
z?ENc&1E;3=`ld`B$le#cOh+H#7p&TbM{RebD$oAe%gzbkVY&f3d0iD1Gsqb9K>naR
z#sycm^6S@rTzTv2Yb&b$w}xaz#`Mg5XcB$3CZ^8-zeaI=nCtH-gve`nIMa8+W+Fsh
zRN_EE?sL#vG9DCVc9ep<34Akb?6|;};|zS9hvUnBA1{Nle^=QQuK_Oc`FMrI=i@&d
zAD+^%RFr-G{g3<VI|Lj>h3yq(e~f~+6m%rMH|R+Gbz~yx4>|&0w4o&aI)e4D4*I-o
zO8hn28YlXkPmT{?6eRf6e+CmH%rSu9Cex*_kQmTOLfySU=wX3^PsJ#rt`+K=jP1<x
zfPcG$lds7<z|-|<hQ3A{;CCr_fNnz_0So8rO=%~BRu;<m0oz5r_#eah+y}m<3;5`t
zYbJ6aaJSHdE8r`!Wn(9@R?v^p-qzY6-D}}xB+m)nR^h`p=40l*10VVnbWGaD!nU<=
zBl_ctegSq0sHH#K0bj3O(S|taJY<JsT#;%9t_S#Dtm_4Qz2I{?nIz~>L;k)X_}{4b
ze?ZW`7G6d|oZy^)jt~ArCI13n@G0R1nF6kFM%kV#=szmy>lK2|9jJqDallPlStE)6
z1mGi0oW8`b)Nx`S@&z>o%@*_}yg-k#^JB<2alPS9;WHO$ZMnRBJ*S|*Ri>*Q6ZqG{
z%dlS#*QbQ@bU8lcs*rL?IHxb+8>h>B5pcneq+bAU&FP3WeIng$D%}@u2rnZUPH>(s
z$49!uWV(WmpfBkZX!8WV5%v};=<g8p%ScZF7xrfS5Ola5Vtgj6eXaeN3<}PDdnLwR
zP$toD<?C<%XdI?9U#gCA7`lfX3%$<MB@Q1Ym#;@+<vL%teyyL2nj3Nk3)*WsiskG|
z$FYL<^@{gw!8_MwtjKc?hYoUTbsuZI0^TM5I+CJwcF^HEllW_9N&JbtOba@^Ov9J_
zD&f*Lxo$QJcyWN#jkIyD8wp=q=#0<P<#65)Y=xdH)|8`;;A_fns;@5=nvc6qYv}9$
z?zH&)TAiV<uhyeOPRSpaQ}VZFfaFiCJr{C54E~_60%tgvhr@YZuMzqc_(G2oz7AuF
zT#p%OUttZq9UtweiK3l@bPWZ9{v(1;CE5eL3@%3*EEZ+$Q32nmH|1qbe~`n4?MZmC
z?xnQ{9PMx#D{N1~*Xl{IH=<k67v$^F|EPaCz1MZBOB!+UT6IOw2{p_Wc0L<^X1<V-
zr)ARC{f@B)$cQ!WhA<%uddJX7rFKc^WSR{!3V#j{CE9)sZ4W7(OMm{jpi}0iY{EwP
zdUfcE!+GD$%T{T}H!O3&^T;0CG6&p&4;w12;p0eLxA~$BNPksE7D|4Q7g*B`Isy**
zGaPx5FZh@EYtXB8_$#4v>6eP9NSl`airawnOKY_)wfLsi4)`X`CesB!5rQ9lhk$;{
zNK*;75d+q717E<wPcyr`z~?r};V5H%Qa@sCwxIKjq7yCXNI1vmaM)^$!nZ~9wcHBM
zzb{}Q8~V8xf6XX~-=Ri#s(-ouJBmJI2k_rS@FVJFZB3%YmwuT0ZRuAxj*xy^`c>`=
zB)oW#)SJZTdXxTkt+q(;FX6nNmGJf2X;IH|c(Bl?gm2Qm;<l~j+vbZk-QE7EO^b!=
zyd5bP%VC+fZ`3Ve;fYtZXIuMbKQ=wavF<yed~8C~PQ!zpnzG%8c46W94`w?r1&97H
zAJO=o(8qR>50#|3kVDoRJRf+yfqdvC^(5e;o{{hZrSE983#vtazM%5cU(gY7QO+cM
z9qfhs5{b|0b2#iGN#(Qtql+)rcgp-XlV=RUBA*+A&lnT$W5JsO|A`Zb;4@$)hHa*3
z^o=^_aC>~hRwdvs0)MuEcT?~S0=^4AhM8jdSdM~U;-gLYvl;^het@^2qoX|yXguij
z7Vtg_|27Usji?ze2>1&MKT_b|rC*|-nJU5OZlQ;*x{rPa_=11*9Zj5n+^@v@kBIvY
zj(dy?<GJ)hgYbN*xEFNAm<b;vGVy&H@IE{(A9KS!#;PPeF@|K~V@UGeG*LW9Z%IAp
zV<;xxW5B%_dqCgX#K$V+bHhjCd7!ul714J!@xCsen{j_!JV!qO_g!)SgSZ!cdwmb|
zdZX{S;yv^A{fFV0b91Z6&z(X~PY_59x)ad%^AK?46wgoCBZp%PGJ{FLUsZ6a$0wlg
zOcU<|bA7`u>Yow#^FZIl^f2Iju)?HmZCx$k_k!<9hTf3-ZgDThW-yju;$t&NX9ec2
zwH43H#eEal^=IOKq_~GyU{&ING{4smBK;M{7ajRspqGgJ7U>)JIMOdDlIe@|gd9ju
z$S3`Y<TqI1bGhs3)!+yDWa?=O1pHlzPkZPW0O$6TCcc})UO-2Em*;ci4PoN@`%?m5
zM&^^g@H1kp1M_`g)&F=ej3(D_g%Qf`X%T<x_=0V>C8aLfT{dg~T}fBk#T6vRW<|Gs
zXx*$G(|af1wRc+K!H2VJ0)~~xE?7vW_lWNu(z@-SiAzR}Tv-&EICIl2nDE=7O=wE@
z!9~3~j4Zi(#F+c@!y?L_Dv!_Z-x}QtuJ>!~`5)R7##R~jpGAIQY!&Z8UL)4zP!quz
zfz%7e()rjTEEswz!}l28UyXo0d@07XKNaw`+NWZSy{>X8^eNJVJ|%tr{RZjFa*BK~
z))RC;mUOYTIL69({#;l7oXhXE<&VqZE$BYyNXNN60$<GYF!Aqppnq-oyrw+b=Tw2u
zSb;CTUkN);6!&++P8u3Ng`QAepr^IkgTmgfEf0JSslRw{2=MsYXe<BD&%KVAh4sgC
zj3e*?)|Y<A5~r^pJ?CY<HO5PGaOhez`;NB7dc>3o;f))IkH4uo#*kTzQHZj4i;&@(
zvZ%i49fVAf5oKP@5#Z-^u>r<vz`qx=mTCKhtYVx}$cAx5(4PYVF`f^drSkiKG$(+M
z<CBE~FHO9+47$uUUIcxsq>u5)i*|m+_ayKOe%7WS0vsL~V>aAIQ5vE980sQyv>j~V
zpcp$DCE;Y^4e`t9<2S@FqpnW)+~-RA1>|TgzW9bO=@+1n&iOHef9JU;e6CRKm=OOy
zAo-7(F8LqAt`K+dY2u?6ct4k2qEX`BAnupx7a5<k*vWvpM>8AzXsyi-!@h}~G)xml
zssrh9j;}w5?;>SR-$mBw{l#|?wGThacAlUs%9PNXpsSV9`vjk8%bRW$dP^5{%jiad
z-_SOh&m92&s4I}(!(^rye;sX`%D?Xej<Uhw7%w-24}U(l$n+H8s1wm<KWKYVI|lhs
z)=Xz>`6eqQ-yCl4?tpjJk~o~pWpwft!WVZIaHly~@ELuPj`SHZBt`g)Yv;toV0TNd
zUs+bU{mQZ$qwN>=8wYzCBYegVftPM;Z=5U22WDsCJul>IwTbsjy+!(u8<L49<h%fQ
zGvg7!8%sF*PCp6!bX%%R4$8LuJH;&q)Rutf*-~A{pzg4L*SN(9jsQ=#^)}pQd;@$5
zxyd22Lf;7Z09zln-!K61)0{rw5&9-Ur=Rm&HNcPSj{=@<>*qXo2=EjE7j`M+>m$<h
zv5f~Fue)Co_t(@JSX--^*9c#HOvtqs8wGJ+jFu(#D(1fK2MH%zg#NC5U(^LRJ2wS%
zB|a}_(!T6-_~hId?uWR2!4J(q1ik+Z{;-cU_?K-+F*a#P$Nd5!59}Lt`pwTh5a+O&
zK1V*HH4VEf(Dsq~;A<3o^sj>MLxQfjHy#2%xaa&75&@U`;&bn$z6xk#Cw=j@i_}*E
z*(mgtjD6g1GdBfX<TuiLM0__Nfb{kYzryny^al!gMVqyr`0gz2yjc5A%)OBI{5a@v
zd&bz)_+RYuqg-%)Bz^%70^s>4@i{-z{tL8af*(<bingUFubO?Xo~XkFKZ8M^>*aPq
ze>}=}Q{Lt!$T`p*h&nZr`+w4?_PN;%ed0NPk2E5E?09^Pn&WZ#%H{i$@cspJGw^j%
zrSmOG1O8y>qe`Uzo5bht7I4u95&HO4;1_F~gg)flsvV#s{cLeV=|^Roh3iA&7ib>{
zef*=jSQ0<dfxn6PIq-iL-%~h!GrY=1!4Gc>pA-82Lcj~K44LbDJnGA@Mceff;E*?8
zwq4iYW~A8-e&8E-e#%OB!^`TueWV}WLp^AG*SH7IF9Y6LTVhC5&&x%Ab+x4$2Md3U
zJ_G#1VfKdLqb<(48;)|_Nkf~O!>RONJRg~;R}utXPrP3v-bY)H;~7fq?;FkH{j-Yh
ztpeWA_TW|ie~Yo6^8ahD^8Z^5QQZHl^85<;kmY%^(MTczmvb!_0?x~`S=($_rkNCe
ziupl1K6yynLpUAa8$L2+DSQ)oDEULd5BxFa6t8sPuh#aH2Jj1&u$SLW;~n^`2O>Wl
z{2XxLAJN|6ZbZ-@VOr(DKQiEe6aH}r{!!33N_^1Y<iI~V@JOwG#J3<WZ)c2kVa_t-
zyGl>u+X<JulbB12r(9c3>Fsl*_l0&IEg!qSmO9e=;#SXEd>5kwA7g8z%z=N{fnPbd
zuM>Vh2mY68j<m=Rvx@`&OX*)_{<-k-DDsc&#k`){{5$Eu-#g3XB!4S~-x+OS%tgFb
ze#e|d{(PRuf4jY`w5=C?0gOE;_<Ncg<QZyP$>&^wuC)Ixuos@6(!X<kN&L-*10<H?
z!(QA?+`c6KW&`%Qb>Q=PJ`#VUwnUUOITww8-{tuD_7f}pIp`bfo7da%VUG)VeJ|+0
zBkWP&lZW~Wd(`3eQQxd_;IGE_{$?<+dj&t-9wq+j7-^53{}tvB9Qa4@?U3`y`AHS_
zDDjU(OM8^^e(AtJ3i=)ndAU7G{G&0_9)&*5Jij|bE^d#QgU<8A;G|b!kNiE@BdR_A
z6xtQ~eFS3=4a{7>-2p&3Wiy0+@to9{<^sM%!E+!b@&o(YJTCl+#NWbZ2))m+trz_O
z`@EhlY>dd)Jljfs?kVWV`euu<wMaMJw!+X?<hQJEwiwp&Z-#P=#mxPQ#NTXeCG1hu
zPa?l1{$|5!kuI;#GKD`8_{hKG!k=*bFGc=weE5?g(w}tZ?N#AVB>rmcbKy@gUkP)Q
zdHzZK)gxs7$@-G}6N!IB`%L%~PJe>PKZ$>2xXeF^&;5zSKMMNXpGf|B{z?3!BV_&w
z{Rn@;@p=AXuDvKvPI?mg$KON#4VU=`Z3#V&ggjf#d<+DZgZIkFM}*Hg=k@ffqJ6(g
z!AIQ?KL#5o-UvTN+vSA+vV;C+V^cBzLDJ{tPtxCPSS#{F^3%<Mzft>`gxL8JbGA7?
z%HJ4S{zk$+w&DmtJO5j-FFh~!18sL3UN!J}f0F(d!x}MPWe)rV<}&~uCgj>;xG3<a
z+g9?q1%QuGa2Pu1$oUf7o+SQeL$$CcIlqGQFYz}UmJ9xYZ|W<)i9ew9_ObXT4t!%*
zqZRlMD)<Q9D(PQ^A49@#h##Z9<b?k==t%mTjV(wL=m`3zsSf&^4V9ulEcpp{;BSO|
zaQ`Ry;r^NP1AUH0J<j>D-EHbC>_yVwVr(w-2K^Yj8hAY_`QKuQ7x-q|qhgHGK38Fj
z;VsPzbUbYJ*>Ryy+5XvLOweZmj@&`Nm+P~S&;$3!yuOfgA-Fyz{$|4{p-+k5!-3EJ
zF`sWE+hg1xbA0gM9QJ?_VqQ+RqpE2wW~^Y9lbRHw7Nj<5$`>hxVEcW!^$(_q^pczG
z7`8wAg-7tR30XL#q)*9uzD)Y}->aX!avxubIRuMwC#J`Y?bFKe?(bn!`o|Al@$R(7
zvktBp)US8-)_d-`vM%Yi31L`*`F><V_=MY&!3uaxw>=|xk@KT*RxnwJS&U|k!#|`?
z#`86{N+V9AL>pJOtq$?NJK)P~m4<yncVcXV9Aaex4&Q0~T-a_mt~+uF`wMXVJAr>p
z;GdUpe#RQ$Jpp%~J9UT-5O7~xCHAM}wthk46N`X%1^xDdzHBQVVn+qME$DO>__D2d
zh=O0xzZdwJ!4Ep3Een3e3HW&6KWgX$_$9^9Fgw2CoHIT>Y{$o06;Al%Edhsq3}FHv
zeS0o1k!5=!_#Ytn`Ch{L7!derVykp93jAXdZrUl}ZETgM9RgqUt;iu`uELMyXTL-L
z!WPLPdRBh|mDB-SBKDm?TY^NYbbr#H27R<}F=vsF!K46Ab$DQL-b@qT_94EF9os`=
z4<>1342u!5w3TlwMkjwwy4uftuK8^5-kPrgNXU=z@rlV#FeL7eDt{~|_wgAqhQzIV
z_SC#>YuGhmOi<v6=uZFQw21yA<bvL{dR!{3J><*!#4160&(Bw$e3GrLnea2+P?JeF
zY^C`JZBQoB(HrA=BHn@c_IDb$!!}93UVP*c`i`v|aUmbr{KyAe$)5ec<DFm7c8Wtf
z-nHrQlF1hsid~cFh^MZ+^wO0dez<0zCqw_OZ@;~@n&#9b)?j|Wz7PDSm^4ABc8Mfk
zq-fvkyr}x{;p)#nPs8yC9c;xo7wUU*q{Ozt@XFRTYqr)L9#00_`qnJwHnh?<*C@xV
zKZf4X{^VoJD6^i1dHP#;ey44&;gn+xm$y$bhRdI`yTo(;KL1A3iGMQ^?=5w__pPu&
zQAUA(rybuMDDYACIll3jfG@MnHAM^jbBfL>0q+U=UkH5RGr-qv0^SyUSp>f5kAePT
z{Vj|g3;zinqc>pBOSvOe5PRd8?Z8Z1K533!;M4KxIR8#+sJTK7TN$kxNVi`>1A%C2
z{D;4fvzJ7^ihZbYro)6Us^5Ru_R8<o*57TfK1*y9$i}T~c@3fZl@jnw?BA=fHWz8j
zRAEZ?<UhZQtg?NIv%=o8eMTO*z05YBbRdEF?_j&*R=TQY5^Yj*ny%VPr`BAgo;Axr
z5;WELvz;b(w&q8nkapPM1uTtNMLO9oee$vGBI&qfzU@5mIPgC4w4GZ@KF0Ai{6Nf)
zx009n;dQn|kVAfoZ(kTUGpY6pg)IdL{dNHY=A7xJwnE@tclIgj8jQITd{4y6<VIXV
zEQqo%UYE1u=YG(XXtv9Ze1qDx3-WD*3GqqfX#@N1jaL30yuCa4w+c()jznus_)aJC
z5AvyNf?BPux~911CzkU+hCWw!b!|X-<6oNipAlnmDeBq;_yl!r)_k<d>e>}_`0nET
z&mH^f+^?=ZAi+9yT@Ujsx2bDSSn*ftx}jE&xFB_6aK+pGFpep&u@-?0Ro4{P<JC3O
zI$-{q#4%_s$TD?p)Ouk4goI<4NODYFo3$vMg&^UsIN!`qUAt@Ew2!*>&^pm{bzM&z
zLo3v^r<OrKP}g3X2kWS=8{j%1p`^InCnvK!(<i%R%B`h^`32=Zi6tfZMY%qK{sF;5
zO0r7IO9tfT6jn@@;NB9{yY{J%d^|k2w5+hC*e9@;zrTM(xPKof0zD;)eATD0%qP>Q
zyfiZ>cXDRwB%hKzm0~ZMg8c23T{1bgptP{8yfCxa2XE$<mY0<jrxj-B7MJDb_*4|<
z<d*uB7v%axPsz+iq@MKfabl#PynIS;KfmeIr}xSfSiMS0^Zkk>jWWNq<k<LuL*sjb
zWyPB0Q%lfFaKKSHj3Y<OM4XAMY`~_Vnk&Wjn)w*Q<4+R-E5TinmW#VUd`JnvRP`Z%
zWg(O!48W5dyiox&bH?s{6;|&XzUy<<+rvSr6iX`#LA6+<)(h$J{|Ic4<c}ufjXCIf
z6%}XRd_b!VZ*l3$K|2$i=7P^mTu%b5M9agkGuOSYy1V)b*Uw}ONEHYTm4RX*C~;0@
znw<M`q{q2W!?SFpRg8PCA0OzaSfpNx>vGWG`izFYGl3`Xu70Nnp5Is_JZH-BW^Xid
z{V<iC|Mvo&T3WrpLn(625BcWIM;Rb#SPB)3C4>X9jcPnTs089&|Eu!KIY;@d3;w51
z1oJoeGx)<{QD8B6AQS2v7kr^|gLm<O5AxLNYhLix4dGwBu~$PA?D5tN`(L!cE^@8V
zMsEWT=Yx6E?a_kj01wAUA-bU6=mrnh1FZD|yWHRcarSF4RxpI37Zwg<=nYedgy-vr
z9W|q%#25$^2VoMBc}Wm21z!`>U=#zjbj+F_4B>`i9mO!HbA&ch8-+2?TQHY-tTqng
zt`nfRNANXZq4pa3R8<)Hz8CWp)@e^@kD{-^v^(G>FKX5Bn-5}a!~lPI0cU`1)qX<j
z_Gf&@x=;I2Tdtke7Gs3>G`^B-!ibp>y;c)OsJ|s<_{?qEbHo+v9NcgsrU%xic#`^<
zUH^^tIoi!%YF}fd`2_JI4M;<beS2g4y$NYbnxR^5L0XblXn(XJZHW)+xAs_*=Zi|R
zBk4pslP;ty>4pYP57HC!w0mLP*`EZU`V1n$=#z(%F!UrNFuT7GiNw*^{YZZjMWRUz
zi6wC)o+OY&l0=g66)csckpVcZC7leysVzguP?AB0k>O+nc0m}0Gumz;W5`(Sd@!C&
zAekf!>t%9qN_HNOJuD!Fm{C576p_jJ;$K3hU~Nn(!E9YpL8g)EWCppF%p|kOY%+(;
z#dh5D$nBUJaR*sI7Lq%$)_xILOqP(l$x?C;xtE_cj2UAq$o*s`Sw$Wo50cg7AySDI
zduz!$vYu=p8_6c}FnI(k0UslqvBq@^d4g;uPvUgEr^z$qS?mJv98R8jp6nnmke%d3
z@)CKO>>{s_SIKK+H`#+#x36R8h&RZ7@+NtUyiMLA@1jrk9yy3JtG8p0{rgx?{vyV2
z4{JNH^YWXRQMpgMiyYCO#C(?B+8*sy@&Wk}-*rDC$H;N=F?wxFvE#vK<a6=``BGbr
zv6qLm^V(yW{k>Lu93%59G4}8>`HGw%U*o{>Z^%jVEjdNLBNp;KsUkm+(^!LLC1=Sw
za-RH1F5vK@YI2GEgfowRA-|H#<Tvs=xk74)jp!&~gkqz4YM@4HqGsxXeNfz}JN2OT
zs3)yYy=Vg*YuSi;)5f$3ZAzQb=ClQENn2sN%Qmzv^`Y%(d-Os&(2led?M%DSuCyEN
zPJ7Uvv={ZG{xpCF(jXd4Lue=sqv14y_QvrGk+d)ENBh$#8ckzpERCb_G=V14B$`Z9
zXsY%UO``*}ALu}uP6y$e?z@;<{|u^zY&sbJ;ypOIcW_GkVeKIHm3|-2_NaD5`#^gZ
zuIae;5x#*H;QP`<xTr~RtVLQe<&JbJ92u_$D&XX%!L`l68GN^DvoKd+HooG`#fb3j
z=<)5MLum#bh6TAJ=t!KkVxyzzXnG4)lj}sIW9c|Lo=%{dG>c}_9GXk>Xg)2Vg><6!
zt9F@AqD6EvEv6-O3Y|(zX&Ei26?7V%jvd!;#rY<)=xjQN&c$hl^XTn#KD~o3pbP1p
z^e(!HE~ZQ9-8kd=9(pfbM(?A`=?Z#3T}fBb2k3)zHGPOy;#BOlbRAufb6&5|4Rj+`
z-+V_m(TC|H^ild4-Ao^+Tj&#XD}9naMW3e6&}Zp3`W)R(pQk(M3v{RU3Vo5jL|>-6
zG>i5<eTBYCU!%L}9=eylPWRC_=zjVpeT%-0BTV0=2k3kBAoj$0pB|=1=m+#edX#=d
zkJ01wWBLjGlzv7(r(e)7=~wgw{hEG5PttGcDf%6?(C=v#{ehmQXQ-8)rRV5*`XjwS
zFVbpyiT*@?roYf%>1FyG{heN+HPl9RrZK`OW6XeEzfH`{T$n3!WA4m@)nlHlKJ#J?
zSVPu`d9%i>32VxlvF5A=Ysp%%)~pR{%X~0by*=|~9au-!iFIaOSXb7Kb!R=WYdbcG
zX8tUI1>%UgU>3qcSr`jv5v(`s!y;K<oRHj~MX_iW!(v$+i)RTektMNYmcmk58XLd{
zvUE0x4Q4~wP?o`lvEgh48_7no(d-sBhK*(8*myR9WwI=m&2m^S%VYVhfEBWdY!WMC
zlUXq<VN=*tR?5m)IjdmP*mO37-O6UNS!_0&!{)Nv*gSSSo6qiG3)n(-C%cO+VvE@l
zb~jtf?qT<`W$Zq-oULH@vz2TWdw@O2R<nm#C0oPRvUO}d+rT!mP3&Rz2z!)0#x}FZ
z*%tN$+sd9~PqC-jGwfNmjXlS<v*+0k_5$0<USuz^m)S1%3VW5k#&)wkY%hDA?PG7S
z{p?Nl7JHk$!`@{F*n8|CJH*~+huIPK0sD|0WgoF)>^S?FeZoFvpRv!`7wk*+6+6Mc
zX5X-r>|1O&_#Lyb?^zZ5ft_Y&n3bJn=Wqh<kL&^tK&ob!*iY<d_6z%!U1q<r-`N#b
z!)#2)UWWw7A2RHHW;B=#W`m2t73bf%8$1m444#Ji*z>Z1p`oFX!Q0RnbAg*0ni-lK
zS{PayS{Yhn&TU(RkD;BRy}{Se!O+pr38P9~3|+Ctr#tp8?P=&`@WZ^P07IZ5$PjD@
z(SE@xL}8l2Tv1%e+uNqenc1Z!#hz1gOAAYK&_*uLEzQj_BxPlmdQ8eM&CM+?$}G+)
z%x3Y$`7F0M-&j;qoL^>4FDNN3HkOFrVdA%f{|c&sL1D(S?1Jf;@-89BHNP}-S}xk<
zS+1Gc73K1(ys#)oTp0>VN+t=^ApZoHoRada+@g}{#`2QllCpX^g<z))jd_0Onps>@
zo?Db#m}yMRoIE+x7?)dAo@vY|$Suz_rDaae%E_c73+bRj<IuwV$(d|WK_MGdR%pyD
zno^Ky$O4uzU%Z#Y-!tb<DJz6DhM9Q4_(OCG$}<gxC7@O$sm&;4r3EFXGEOeQC?Zy#
zSz)e_ud*pf0hh*-$+`Jb+@QDsDN9_SibF*l>@V+w{e#tggo>k89HZg{83#x@!2t?C
zK+y>ZQ_sUytlkR@lJ|iMKTzQZD*Ql&AE?p|ROtrV-;Y)A$Ei48#fqOG#ZQouBS@te
zq|ysg=>@6uf>e4zDxDyePLN6`NTm~`=m#sh!HQn6q8F^_1uJ^NivM6mH(1dPR&;|E
z-C)Iku%aKL=!Yo!A&O3jq7$O%ged$_e<^>ck~>t%8>-$94N=b(pV*F{7pdS-#b>CZ
zAFAkwD*B;{&rro@sNyqJr5mRB3{&Zasr15BdSQxQn4%Y^=!GeIVTxXuq8F~@2v>51
zEBfJzez>9^uIPs=dBT+(;YyBhML%584_EXf6#WQAKSI%qQ1l`ce-Y~aXoVlG@S_!e
zw8D>8=|?MlMk_v|6(2DQKStrlsOK^E=Sn{@D%}{BZmg0wR=ppq=*Oz}<5V24_={Kk
zB`A6cQr{u|@_C3V&msPjZip(^A^wuD5PvC0h`&rH#9z`6@t1st_)EGW{&u>O-w=Pv
zZ-~FtbBMpxb4Y+lHxNFX+ZkfPA7YW8hy@>rg?xwwABY7Xhy@>r1s{k7ABY7Xh-2!B
zp^>ue5>x<LMfIjuz}c4OPQ&m_ZjMYdP|*wvb}cTe5LHI0p{TGl(=;WwjQh^`iqaB+
z8laL72#{<A1cbWgVn}9kW_fOoYe{i#E*~)}@F*`p6(g_9-17>j*{?mykZ`ej;Feti
zKi#XSxMH%a;0o-`a7TSIIWsexS6MvCg!lxZsf2_Cp-IGXE;DmWOL~D*&!WuIeAI9}
zP1H7xvI|SID<<a^<<4+aO-?XJCFPmL<#(Voa7wZiwM2QYDY{qL<m@S?7#YRNC{9N4
zGD?t9qKuMclq{nZ8Kuf7O-2J`G*CwAG8!bK!7>^mqoFd&kkK$14VTdf8I6?DC>f0w
zk*ib-7<WNV2#`zpbSMfCH<2R}Ew7}aR9zuwBwktJ42dT)NM4F;l8D8Hil9`Tqmnm^
zges<(MLHEzTvaj^Q(R;!{6ZuG9FYcaR1&ySDF8_(fD5!*%F576aV;$@&KEi6nv+>p
zm{~HTFw;F7Ba%2&GrPPn+sl5<GrlM{uiV2K(6H7L_;cPyG3NKmEGie8;TGp)7q!x4
z7Zh?NSJAQ%SE5P5uZ%;)Z>sp6#D7iVI?yC;0;OUcCRR_Fm_2PJGAENLUWG-K`G=Zd
zJUoJ7@dzftBiI5W!DtB>6<NqHR2K3}SD{>a#kDIQOSKB1(5AQ&CgJp$i*Cx231!PD
zM@IQFg1K-erpRcjj09$w3AR$^A7&DmVIn&rk<2<=7~*<m7aIoipG^GJv*(A<1TV_)
zNpYq)WN>D=p#WKI$lyQa_;HJN<hEO;<I)^08?ok08JnU7DO0AT7+sPN>zicGl(Bnk
zZJxVl*ItX11C(11@Q(opnP?fCaztc~S7~7EnKzhC@iL8E5xK>q-70;NTdw2M9IsN&
zm9Z&aQp^>Rdtz<c?)kOXl8-=H%>)DncqBTx9glpc8~3Ezx7-VAuT9CqQcZ;-GAAp}
z;d}+>$&&LzshwoSW1)=Qk{#^R<P=&s(LJS>u=~W?YmZbXPCR(Yv3p}Q#d#|qZD<~O
zq&YqEC~~?nrAc)ZiO7(KgbhXbF%6XO7t8ktI=$ji>~v!qDBmxZ>MYKjQc_l4S~8^|
z*PO0IE>R+<OOZ=NR4=`t0xqMpVscStMR~mv=R4C7nRcm6dx%qV9;Hq<rXe!zQW*`E
zZ<UG2eQ2$g+{<dOMaBjO$aX+rfNTc@2FP|mV1R4~1cb`=SwLuzDMJ!3m(ehpsTDF)
zhbajwl!U{igcTw(4&!CRSiyhm4Re;SUWN0Wd6>%l3K_ePsO8puy3_S2r|Vm5uT7(+
z+%rYwHrio2ZZjR1=ID6w)SQ_swUb^}lv!3FuS=Y+Wr3HqOniBPtWS8!7gz4lq8e7$
z;%#y56<y1YdMFemu05me{YP;ty@$B0U+YN3eZAOhe5)!d$`p6*@lJ_J_66K4{+h%*
z<F87<J=y8KWG5z*uYE81>h}iL^6Z}OL?hjaM*1~0+|z4c@=U*)-Y_Q`!<=XgyM~76
zu&du2Rg3GPoT^la^r+(6L-|wrAhz}mFDJ(;F}W{?M^%`@jODd-trAH&R{21BRdHRv
z)~6~&X`~9VmYSE7Bb5&mMJbSP2_6Fd#Z3ceS1KT0PA*iwD}ASYS9wnLz=^1Gn&LtI
zT8}C2y__7T05ov+l#-V8kn*Xse^gIvWpm|TQ9`9xl<zqEMD?`x9S`OG<OAvY#C5}~
z9G`qF{hhdO;Oy<x(^{(T(#Hw7my?GRfO<o(Dn3JNUu%%z<TWKx>DJ`6bZX+-L%B5d
zpjO*%!kY<j!>gQ`dd<l!yqp}Ec<SZkxdgy-)YTR*J(ze@zt(?=d-u_`V$?_PVKN57
zvWm*YGq-3yrX)tCJmTeGkhpP)N4G$XRVDKd0>46b6!Lmk-VAd>c1!2OMgrb|k2={o
z6A+_F!4QLPm06`=7>yf-6bziWF*S3_luSCHf)1=eg(uQrLkdb*1_r29GAy>B(1Rn}
zN!M2o?DuY>1uI!o<6+{)1u2OOSI(HY@>YXh_E!baIEgc1E|JNL8ZIa%mKIkqG?6`=
zg{pte>mKSILB>Np6gO^SG)-Izg2A$@>mRJT+QF)e9jv<8!K#ZLth(62s!9#^S3>}*
zD;+Gm(Ed1iQPP!tQ{1be1XU#m2dMV~)X+hI8uAEGLmsMa796OC2m%#7***3T4w7xR
zV4Tp)y-#qE8kz`Fbb{6MVD)~m8kz`J_#p}&qTnHRxEdM>Q9~CYYRDo)@f#9v8X+9N
zX}XL?2<L2?E+W?v_MCH_Zoe{(l8Cp;XmVjOZ@86VT(&sJHFrifhCyNST#AGkHQ*7D
zAh{2e11tgYQYyqkI|1=>fC90QA|OEy$l-k<4PrF_qXtrf)qqEEh|)@k(t4P>4^!F*
zQ__bi>BE#(!;}^x?6HDJtAU$nHBc6<v>&Z<F;>x!RrF(3F2<_oaq77m&<$1ty1{WO
zSK^c$aVmG>6n}Awzc`hCoZ=@=@e!wTD^AH7r}&Cf>BcKQ;#E5FDxG+hPP|GdUZoSS
z<c?SA#H)1UReJF%y?B*gyh<-#rKj>UI6>(lL8YId(oaz7C#dujRC)<2JvrRsADkfR
zhp5sTqDonaEM)=la^MfKw2Sy?kq+)fI*3I&h($Vxg`9|moQOrbh()@Hg`9|moQQ>-
zhy@>rg`9|moB{DMB0mwU^kY=|F)DpIu!!d>{TP*gj7nb)G~&5RKSre=qtdsR2RYyf
zJe7WoN?+PrK)kd!#43F`Fo}C5f2>MBR;4coD)C&&AFI-jRq4m7^kbF$u}c0}mA<s+
zfOu)oh?V@(o^h|_m-dW%mA<rR+$;Iz04eTO`qI8}uhN%xjeC{8v}@ce`Q^ZBK)f7S
zMXcnPc8+@`zqE7QEBU3J<6g-x?Hu<?ere~pSMp0c$GwtY+Ic{{v~$EtereaZSMnyP
z^b(Z3($4Wb0z&|NEP}hiK!3YCi4e*A2S*6;{ez`BBUZ&mnj`LIu?Uvt<{vE04Y5cL
zu}IE8SY{()Ra_-IC|2rugu;(d_tL!ZzADDj4E=+{)%&U+85|+h3_cZK5kf7vSMP-@
zIl`43(!9Wjf=hG4y?RfYC+_Y1D>o^N75G(nax~UIM1IG@tUsY<3||NG`A!7ELrr|5
znB8;${{(Y#I^cIW$;9t8G7Z0&=Yrq4WG;U1C#&##kQ`KVC+&3HFypC*M&c6EGC&C{
zPQ@Hlo&uSaTUrd5Opo9hpLb=@JO^nR7iYhukp;mVpKQig?J@X*U4XB-RqQu>PYpFh
z8L|uu3`-1O7~PCLj0273#!BNx(+bmS({9r#bAtI3^KUM#Tzb32xeRd`<C5nx#ii2a
zC6@y(M_kUiTykyb>hBurrnyaXTkGD?y_tJ^_b%?e+=JbRxX*UK(|xV`!|r?C-*P|b
zVe;_sXyTFNQR=bQW1q*VdT#Z?>s8j<R`0`lmpuD<PVk)X`I6_!`X2S0)c2|1uYN}T
zarI}{pI?7<eT$dDtG!p0SDx2WudQA?ygqB7HR#k}ZG*QOSR1-E?9%XJ!z+yjHrm)|
zYol$Ab~bvo(Y{9SG&<MlS8wX=;~nT7=RMqeg7-}CMc$R(d%Z1<JsJl#>CmLIsaMlG
zn_g*F+N`SixaL!u-`RX^^X<*wX@0teM~hx92DK<{vAV_X7N=Uewe)Wp+A^|bOv|K}
zpS8Tws!gk?R#~kUwA$S2omL;V`l6Mk)sL-yYu%ysz}7QbKiv9Y>(gyq+RSaUv2ByK
z;ccI3d!+5jwwHWNKFxgk`DFNv^C|b4>$B2lz0VGx-98`reAP~C=hm)AyMgVdv|G_`
zN4s6^J=*tfU(o)6_WRpg+W+X=(6^OuKi?$ZA-*$wANGC6_hN@;9b!6Ubja&4qvOO*
zV>%D)oY8r7=LwzjIu~^=?Yz26w=PLtKI?L&Yn!f7U3Ydp*!5gDuWq5;-s#@2ds6pt
z-RE_GxcmMdO?rg)7~NxDkIg+-_v+SbX|HGeqWn_)%KcXOz3TU&|62du{$KlB0>T59
z1bh^j5||OxCMY;)c+iZX^+EfCjt9RJ(k&z{WO&HDko6(2hU^PD7;-%1QfQ0NsL;I7
zU&ES&wF+w=)+H<@EF<hdm^Hj%c$e_N@R8xu!WTufhzO4u9r0?!zKB!3NB5rH`(hvO
zKHd5R_vzOssn6Cv+xi@j)FQh@CPl7@+!py;-)4QY`p)ZnvTs$tasB4?`?-I!{`dCZ
z7S$;#DQb7r*U`hHXGEWi@rt=KW=m|F*r?c@v7f{ZjGGc?iFb)_6W=AiUwl&hxcGwj
zx$%qQ*T-*(-yQ!>{8#Z+@wNn)gl-9G38e{Z6ZR!o6B{N*CT1lrP28UNMG{Twku)S}
zcGBjgr;@fO$0cVaUrK41@@UGwRPWT#v@U5&((W5DdO*&Aw+0*>aD1RP@IZR2^nU3R
zP&!9prlS3~f$oAiiS6`fwc+}Ctmr?XJ)ob{p4Y$AcIY2q{#OI-O`O5=5#};}qra(L
z&<|*r^&`Yjznz5Zx!7-EAy%&EVKvj2SYdvVB<s&%rTzgjRDS|H*S|v^)_)>f5uVlG
zCfoE2<T?Ei*$&(t`hHCA^3dFYX+arx$8UfAk~UsH4_aq2oANervJI;Ywqs?+9{sfT
z5$?ayzXtx-WUYRdJg@(RxtB@cb(DS@bbkchv!MGUd`O0F0nT1{mX9$1vPx?VUQdD7
z@4)LR@c1owJPAstZUTdV(izO-9HqYwt-J|s?9jf`KZYh=h9-U>27Nnes((mYLRvq4
zBT{)2nmC1>B@SYZ{y}KrJu(bZt=Frd4GXmKJ$Xw19yu@yPuFUV@T3|~F5t;UJh=#6
zy#`&KgG?_$rjH@hi#Ne%-Ll@CPF*oy)Kk07_A#`+8vED04b3;i**in9L;YdsVjlL=
z_!xeEEwCc7%6&hyy$7;<piR<?w3&J_axPX|pg*PErEh}9Ueb2ybG6<2EbVoD4d~qp
z4Q|)o2J9Vuj`prT8}y&WywLj4>M6~lZ$w(<+G%|rG`wB=6*!j>|AzZ3c(+FDf~6L7
zp!M6J^*m_(GtwEh*i~OmdIIjJKTm>0F3d(=SHhNxkQ)~8J_$Lp0y*+D8Klo5L$&(I
zndQiti;(GA<iX3xgO`y9FC!0LCeP@vA|Eb5{}*6sXURvPdmQ_jNNaFK?s;PtZUe}E
z60>O=fyNHd_!Klg1&vQZ<5SqMJEZE5dNczTG+y%r)_cJE0a)KV?4TKR^pW-&Y+jbN
zuc4dop_}iZn{%+=hS19o(8b4)?PFNiQOI>1a&asBo+M*^LMqlDWB|rxxtjV9;Q2?)
zF?Io$oMR9DF!*VRQga$SeS#8ynsbkwdj>go2syVAIrlnpZZEhxqP>XcyRf3>70haW
z4P5Njk0TeWkc+#Ji$8$V_rU3A;Ph=$49?c-PlAI(kncUn_a3zH9<*2uEmlK|=b^>D
z;OHEzc@*S(Uc7w@mQ)XKoyA*c@Rk*CS%Gl@oL@$%HXsLD;(b5FDTvb$GLREyaBv#7
zat@fsfq51fRy?sHl`8mv3-CI5kb|kbYA7V-@Z*5578v|$k<*o%qWKcAP9o(Wk@5x5
zJ%f~g614O5`#}G69jO~IAKM${C=i~u0m;K`aDv}vcq<8-d>tI^1C2Lf8CCEaO_9cN
zcr(JU>cIJ9sR@@Fsb-*bjl#~vlWZ5XnYK$P%}*j<$01)+q4iSaX?^6S8}c$5oN$^2
z$jkc3OHbsb2TEi%N~95%_ZmuMvQ}lYp+q(U^#YVgPiVUUC9)Apq!}gBA0^Tg+G;?W
zVu@Kx{V9~l#wd}ID3PAf-b9qhWLT~TEVn<2v|WJZ?j;FWsFb1yAV0^WM7p6w8lho-
zSn)Avcp@}%^xsr3-JGBN_tcpLUZNf>_Ia%T+r#Y&Uiu_{_u&jh{>-xu`*B0wTTqtI
zApd{R_M(iv4sY|O{w?zVedPZ~$p6np8MT*`MX-a{P$Kuhm%Yxd7I@r4@zm;HRSu3_
zR|>g3?gi$XSnuEo+xGys_X+!l?ZaE_LAgJNa&JYsKg-KK{4UxG@RZNNC+t8t4!_8$
zoD`*WFD&C5Q27RYUeMn~dLO{<zJtwu3p?A7TK*f<?jMQLnhNhYRL_A;y^EC@-@vO~
zfQP$`n%WQbZn$U*oB;OwXbYSM=6YbhFEIB3^DST=2IgKtvyaX(4*|0Zm>Yok7QFj6
zpnL(XlFLZd0RCITPxt||4?Mi|7hm5*z0K)ZK<5bP9LM|bBgHDD_B~QNi_|Pg?Fc-^
zNAM_U|DZL~NbnSac2Fczjz((9NHtae3fL!jEdWpR&#qI9T63iH4LnyeYMoSsp}4QR
z4N^BoLwKKO;C&jx^FUhtX?ULF@H!{pZ9XIvQa6Q;I-?EQ6+XHr?t>5_poK`Z1rpG9
z8U!s2McrI?T6JU8Q!QVMb`q`ADsXiHwtpG9<A=blC_?0x1v;>(-1=Tv(SBfZdpib9
zZf_RY1-GIPfN2HhCgkg3f%yh74+HZfmHXdcgSioyAHe=UQf*d#^$j$03Z+lhf9LS_
zdD!43RbQRQ8|P7OFM#LEfErM${6r1*6X;aw1<>I+{x)pt0!r8~!urku=Pcwoi?>ng
zL~Ufm?-`WRGbp7$pp>3LDLsQ01Fy&SAz$7=`F<PwyU2RXN?M{^r=V4zhH!J`d;e8F
z<ocT2&ZTG#;4FbA;L-vvzW|p%3K@8wd<z*~f~?#R?84Je@$_4i(F<rd%2veZ(9IWk
znuw?8z@r&8&m~~pCa@*~>n-T%Q(%1#tTsXqDQE$t!L~E>;dOAywR#>j&IxMMaCP(#
zsd3J7fc0seSaoyu@2QDyzO8g~t>r&%8~t&+=Rc>#Q(HR!{2u3@PqCI;`)Gpm$U^P4
zD?G?Wc#w<mAof1)Ui5LT=;OYP-oYp6<L<$Dz;h^>+tGrh4o_po)p_`wAJLC^MZNJN
zaE{@P9axs}tmr56KAIJf(*p7X=$rx01wg(Nkc)uuzT8iMoa5=p)&*8>CZT5Cg_`Sa
zw7lQtJrwi{c@Kr5opTmtl($8#|LgIIn`=q_nOOgQJ@S8#_xn55fA;9$-x~gBYxw$6
z*Bg(g{{KVkZfE~hF#b$m{I91aM<=iU{VR?D)-}FY_Xyzs9gN!1$hxoOnB>j3uK%xK
z*44iMqmj{nPhC*Aef`as^Y^^E^>uxX^S^`KoM*jpy;WNR|J~2)uJbsr(jU}~`&Yq`
zwa=g5*ZiM-Fa7Ia*PSo_lU)Aa;nu!&b0z2I>y*Dbz3ack-3;WvuNVEd#Q!aG7q0Ie
zI74o3&ca`>Kk>({%fBAKH!}mG?l}^5Vf=gAr#Eg_)m;zPjd63e&0jCK|2_FoJHPH9
z<w#xjQ+JNkjq&HV1nW+-Zj76=q??-y_up4{{`E@OKYzwU-8S{t(@Jf-|K?lte_WH^
zJe?c+od29JwRPJ=-5CF@zVe^%bN{?qIsfju@IS`_Z(PFawz|48{><9(`VqeWzWVZC
zQ9IT3J%!f=az^yc`|v-Wb@RtHg`7WDn`-S`kw1R#=6axiCe~lC-u`0^T|d{R?h;+w
z68QJ{-@3mI+?>z3vCpfuvOi<4+4Ual|C)u=Z4du^k0i@~-JJYY?eVY5S6wBbwk*_M
z{i|~O=F0HR*FQIp`NuWYpVxZ*W6%7bmd?M*ZvLue?Qg#RXW#e#*4N+q`roeyue*)-
zw|)I>U;mBvRacwuKmB>#y@<Lo{_M8t-}G*@Bgf6R*#GMKyLm~R=TH1!8!7mk-~Zpe
zEdIDh_~(C#soT^2J-+_u@1Y_`v;K3w9o3G;|Ev1=wIk4cH-?*A^ZuWs?|+9MsM}Ng
z^}Ig`Tf}$#!^+$yIOFsI_KqRJunoH;gkqnmLkJ&WmyccuxTh--9za;F?`MhneuEpH
zH^xb+-Z(3@6V6I)LcDQ`a$Btl-K=$@TM%#6ny>~4J_x=DqqI)!7KE_~<8fcEd9&Gw
zZCVpB(ZoOzI)jsg8jjP}ybyf#D6NO?k26`lwOIWtEgrieBp@UrBqIz)7>Y0gYmrA{
zAEH|jmg9aE!h?W4jrX5L*opg>@azr5`w`y4vqPZy0m4Px+pvP!MUNtl5I4pS6U`B~
zM(Cw^lMuv6pCC<=gfIjl-*%2nLMTC)Vmn8TdK5Jwm=QpSx+1tCxFh)JU(t35?Gbzt
zIv{jJ=!DQ&KSR49bVcZf&>bNFArK)5As7Ma(@_014MPY=h(PGASJ6HQk)YofbowFg
zk2nf(G~!si16@(@Ora;5iZB2n9RWI{&>0<uFalu|!Yv465hm&W^ftt|Biw<o5;^(+
z!fJ#yNOv8=282xrk03mT@PuB)JoG5$jnF|q!@B6F8DwES0QbYSKdu81hwJ_f{IW#k
zdb0i%O94C$VIV>}aKRTt9<m7tg}|E#oGE}+;C>q7SqO7*Js;2Rz_SI27b0E^_}vIg
z5gtHTjZlez9pKnTgohEH!2MIee;WADAbu9{HpI^%-j4Wr#5)kbfOse37ZJaN_+`Yq
z5Wj->Rm86$-i>$<;=PDpN4yX58;IXT8gC=Ki|`)8A%w#SA0Qk>_!QxDgf9_JAbf-H
zEy8yQ-y{5ha0cNl!g+)X&{;LYPYAytTt@gEp$0+Ms|*BzA-KVY+oHst(6H;C7J>Ei
zee^F;dQYJAo*>@X8?P5)Jg05-FHwq5pcJ1#DLz3r>sGo2u&w%+tO0@#f-gd%eu9nC
zt?U+ru?XV<E7wo4*@$iWmj(@iBDm=%4A>b4CoP9!FQ0I%;O~Q-O%CDu1MC^&jh#(;
zA;vSLd;}@KkCfj>%I_o9BS`fKQayrHk08|}NcDZBbOb4#MM_7I(h;O|1SuUsO7A13
zBiMnd2X+ex)6dbC2(1uWBeX%7giwjF76H2)(TxZXBRr~~gXNuLKO$VjyCiV4@OVA7
z95Ns0upXyB;w;cDhV{mkred>;>%;B^9@9J{J&Qdz)^FpL)8JgA1>O%dF*NJc?28sL
zEq-mey;XRt2U=&eKG0@Hn}^$8Y9H7>!*`<ZI~@`_OzH4&haDZh>Xe4_p$*{F6(Jrz
zCjlW5AsJyP!g7RF2s;tpK-iCP5y2+>P8Ix46?{$={7n`7O%?o270K1S_`YVO0HF|J
zqUHtPQ3c;o1>aEx-%$nMQH63}g>qkoa$kjVUxjjCg>qkoa$kjVUxjjCg>qkoa$kjV
zUxjjCg>qkoa$AM+ScS64%V8DE)Vx?00@6eo<mIml<*y25tqNtW3T3Sd<&2lBD%gD$
z?7j+iUj@6bg56ia?yF$;Rj~Ui*f!4pL^y+R9&+}DR;<v96<V=ED^_U53awb76)Uu2
zg;uQ4iWOS1LMv8yV=J^`g;uQ4iWOS1LMv8izzPjmp#dv2V1)*((0~;hutEb?Xut{$
zSfK$cG+>1Wtk8fJ8n8kGR%pNq4OpQ8D>Pt*2CUG46&kQYYAd9+LTW3dwnAzvq_#q8
zE2OqUYAd9+LTW3dwnAzvq_#q8E2OqUYAd9+LTW3dw&G0k!Prlzk$w{X{UrSRN%;4Z
z@b4$#-%rBlo`lam37>lszVjq}=1KU*lkjIJ;mc0KcbtUpI0@fz629Xkd<V`~MfeWk
zEOzTMX`cE5%}ZZE@)0H>lpsvuFq9Z8N{kgH#)=YSMTxPZ#8^>ctSB*7lo%^Yj1?uu
ziV|Z*iLs)@SW#lEC^1&-3TMEM9j*u?u|Mc72rpqzz{Uu<*j*$Kp#Y%}VWNH!HB&We
zrfSp*)u;ig;n}O<)vMvvt68Rgk!2y^9ae$+ISAN|6JEL+Ub-4ytr}jf8eXj$R?-o_
zT@eBhf)H*;xDR0^!ZQf(g9Biah6qg%njy46XoV1rFc{%$gl`bOMK}enJP?3On<4<8
zHb=laGzK9KAps!?VK@S~rlS$YAk0OWhcF-Ed2s55&>A5Y0q?L$2-6W}BCJAq5aA(&
zPY^ys_yXZ81n|R7B7hfWL8wAFjbKGM2bs9k7D#P@)D}o>fz%dAZGqGlNNs`C7D#P@
z)D}o>fz%dAZGqGlNNs`C7D#P@)D}o>fz%dAZGqGlNNs`C7D#P@)D}o>fz%dAZGqGl
zNNs`C7D#P@)D}o>fz%dAZGqGlNNs`C7D#P@)D}o>fz%dAZGqGlNNs`C7D#P@)D}o>
zfz%dAZGqGlNNs`C7D#P@)D}o>fz%eX?tD>m_0~T`{c#j+wo_=cozjkB|1lT+6xvp&
zs0qQ0!0%lV+z{Lm+UiHq20DfI&ndKhPN7~oihAWJ+9Rh>w;V;A<P_?cqpY3&A?lc;
zXn&kyNw^-5>q1eZ9c8!Sem<@jAl!rN#}S^w^)m?D5Vj-iK-h`!62dNoR}pq2>_ymz
zVAGGHt~!dk>Zrj(|Ipx#&>6CHLb*&pxlDkBhalM@NOlNP9YQ%xKsil7IZZ%0O@Ne#
zAmt%Qc?eP-f|Q3K<snFU2ofHGgohyEAxL%zQXPUMhakZraDE7!|G)0eJkE;h+V^`n
zK+|;7GBnU2h#EoBaKV8%L``H81R0z#k~kzPN}_F)#0V<NC6VWln_T7g<qC~Rq_Js+
zsHjolfFOctj~vZmI@o>ap}J|Ps-E;2@9lcuz0Wy4V8{6J^Zt0BSNrp;+BNT5>$lck
zwW`jkQd(R}i%V&7DJ?Fg#ig{kloprL;!;{%N{dTraVae>6))k1<6;7s2quAP{Ab^E
zFoXXYo5}PVmfb+_K8t@py9xY(`RBlYuxvBaH(2&I+r3MD2Y8R=4)b;37;u3He9*x9
zMyAc+Gw=oY614CiVItUuUyR{V5_tMJo<1%|v+M$<KVUi@&_=v|9Iqe8>&Nl>alC#U
zuOG+j$JMA{8-6v0Uyb2cWBAn=el<qie3-cTFmdx?;^xD6rv%<9K`#-fmx$9##OWpC
z^b&D;i8#GPoL(YMFA=Agh|^2N=_TUy5^;KoxO$NDJOmbihry$q<1w%Z{1?Yx4hq2w
z;6?B!ur^50yTtXdU>mXVVf=dx&zK-KK8&A_5gQ+-=ZWj9SU-jNsZ6hCej3}*7L6|S
z4FEmhMH6}s^?a7!$8;X^zoI@LJWPEF(<i}G;E$|-7A)nM1<WsFx`J(1f>q!p)~#jv
zPOuB?1|NV@5CMC^$KU|_9Ri0z8AyN%Pz4;;*Md55oOzFFJ=fC+n!)Gb3-BfQ9}oly
zJbVHVp9pmewuQQbK42&~4SWYq+(&<NkpAW%4E15C4?}$z>cdDMMtU$Z4kP0*(ua{g
zjPzin4<qBS(T9ybZ1iBA55s(z6^B_q%<^HC51V}0<ijRk-p;=m-T~%-yTIMSK^W%4
zFdv5bFwBQxK1}jpk_VGKnB>8vI82JeBp)XEFv*8WK1}jqk`I%7nB>DGA13)Q$%jck
zO!8rp4_iFg;=vXVws^3`gDoCxiNh8jrg*R<4of^3;=vFfR`{?Y4l8`v5QhzM`qYE;
zsR!v(55fu`M#N!+4<mdS5r+{zjPPNE4-0%45QhPA7!XJMKHB%uzK`~OwC|&RAMN{S
z-$(mC8urn!kA{7;%a_|}OCx9op9B605$$?t*F(E;v>QjeaWR&EAk8BB$U=(_T6EB&
zgBBgM=%6_V%{gezL1PXYbI_K9wj4C&peYAUIcUm3Qx2MP<emK2;aqSp$QM~?$w5mF
zT5`~mgO(h$;h+r%Z8&JdK^qR*aL|T>HXO9!pbZCYIB3H`8xGoVkhp_{9VF}^T?a`z
zNYO!x4ia>bpo0V*B<LVD2dOzo%|U7oQge`+gVY?P<{&i(sX0i^L23?Ca}1}EM0YEV
zj&}qz$V8aCf?51C+D)MS-N75opLmDRhksAa<=-CjxGU)VP9cjsg)HtAvba;o;!eRx
z>Z^AO+>zrgkK!$l;w_KjEy*f~9_kYCE$<@mhDY&+NAZSa1w;>|T7$Pcs?VW5imAE7
zn8MWDWlUq4xzpgf^)295k;NTH7Iz$3NWVtUV_EvH<6-LU?>v@r40HFfjOhy2tpuyU
zH@O=*z&?k-VNeDVpaN8Z_IE1Bndfdr2ckzv0`tGtS>i|B<IV=P!Ev<?tOpypU!4vX
zf@eTca6FU^a@o%8(ZC)J?9sp;4eZgt9u4f#z#a|k(ZC)J?9sp;4cy7k;$K9~UN<o%
z_Qb0-nZ5C1O?aIqyiSu^3)T^f5(jfM6KOZ$8Jg@-*&ol)gePdi12nasWd-$>U=`qu
zSZfp3+Jv<>wVr(jzIPA4cMo^;QE?&v`^y<^R7PA#t2|m&O^d3z%a3xGA0<j_5(l`_
zIMF~Y|LE73|5eQ;?i@+<#xd}(d+@J&@UMIDuY2&Xdu-HpF)`&O;MpKbRv=1NAZnwx
zwJb9coQd9&kz13E+|D6Zyaee^Bs#m2E11UobbJo&veDcvOm7YL;0yQQ3-^#k_yh@5
zlS%j(DO3~X8A*6VcumOM)5|&53YHf#UCHzXrhG3zzevxx#!ARDQ5{mMwvnA=YN9)0
zZ?X|lqC6utFVvHs>?F{a`CR5r)OQ<F3?s!bQe2J{cOgX|DHaoBMTxPZ#8**brzlcf
zE+YH`<6fqJW1IcdVJOn9B9@90OGU*o-~tc$pb<2K&%l>RSb)C#uj9yIxg2e!zMQxz
zO57BcQ~3?T?fk1U|ICgC!e}6j2Eu5dn3yT59t0181>j-uY_J?{EJqv5(MB<vC`J>-
zXrh=H+D8+`dKenG1nZa>EJqVQaZ8k#B}$wUB~CH1bupR<qlqw@2otYFiB+O#WEa{f
zMiV|-@QF{N#3xZSaTF~aMFU5Xeid<viNSr%cP!9AG14za^2NjpQR0Ot(qE4BeI#Fn
z<g17uOuX$ALqv%oqQnr<&>2B9nkW{xqlryuViTHJfhKmMi3T)LgeD?rB7!C&me+4H
zEoGa%;BRbmfIDBqX@}+T8cjsdL<CJl&_o1HM9@S8O+?T{1WiQHL<CLjL=!8}L<Ih?
zKob!(5kU)^(84CPun8?}LJOPFLJ?YspoIuph@gcCT8N;96=-1vT3CS=iqJw4S|~yb
zMQEV`Efk@J2wFIX7FM8z2DA`C3lVD*Toamzpot<hu?bCVLKB<NL<CJl(8NwOQG_Op
z4>C4k{E&x6B4{LnMvkG8V`$`<wTG8jwuWtr*rp{YLL)_JqzH{f&`1Q0tUx2ihqc*5
zAC~vEKFvcj5i}D)GZC~>B*vkQEodNt1`=o>fzLCZ#ly3B*hK<OY(W!SkbVNmCy;ys
z$tRF}0?8+kd;-ZQkbDBkCy;ysuj3*4El56r<hLOC1d>l6;RJru!`paBI)S7UNIHR}
z6G(aslHP)(x8PGfq?*8&dPsE(5=|h{1fIr&+X*C^(6kfZ>LJMll1$)XJiLpMTms1@
z@F*VM#KV(#@Hm0@@bIx7Uc*CL38a-kT3g_30;wdBN&=~He}zP<;ir@0r-O82NXOiX
z#o%W>Qi&mzYNS$~;-?EgYmiV3e%2$U7*dKMr5I9*A*C2niXo*KQi>s^7*dMCPX{Sg
zBc&KpszypNq!fdT4w8x?p%@a1A)y!&iXowDBvg%rs^Ovo7ah3hz(ps;MF*+H;G&Dv
zs#9DvcQG-zSdZjlNG=8!9i$dRYBBidz&|I&zxova>XBj$DaPQR3;$gB=fb}lBpFNb
zuO9w6@XvvN4ib$a(HIh~PVuiEuTX<ms6oQ96#wdxbPP$ykaP_GIpPU%I+5uaNbf8#
z8k`5l@c-u*0{%B#JjVRLfoDMp+pcH2foUo0KcpU^zL)xbrp8MgXWGPkKyFqOnPo8T
z&9pE7mEMo(05A}o3`Vl-e5RaFPGviyAXyF)paN79t#u*4+ZA*J97~Z)R+*p&$YMRm
zB%4#CI4;?o8pW~EV43<p>n{U809UYV93cO!$Rn%k!7T72FdIAq7J|pYvq3ppE=SAd
zXt@k6m#J5fJQ2J`nrOUC_oYt6iRR1jKxLY9X(B~3K{aT;91WLga?@mmYS3^wnV}jo
zLp5l+Oh3+Ya*>+6H(8<@vP3o3v#e&jmsws6)`9h4Blt6T6>J7?fWLsZ!4?n(+rfU0
zaS&hyWSMF-GSo)^@*~SsLzbyV9|gyN3tD(uA%FszLAmX@bC{amyBE_l#7UuHU^x2!
zE^MfW4NcgiiGO@FU!Ur!>ut=F?5P{ka1$D>N1OGgw?zv+(yT|C^+>ZGY5GXhM}j_*
z^RXEd&-mC&BT}okvCPfPKfv+@Oii3(VwB~qF9a_D6OSZ&L!T?~xdNXnsE6}SaJ(ti
z+xdL`<aE9fk@O_h;$rT=h_K*q4&2SL-Xp>?>p__A2M361O{{U8^-b_P;QyF2Kwlfd
zRa*}+RrG|9Iq)$DKIXv39Qc?6A9LVi4p&?a?{eT>4!p}b!DE<ct{NWYAc1N)l!Fwi
z^{JvKQXrxuYG>c1=U~~*EW3;O2beAZkFxA>=KmEuO?^4r7lIdni4|6(*EKAE85Fb4
zI<OvW1b+svg3aI!@E7nl*aE^}J7}@dor&yBREHN4J#Ac(W4%Zfyr>EFW!V{En8<+}
z)o>%kzh`#`V}e3BvKuLvAl*VFTbPO)s*&Jscu|N13+el}()Vwr@83$_zm>j!D^e>#
zQibrO5S|pmlM*CVf|N>-Pzlm0N%ilANTq~+d@KF<R{HU+NM|?FDLJ8^uI6e=;718p
zQ^M60awXNUyP8&)h>^6m0ybCC+Dckm0h_C6aRqFy68pgczEHwlj|jNK9LYcXvptNi
zqNSCzw1Spa(9#N8T1iVye%0hwD`9jMt*xZBwdk<|Mpw~d^R%!MHdn#sDq30#n`>cn
zEo`oW%~iUXc&{a>q{WrAxRMrE!00L%T?M17Lc@Ziw7gQBO3RPXa?|P~w7Qa3AEDKi
zw7N3Y>N;A@(|Vq;uq~}NEj~hvkI>>Hv@qSeBec%6%4B*gPiR#ot*WF|b+qINEvcj>
zm9(Uimele5W(;GjmR8i!0&_Or3*Z^~DcplS%amu&oUIP|G$Nly<kN_J8j+2$^g3kH
zh)f!}=0>i$k!x<`Om$piqxcv4dyoF!qrdm)?|u4vkG|cbZ};ijJ^FT!zTKm5_vqU_
z`gV`L-J@^!=-WN|c8@;Yqd)iP&prBb6YY5FA+P|LC}kM93QPsl@im-_zS%@G9{sXM
zEa(#ln#kOvA2tz;N6hEb&wBK;9`T(|zv^+HW1?-3KGma7^*THuY8E$f5Az219l7@2
zqq8SO&BS8O#9Ph8TFt~)&3YEN1$2Bu)J$yEOia~GOw~+G)l59qOgz<0Jk>1DMrJND
zbCH>gyj<kvA}beJxyZ^zRxYw~k(G;gJC3|u<mDnS7kRnJ%SB!;@^X=vi@aRq<svT^
zdAZ2TMP4rQa*>sbtXyQ}A}bdexyZ=H106?BE;4eFksHe4&c7GvLwzVX4Sa`lX5uxP
z@fzlS%=|9A8E?>xH)zHinCouFx|^}?W^t`JG4DBpJ4loJ`~!Fnm|SN%&za6~_Tdij
zALKYY&1a4dc9H+tMgC_O`JY|ne|CNAT;`+f`xscn9iGWuj$k?pn4IMlrY3J`a+W4P
zna)ivp`Ol5E@c~&n_R|pEz^INlRUt7hrnS_1`?nGRDt&S%HzzFvlPE4`<6}iEnASS
zMY>@z0Zasw0MBKSZn#|rE{v4JNI5J_25tw_<9vg!foTf}_%0mJaZ_2iupG=i^#y?A
zk*f@os|@qJKAS9DHd(lAvT)gC;j$IIKkotgya(j-9+1y_K)yNy3<JZtCqEOM1xA3g
zL1)j2(;2!;+2?ZbLok+Yxh8U+Va4^3^9+;o43qN=s~Lc6Q`dnTz>VN0@MF;KnR6;z
z7e;eOQrWsAyrbiz!7v&;f(FB>j9s{0#x9$TT{aoJY~Ix|+6||&c46|SVQsQ@i&(xG
zEMfjh@Dwo5v<sM;=h_{!cVWEmK3&508^9*;3V02?4&DTBfp@@Gunk}ZuqCW_f!*K(
zPzoYoFZdXI-LrFt^|hc5@EjesgxhEQ@cjGuu2C|&_f2$<z56Cw#m;@~+&2-U7!Rjh
zIOW1A7f!kG$;Db-c;vz(7i)Flk;{>K!Xx92D&UgK5qn~_E*x^<kPC-gIOM`17f!fv
z!i5tqoN(cUi>_UC?V@WJUAySoMb|F6cG0zqu3dEPqH7mjyXe|Q*DhA+qDvP&x>%x%
zu3Rk9MNcleanX&7Zd~+YJX!@-=yH`kk*$ktU1aMbTNl~7$ks)+F0ys8HW&H1$j?P~
z#`{$ul?tTNlOA&x)&kq;4Z>WpOOFudPCShF599sAcz;+0*beUxd%(kB1y~7I0rUP&
z5QOpiVZ45rGq{|=ZOxPVoS}&`m>j8(oi<{h=Iw+Ixl+!Q&X1ZWCnx4dlf7QY{3u$c
zukM&5^=;2LjB^-o9>bf*@aE<pgJXE}7~VXFH;>`XV|eoz-aKYAz~!{990_cv*Da@)
zEvJ_)=gPLzyOz_dmUC6xxvK3PzZ_rHL<Vd%S*#q;i!7fx+dj^=kF)LLZ2LIdKF+p}
zv+d(-`#9S^&bE&{!g#*5H~~xqlfaB1A2t?<>w*E|4@{o}o58za2WS8-K>;2uA0`&S
z!~&RD022#fVgXDnfQbb#u>d9(z{CQWSb%rRr~k;O|H!BR$fy6vhn)qmvjBD$z|I2L
zSpYi=U}pjBEP$N_u(JSm7QoH|*jWHO3-Cnw^dI^3ANlIZV1RlW{2u%P{Ch9}_7>oo
z^669ZVQ~Q-DIX>mz~lmb4eRrn{tC<oOTd%hDX^673Yacqx|ZoqunX)4AAnL20eiv6
z-~ihl0*65vNPr4Z1svAbf;w=Vc@Me$1YPx@U+IC=Pkb-67OB@E@#MRxo0+EHJx#xF
z+J`TErQb6(@0b!JBJt$=rML5h=MFFj+y(CDsmyR<%dfsGT8kEH(Lya+s6`94XyMzv
z`}rvQJ_Z&Mqnr0QM=%`)lJ9BOBJnyTUdNM~9{Bwp`28M8z7EMJ-_7j!9%e0)H}7HA
zBKbNb|IglytVQy*NWK=y*CP2^Bwvf<Ymt2WcOz?&e4S7|E<^UBXYbr!a(^&bn6Iak
zqX?RU4}-dZZ=VJq1$PHeP@03?d>ghmTYQ6oJ75Ox=mhsesR3*M$3w5S?aW5pj|e=w
zo$^II!FkQNlYyL3YT%BGfp5Bz=T0x9UKbn<YJ=alE%~~dIp;SUg5%u5wjcTuzn?G=
zDR&rx9l-~|f?!m@8!_~DB3NU_;w0{Xg~;LCr-HA#GPJY=Ymoh`Eq>q!vw|~O{@dV>
zK~``_a4TOn?Z*6dW-PjyeMA?&fGUFX?4DzS>(JNSmLb93;AXQVIgo?zbl_XMtwU$q
z1mp&S{cSQf8*_Ji!jP0iF#CkXB3K-RgL4fRT54O$gY$SAAc7a|R((#~Ha#EQ%QlT<
zQ92ormk6#7c(0=6=WT3)nOAnQ@mCfl`SF#-sRcol<8)xC;b3wIUNh6+ES}<-=}$q_
z)EIgpXY%UgLVG3`m@#%`hIWiiN$6*GIU^!vGu|2;gK@osmFU4(Rxd0pwO>G_%NBWT
zQyaV&%z+8p_{wo==%^7E_H5&tu>kfYt8S+|sF#^qa-g+U9huv<r#Yh;QteO9B$w==
z74NXd>Yndhn${XH1aE;qnOe)Q?KaWiB9?40OVR^5zt-WacG9})pH#S~`vyb$T<y1R
zvune_wjsT3+Y(c2&x4NJciisl=Yox2zdpH^Sj!IWTf&o_)R11A+9t`X^h!HzzaI-)
z?S>d8H3T=dT~GV1dAB5`LA#;xL?;ZvHErBTGB&wEd#`cAF0Hejc@rd?y4u#wI;nKN
zO_E_|b93b2Q2QN|UX!Ie!D_qBhwaz5ueW?-51-yEc;6ne1YcIj@f|zYP7|h=>p0k+
z%leGu^58ce*Qe(?*qIVf(i4YR*PSBq9=(Jj4}B)z^cx}0W7!zKTi=KGfyVJWfr;Wu
zak7|986u{MnMCo|QcmaF-PiNo^jVZM#E*z#hw+T&36Alfl(WP-v5{l_S-eV~Y%}Ft
z?#tic*l&rq#ra|jWsC?@z9+VeUHl@clyVu*Xb$l8^+S}&;;<+aSMinG3URfl618H6
zI7Yc%)Qd)OgZNB*&RM?@Uy9ixkV4!nyT~r$R+&LA{5IK#JN=)^;qokThdf7~BkqzT
z<w$Y2952U<x$<`6w4cj4L}>TO=lQn!eX>v%ieJi?<Qj3md|AFM=E-%kMEpu_;7iL7
z%1`*_;csM2#>7LiT$YRZ@`$Vu3lyJ86ptvav{<ORsA1wUb*4I7yr@R03&a|AvARN(
zsBvnX*sLa~3F38irMgnQp(d-z;!QP0T_^scexhy>JJfCJHnB_nO#Mu}ukKKHh}~+A
znj`k8xoWQXK>b4fLi|<TtL_!0>OOU!_)y)i?iUd?Pt6k_sb8x_Vy{}P7K=~S@6_)^
znOdTjh;sETzXM9BrTh|ze5xuC6>6DUCMwnQ>UmM6R;U%CTCG$og`-xfRiZ|%R;xv=
zdWqkG9aTlDSk$Q!RU$mKL2VGe&f+&=^|~*=2>V<Q)5BypJwlI=8TuT3j_j^S=}|IM
zpQq24J@goTxy;r-)MI6TJzh_i1N9U=RSwnD^h|l0o~3V;{GLqTB+t}8)<2eK>6`U!
za)iD^&y^$fJ^CJbzRuVA@&f&Uo+roXhx9}8LcKsQmKW(K^b$E%KdGOQ<MnfTshp&j
z>1FaN{k&c!r|31hNM57Y=}+W!I;Lat5xrkm$w&2ZeOx}ReeKI<bc1e?zt=4xE&nal
zHPlru4P}Hf<bQ-RLz%K5loiUB{~78X%9Z~W8W0*F3qu1#gXGH4;Lu>XDs*b-RQY1)
z^w8;Yb!d2Kxcn1#(-nKkgz@LW=u4UZE|xMChTbTCj16pr{jb3Px8Qo1?|bhO?~C2A
zJR&~gH*6n^Pee?73dfJY@Jbk7&9{b+!f?ZH!|pFdi($4LEboASN<7%XW_uC^C}O&k
zXv67ZIO|4WV@b>HjpdFPd06hml;sY#mOI2+?rGL$Pse&@W532`hhwc9xDI2X=U|_2
zb0ym;BW+v%MMNp1#os9BihWq<dDcS5V4;Vx-!jUD*l9vsBpk}c*lI1mEo`8CpX>M>
z*?b}Xj&&P5{eiX9E3BQ4wRSqr+UZ1Vr<1LnUS;ic3U)eIOqKWY=HRu~?yk3XcZ0RN
z8?D{lgx#GjW?PF}gvCu3ORQxrvzE2mTGkqCSw+^e)>_MY*;-bywXAj4vP!IFt+$r7
z!CKZvYgwDDWo@yRwbfcy*jm;$YgyZ^WxZ=HYlpS0oz}A6vzE2XTGsp4vUXd`+Jj|n
z6dzb?`ovn(L1RsV-`?pFf?wZ}$2(@MNgOxUBwS-nSRd9T{%)*E{14VNQ)+8RnbwZ7
ztQ}=rJL+lesJFEv?y#|=JZnb-v7^QEWNSfZS_>LsEoh{*pi$O>Mq3NI&|1*N)`EU&
zE$C;~f_`Z&=zeQK4_FJDXDw*HwV(yof*!UO^oX^fh1P=p)mqSEYeB!W7W9O*pe5FV
z{ul1^V$12l@U}a5goe{YET@OS%<o`PXHY`)EW=>=a7q_gem1;6hmr+Lzsr6jDVg*#
zqgXzgqG9Q|+~1F(bcLVaW6KLE+3@osj(&0SDJu-kfuG-}?;A_$Lti(J-^P*`<hOao
za{AE+O(r8YO-whx1fmR}_nXN!rvDpgttbyG`jHq!?{^dSHk)#?wWwSyY904Y>nYmW
zRi3r0{?@K?tzDgB?Mhj@>WN+Lr~L;gy{&aAYhB7(*D2PzPO;XNVXbSBwXR%iT|=?1
zFT_wR?C-SA*w|2OV?(j7K4O6E%Wr(MWiCBp9+oy-<jOPUnS9&(EP0m5uvXXIT3vT*
zbs4sI94zmYcZwmlj~p!LVuwSl9S*T}7_xS#tsT<)DJ{CHER`ifDqEc-x~N_%S18p_
z4HQ}pQbTx~^%Q<%oTG-)NA^*})o^~9YI@3k*zG9MUyY`}9Dwy+BJ$Lw>Qc73TwTui
zhw6unuTWQT<gscjdzs!eq{b_BWc$>RnyC0~s_j`rYLc2n-Sn>-FEE9cOjT1k%hl>?
z>eJLT>eJP9>NC^~>NC|$>er}is9&qDrG6c~azA{>PiX(m>So$@3q7>5eneS6qO2cL
z){iLbN3yIR>2Cc<ru8G4){kUbKaz<b`87v)P(8@eexrUv{UP-b_4#T(^#$r->W`>L
zX!E1$QRJ{tEu{XKdW`zx>T&9e=;H@iPc+baqJh>E4YZ!9tMx=(ttaYgJyDkRL|N7o
zWm!*@Wj#@r^+Z|L6P<)7DncV`)mmi!GQaxHQN{H7z0^9jPMmD}{$6UmT2I|X0KL>k
zJlDxOTW5<dx~I+&O7oV9(7G3qL5|MVxkBoGx*u!%>;9sb9-#BsW}qG@y6ZvuWa@+U
zV74EkhmeChMV}(N>Y@C~JV&2u-z+#ypT;()Yu<*iKC!>`i36-p%(Fgm06y_Nj(<L$
zu^XQ8du)H9zL0m1FVYutmP_;{qPM<O(-Z5<^kr;wIo`7i-t!8!9E%Ut_|Wm3eS)4K
zLVBW}NE@!ySCTWIq$i0!dNLliA0Bp!7@()>sUlZjt*_>n&(nC0lBcKZ>0*$cp<#}m
zsb`7|yznfR->7fo83Qp5V`3V{H}gyR9DR$vg|)Zp+r(h}@*Rxt)OXU7IeL!hukY4(
zbH=%PF0CT&p`G|^j{JarfM+xF^gQ+@`k|fk^?cf}fM4C`=!bbilcyiik8qqv?VA=0
z^+H<pn0|~Ui}WInxmYh|{DgjjV=mE4IOdc3DaKFRw=tg4&#?V-`Z><KR4?U9iJ}-k
zub=07m-DtpZ@q$NJbAj1w>Em~m3k%h7kGQ4w_c@JQD39Y+Z#o?h~t##63(?jZ(zJh
zZ({t4eueRC`ZdO{>(?2-so!M$mVS%zJNg~QTlH4P+w?ZZ@9K9M@6bDF?M}UucD|?I
zqrOY;qW->qpZadSoBAHThx!Nl1L}X(f2CfkOR0aTKcpVf5$Yf5kErj}d#Oitl={c|
zW9px1A}G_VG2XBDbL|K80j~O>K1ltLK14mP<J1r9!_+_3pHeT=Wz@@cIrW52P(PxN
zP_NJx)GKu*^(tLOohXwrQ6_98%4FQaKP2SnfG1OVA-XW$Ly^3bo)=R5V?s_y^KN>c
z=|M$z(}N0SdQj1o9@M<ek{!wxgXl+li*BJlp*|ub)Yrbzk{ilpIkBnePtQ6~oDv!o
z8pJk4s2qm~mE#bhGA2T$catI%8bME(9@=X31@sl)WH9&bT~iw-rzf}WX66kB(!*v5
z-ZP>XHNR|cKMZ1~pDkwEHkcki1kADl0KdYxKVv$u|4T!<-JKuK{C|cSlG9W^s`E`x
zSlXL?+UGNpS7zF8hVIEpYHY6ETwVJii~SV~vQi6^8A?SYVup6vz0`U$F-Prhr{*{6
zMtWvRKgK#$Pi~Vudq2Ak8(96AX=@HGIg=W9MF-uGc~X=8TBjX0>SQL_^5nUU{L)v_
ze$(Vyvn1KlHtm~hH$z$j$+^zPdGJ)g;2yBmjLkGT<hIs2+wcE}WnEL+_<9!qqboIX
zOAozaYg_5;c;;Nml7S_gl1WtCz9elp$>!v7js2!eHVikV3#B*vrC~JO9!X0vOz4RA
z+k8DM+PqKt>e5rgvLw25&QL4T>&<i^zUD+2?xvB!HFO4(>&)cZjCYf*Fh}f6nr8X`
zyF=P@b>(WzkeqMtwUgJBi8nV_Z8T-%YJ8Z<87BQ)Hua8PEvcDaspGMs9g@fDiiG>X
z3*)bnUcU?8%*+|zZ-(w1*GM@HBW+{v$-zv!TUNEn+w5%y<G+%gE9p_po`SO(Z<*$y
z*)GkweyMe4Ns=!~wwPm>>oZS9y0oGv{?%+}j@J*beNyW&)5rd2)AV`&@zkEQm9Oo&
z+g5LHM~2(|T6vn(jL}6Kl3X=>ZQm=I-!dj8W3H<Gl_guyah#Nmxps5aNv<Tf$g_QP
zCRwldgd8_v%C)q`N-hZO86<mXmY9B}8|%8WH^0RD`CWJ3DklH@o_W6z)9*Fo>+{Wc
z_Wi&3X}-Aa{`*Ib7IPS%EAC-@o_K)q`QjnQ7l?(7$B5rD{+@V>MvxY>W7CsJt3_#B
zn2a5y)fv%`U27y@a&>0h&5kqd*!(tdpg7Iu%`O&KaIZg;d->bM-Qt(2qu-J|g6fx?
zS3^_N(@vNllA1p`HBHZ_w;z*QJ}xz#z<u9j5hwS&T&^JZyi&d(SIHOUYWXLVgO){d
zEm`PdlY^G)$w6<Fo8+J6EAmzO+PB$9_fVVFYv6Ut8|qE<7xk8UTfL*UsI4ljwyEvv
zUA05)RPU)>>V36a?NJ}7zp7I8p^B)F)Ls?+c6;e=>SM|$l)q78lzo%~l!KH*lsM%u
z<x@%-rJRzWR8T4@Rg`LqL#d(Es-u)T$}!4uic9e*KBb=0Kxw2jQJN{AQ9h^qZ^{>x
zzf-=X{I~k=fI+oT0u^W|qb0?pGt6K@^e&XHlx{kM(w&m2Gu3No@l%iiLh_Gr{VEV8
zn-!JES@w~9!j4a|;}==?5$pEL1JvH5c2FLowu9gKmXk+G$O>60UFk_**2@OjD4STj
zoy^QJStYBbBWq->JSusALfn%&hvIpPmY>Pb<>xHTCja|=7(JHk(?GF^a=uthxxnUU
z#&AL7#f4-@ZWQy?Y@RDTP1a(8SVqp__hOy;qxyHj@2R-E4~H1YJsI1&5-5D0v2-aW
z+3{vOKA*87?>3cb7TLLBJnI=vMtB@~vk7cD11q|Qbs6}{KJ=8ic&h#!XAsLYS+z-$
H=d=F@iuu`M

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
index c657988f71..d477e14185 100644
--- a/OsmAnd/res/layout/dash_fav_list.xml
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -3,6 +3,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="horizontal"
 			  android:layout_width="match_parent"
+			  android:background="@color/color_white"
+			  android:layout_marginTop="1dp"
 			  android:layout_height="50dp">
 	<ImageView android:id="@+id/icon"
 			   android:layout_gravity="center_vertical"
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 6bddada503..bf02c9b846 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:background="@drawable/background"
+			android:background="@color/color_white"
 			android:padding="6dp"
 			xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -15,13 +15,15 @@
 					  android:layout_height="wrap_content"
 					  android:background="@drawable/bg_cardui"
 					  android:layout_marginBottom="6dp">
-			<TextView android:text="@string/search_for"
+			<TextView android:id="@+id/search_for"
+					  android:text="@string/search_for"
 					  style="@style/DashboardSubHeader"
+					  android:gravity="center_vertical"
 					  android:layout_height="40dp"
 					  android:layout_width="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:background="@color/group_background"
+						  android:background="@color/dashboard_divider"
 						  android:layout_height="90dp">
 				<Button android:id="@+id/poi"
 						android:text="@string/poi"
@@ -42,7 +44,7 @@
 			</LinearLayout>
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:background="@color/group_background"
+						  android:background="@color/dashboard_divider"
 						  android:layout_height="90dp">
 				<Button android:id="@+id/fav"
 						android:text="@string/my_favorites"
@@ -71,7 +73,8 @@
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
 						  android:layout_height="40dp">
-				<TextView android:text="@string/map_Button"
+				<TextView android:id="@+id/map_text"
+						  android:text="@string/map_Button"
 						  style="@style/DashboardSubHeader"/>
 				<Button android:id="@+id/show_map"
 						android:text="@string/show_map"
@@ -81,26 +84,31 @@
 			<net.osmand.plus.views.OsmAndMapSurfaceView
 					android:id="@+id/MapView"
 					android:layout_width="fill_parent"
-					android:layout_height="160dp"
+					android:layout_height="110dp"
 					android:contentDescription="@string/map_view"
 					android:visibility="gone"/>
 		</LinearLayout>
 
-		<LinearLayout android:id="@+id/favorites"
-					  android:background="@drawable/bg_cardui"
+		<LinearLayout android:background="@drawable/bg_cardui"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content"
 					  android:orientation="vertical">
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
 						  android:layout_height="40dp">
-				<TextView android:text="@string/my_data_Button"
+				<TextView android:id="@+id/fav_text"
+						  android:text="@string/my_data_Button"
 						  style="@style/DashboardSubHeader"/>
 				<Button android:id="@+id/show_all"
 						android:text="@string/show_all"
 						style="@style/DashboardGeneralButton"/>
-			</LinearLayout>
 
+			</LinearLayout>
+			<LinearLayout android:id="@+id/favorites"
+						  android:orientation="vertical"
+						  android:layout_width="fill_parent"
+						  android:layout_height="wrap_content"
+						  android:background="@color/dashboard_divider"/>
 		</LinearLayout>
 
 	</LinearLayout>
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index bdb86e6992..fdcfe1fa3b 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="dashboard_divider">#f0f0f0</color>
 	<color name="dashboard_black">#212121</color>
 	<color name="dashboard_blue">#536DFE</color>
     <color name="gpx_color_point">#cd2c33</color>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index a19dcbac3e..a7a13c98e1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -9,6 +9,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.Spannable;
 import android.text.style.ForegroundColorSpan;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -45,7 +46,16 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		setupMapView();
 		setupButtons();
 		setupFavorites();
+		setupFonts();
+	}
 
+	private void setupFonts() {
+		Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) findViewById(R.id.search_for)).setTypeface(typeface);
+		((TextView) findViewById(R.id.map_text)).setTypeface(typeface);
+		((TextView) findViewById(R.id.fav_text)).setTypeface(typeface);
+		((Button) findViewById(R.id.show_map)).setTypeface(typeface);
+		((Button) findViewById(R.id.show_all)).setTypeface(typeface);
 	}
 
 	private void setupFavorites(){
@@ -64,7 +74,6 @@ public class DashboardActivity extends SherlockFragmentActivity {
 			TextView label = (TextView) view.findViewById(R.id.distance);
 			ImageView icon = (ImageView) view.findViewById(R.id.icon);
 			final FavouritePoint model = points.get(i);
-			view.setTag(model);
 			name.setText(model.getName());
 			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, model.getColor()));
 			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
@@ -82,6 +91,11 @@ public class DashboardActivity extends SherlockFragmentActivity {
 					startActivityForResult(mapIndent, 0);
 				}
 			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+			int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, getResources().getDisplayMetrics());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			lp.setMargins(0, margin, 0, 0);
+			view.setLayoutParams(lp);
 			favorites.addView(view);
 		}
 	}

From f61a7f44ef9acd310a303aa47b09da997a5a2ee6 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 12 Nov 2014 16:58:17 +0200
Subject: [PATCH 014/138] Updated colors

---
 OsmAnd/res/layout/dashboard.xml | 2 +-
 OsmAnd/res/values/colors.xml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index bf02c9b846..c352db3dee 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:background="@color/color_white"
+			android:background="@color/dashboard_background"
 			android:padding="6dp"
 			xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index fdcfe1fa3b..b7c9d1934c 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<color name="dashboard_background">#eaeaea</color>
 	<color name="dashboard_divider">#f0f0f0</color>
 	<color name="dashboard_black">#212121</color>
 	<color name="dashboard_blue">#536DFE</color>

From 7904c139f629bf91ea01a3e4f0118dc0b1059ebc Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 11:19:08 +0200
Subject: [PATCH 015/138] Added search buttons functionality

---
 OsmAnd/res/layout/dashboard.xml               |  8 +--
 .../plus/activities/DashboardActivity.java    | 67 +++++++++++++++++--
 .../activities/search/SearchActivity.java     |  5 +-
 3 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index c352db3dee..090e6d3608 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -2,10 +2,10 @@
 <ScrollView android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
 			android:background="@color/dashboard_background"
-			android:padding="6dp"
 			xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<LinearLayout android:orientation="vertical"
+				  android:padding="6dp"
 				  android:layout_width="match_parent"
 				  android:layout_height="wrap_content">
 
@@ -28,7 +28,6 @@
 				<Button android:id="@+id/poi"
 						android:text="@string/poi"
 						android:drawableTop="@drawable/ic_action_info_light"
-						android:layout_marginRight="1dp"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/address"
 						android:text="@string/address"
@@ -38,7 +37,6 @@
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/coord"
 						android:text="@string/coordinates"
-						android:layout_marginLeft="1dp"
 						android:drawableTop="@drawable/ic_action_marker_light"
 						style="@style/DashboardSearchButton"/>
 			</LinearLayout>
@@ -46,10 +44,9 @@
 						  android:layout_width="fill_parent"
 						  android:background="@color/dashboard_divider"
 						  android:layout_height="90dp">
-				<Button android:id="@+id/fav"
+				<Button android:id="@+id/fav_btn"
 						android:text="@string/my_favorites"
 						android:drawableTop="@drawable/ic_action_fav_light"
-						android:layout_marginRight="1dp"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/history"
 						android:text="@string/history"
@@ -60,7 +57,6 @@
 				<Button android:id="@+id/transport"
 						android:text="@string/rendering_category_transport"
 						android:drawableTop="@drawable/ic_action_bus_light"
-						android:layout_marginLeft="1dp"
 						style="@style/DashboardSearchButton"/>
 			</LinearLayout>
 		</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index a7a13c98e1..e610ac602b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -19,6 +19,7 @@ import com.actionbarsherlock.view.Menu;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.*;
+import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.render.MapVectorLayer;
 import net.osmand.plus.views.MapTextLayer;
@@ -104,8 +105,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		final Activity activity = this;
 		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
 
-		Button showMap = (Button) findViewById(R.id.show_map);
-		showMap.setOnClickListener(new View.OnClickListener() {
+		(findViewById(R.id.show_map)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
@@ -113,8 +113,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 			}
 		});
 
-		Button showFavorites = (Button) findViewById(R.id.show_all);
-		showFavorites.setOnClickListener(new View.OnClickListener() {
+		(findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
@@ -122,6 +121,66 @@ public class DashboardActivity extends SherlockFragmentActivity {
 				activity.startActivity(favorites);
 			}
 		});
+
+		(findViewById(R.id.poi)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.address)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.ADDRESS_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.coord)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.LOCATION_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.fav_btn)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.FAVORITES_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.history)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.transport)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.TRANSPORT_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
 	}
 
 	private void setupMapView() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 3af7ee39c1..cbe8b65169 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -53,8 +53,9 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 	public static final int POI_TAB_INDEX = 0;
 	public static final int ADDRESS_TAB_INDEX = 1;
 	public static final int LOCATION_TAB_INDEX = 2;
-	public static final int HISTORY_TAB_INDEX = 3;
-	public static final int TRANSPORT_TAB_INDEX = 4;
+	public static final int FAVORITES_TAB_INDEX = 3;
+	public static final int HISTORY_TAB_INDEX = 4;
+	public static final int TRANSPORT_TAB_INDEX = 5;
 	
 	protected static final int POSITION_CURRENT_LOCATION = 1;
 	protected static final int POSITION_LAST_MAP_VIEW = 2;

From 11489e6f6fbac870387e988ee8ed4bac1b5c873a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 11:37:20 +0200
Subject: [PATCH 016/138] Added button press color and margin resized to 1dp

---
 OsmAnd/res/drawable/dashboard_button.xml | 7 +++++++
 OsmAnd/res/values/styles.xml             | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 OsmAnd/res/drawable/dashboard_button.xml

diff --git a/OsmAnd/res/drawable/dashboard_button.xml b/OsmAnd/res/drawable/dashboard_button.xml
new file mode 100644
index 0000000000..d0c9084828
--- /dev/null
+++ b/OsmAnd/res/drawable/dashboard_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@color/dashboard_divider" android:state_selected="true"></item>
+	<item android:drawable="@color/dashboard_divider" android:state_pressed="true"></item>
+	<item android:drawable="@color/color_white"></item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 5babdfc70c..845bb0c9bc 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -24,18 +24,18 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">@color/dashboard_blue</item>
-		<item name="android:background">@color/color_white</item>
+		<item name="android:background">@drawable/dashboard_button</item>
 	</style>
 
 	<style name="DashboardSearchButton">
 		<item name="android:paddingTop">10dp</item>
 		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">@color/dashboard_black</item>
-		<item name="android:background">@color/color_white</item>
-		<item name="android:layout_marginTop">2dp</item>
+		<item name="android:background">@drawable/dashboard_button</item>
+		<item name="android:layout_marginTop">1dp</item>
 	</style>
 
 	<style name="ListText">

From 2b2ec538915062a8ee246ebec89c334317eae2bb Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 12:55:53 +0200
Subject: [PATCH 017/138] New icons for Dashboard.

---
 OsmAnd/res/drawable-hdpi/ic_action_bus2.png      | Bin 0 -> 1523 bytes
 OsmAnd/res/drawable-hdpi/ic_action_fav2.png      | Bin 0 -> 1633 bytes
 OsmAnd/res/drawable-hdpi/ic_action_history2.png  | Bin 0 -> 2118 bytes
 OsmAnd/res/drawable-hdpi/ic_action_home2.png     | Bin 0 -> 1373 bytes
 OsmAnd/res/drawable-hdpi/ic_action_info2.png     | Bin 0 -> 1644 bytes
 OsmAnd/res/drawable-hdpi/ic_action_marker2.png   | Bin 0 -> 1706 bytes
 OsmAnd/res/drawable-mdpi/ic_action_bus2.png      | Bin 0 -> 1354 bytes
 OsmAnd/res/drawable-mdpi/ic_action_fav2.png      | Bin 0 -> 1428 bytes
 OsmAnd/res/drawable-mdpi/ic_action_history2.png  | Bin 0 -> 1729 bytes
 OsmAnd/res/drawable-mdpi/ic_action_home2.png     | Bin 0 -> 1255 bytes
 OsmAnd/res/drawable-mdpi/ic_action_info2.png     | Bin 0 -> 1408 bytes
 OsmAnd/res/drawable-mdpi/ic_action_marker2.png   | Bin 0 -> 1492 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_bus2.png     | Bin 0 -> 1718 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_fav2.png     | Bin 0 -> 1916 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_history2.png | Bin 0 -> 2500 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_home2.png    | Bin 0 -> 1421 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_info2.png    | Bin 0 -> 1873 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_marker2.png  | Bin 0 -> 1968 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png    | Bin 0 -> 1997 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png    | Bin 0 -> 2439 bytes
 .../res/drawable-xxhdpi/ic_action_history2.png   | Bin 0 -> 3353 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_home2.png   | Bin 0 -> 1784 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_info2.png   | Bin 0 -> 2345 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png | Bin 0 -> 2527 bytes
 24 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bus2.png b/OsmAnd/res/drawable-hdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9192a0f0e535c115fd43e4afec72e5f0f3261e80
GIT binary patch
literal 1523
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$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!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy
z7U!21B?IFlO&O*c7<TwA0x1N##>&4a6BsFpIWGChrManjC7v#}N<bOCl*|+>Gb0n@
zH1otHU6V9muqCFL0Ex6zV_j2&v_un2GXpcDBx9I4*z_A1SU4G28XA~685tQGx|%o{
zI=WdJyP7(gnY*|cnOeZ~dgc|EB<3Zj!tBlj+6~cb;D%SPm2**QVo82cNPd0}EENP~
z<d@_ZXXF<sI6H%5T|px}GcP5-yjT+yO%PwZq!wkCrKY$Q<>xAZ!`UhmiyO?1O_D4v
zOiXoC42(^6lT1ufbS;vTQ+16EQ&W=7Et1nL&C`^i`cudaKYgI1^g)RQDe=IBfGHBh
zgl7dH2cDTy^ME<12$)sOnb&qRFfa*wx;TbZ+<G(9-s7-?Nc;NG!i~-{cU%_!NMHF#
zk8i2fv?$ptYn{TU^Ti%<)G1lnym)o9_sX@4o4dQaGX$@^da`O!2dlXEU)jBiygOqq
z$-M3S{y^FH#NO|!s?&FSFSwZ_RJ<l{>-*?M@@JYX4LFY-;E-TrlSq0lIju}SCpvxq
z{e#>UZ2b?ULJsn;FZif%K~1sCZUV#W1kRR@?*=}%1J7B;Kj4vRHp=)giIw%}qXlmI
zB5O)C-k3S9ahrIxr(9_+yQqNL-F}1BbH6LiWsJP^`-GAB!Y>vl1WT2U&yiVrIUzvt
zrQ@?F8nVi-Tzynz!vd^yCYgy$F<X;wVa}hv;PfP4_2mjbn-?zKx@Fq6OHonY*_qpg
zqjzs?*moJo`R*}m-LEqZjN8_Ftf<dA897bUce3h1-ORPyFTORh_^#-4TTRDua^8`<
zUhi*|RF~L4cD6cva;L8Mu49(}9yrgs{>^jR7m?>bw(w`h-R6wEwA;+MXjl9P#n=Z=
z?!0#Sb^Dn_ZGxA=p}4<--wwFcdbmgO6`vDY{q#kO`L`WRpJhI_Jkc}vlexCgw@`W4
z<=<TU{P|ojebKiL^qBGOxw}&4t?*?BmNFgsp3obyZ~up?e*X<C8on@9e7*Gas_2Be
z&&I_Yxg)h#&P#XwpJk(4eD21FC})+k(i)+vUiT|ydpehxd%nKC_2;^n2Hws~nP$_r
h#d&mHe-Pfl$nf!8{9(?0EgwO}u&1k^%Q~loCIJ6!G;II?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav2.png b/OsmAnd/res/drawable-hdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e3f139715a7ef57d530feb98d4e973b5095fdd
GIT binary patch
literal 1633
zcmbVMeNfY87_T~XqPWu=_yrn+sJk<5nxr3z6h<jXg(5<QItL?7(-NRfZ38X!1H`Fg
zLq!}qosM}<Cpw%|Hxxl`b2oJ|R8YpDB8bSUyF&)&U^ls?2yTCP`(wGw`@YYc=l6X4
zp65wXLi}<+-#NYlfxu54qe|p=$osxNkza{94-W9#Y%WU2C9y`%LE30Rgn`x5fZ9x&
z=tP<{<gL3(hYAD}av80T(`n)eiZu&Kua3}Zw(@9!AT-=*C8;c$1N5|su_(aa3-utt
z7!+WNL<4KAk#q(V<Fe67u6Qlw%A#-s7#;?MItku@ndV5qY0kFT38w-au}ko0@3ja7
zMpU>g1^6N;ohAW@WNkDc5lSHn7Gr=67m6iP87^B2AiOMs<st-zV4RSk1dITq56FA7
z8H_}tDtgoxFDbwbj<XUXk;CB-I#3~NGl|4Fj*DPKgdh;F0on5`9O;BC_TVuKD%wuj
z7%RuH7Qkzf)U!F90^}ook%HN((Y!Qlv5ykPQzmkfR*_f;i_B(kUL)FeE|LBxj8|&g
zwRu)rlt|mz92>>g!x%gU=DGWCM_xrf8e*l5;fq3Mt5_<>Oj|g$N&)g;ga*byND&M*
z%1Awg8F|`B1I8~#8igdVk;HH*EJgI_n4MSQVHlN5RhUewL=dq!3R8+BqH#1zqLj*1
zDnue5!>TQIj<itpm~V#nJ&Kk7Czgn`(Im&(v@DxF)&&U}EXUe2SSt`2IZ}0CNeW{z
zunzlM-ZH(&T1DHKT-p$AW6i(_&jj;|7-T4>$K{v=GQg+=(qotbl2a57p<>!V$>fv~
zml?rPyy5@yC*p$=d7I^5%`<kzccl0Dauj&s<uK6}eu8ZLsL*8}^D{esvsx9Qb++Bw
zUl$t~5xA`mt&&goJAM-Zm4)-Giawh;z7#CmI%fvl`oV`qeM?IVhTq8C9XS_*zH!Go
ze!iEJoO!rz=yc5CjLv&Q(`vtWuj^{S!yUOD<TJ|hXq_?lVsY8E?i0tiPGXz&P0Z6&
zu<Kljb(zi>INP)9g#Ya2N@Cn1XXS&oB{BH|zuM$J-J4&SHvUnbx^I(@Ys2-Lp}T85
zYcBO1j;${2EN}#G=sh?v)j10*>Z?m?lB7T0izUVN6c3z^?yq)#Di2ne@I&V~Q4Dh|
zDE-eHN5dz7S>Jc^+4fl(;EvCIu>Rqyo|>ZPXB$s9sGrUY+!Fp!HrRcBcyfGb@3l>y
zJow?Bih#7szwDm2<80LZ`PD~iE>D#Eq<*!UA)6C4UkhE9B_0&^MRxYOk%7>U)*pD=
zyz62?Ddi4v9rX-d|Fvp-`)2#{_pf`-*zS~6`=#|i@k0;Zpw>DLHf~ucpQ;`#>F&`i
z-WS}MetvyGW7XXwD@;E;S=3guxDz^bssi2do^|5dfPgeTKJ(j_d6}(4KWQ>=y0drR
zsbXs`ReA~;|3KZ|_6b>~Cu?0#8{FLDe*Zo3zQ1*JHKfE5Ap_H=sa6poA(bud8<kDZ
z$IUHW7JITTRT)E&Zb$JHNoUC5cdf4ay(PkenH_#zg^zmEwk@b^nbI6rea&>Cw!B66
z_*iyq^=hATprXPN6iUB~Y{(DN4zJ8!G3j=pTGM`OhX3u{qfPneO{nM0a9Fu9?8oPA
z+INBuWV<WSZAZ4`b62fFXFPauRdVyLPlm!~z19^v&OLqS{`)|GN;lS8lDvK4ln(rg
quSU4$QT>(Qhv({7{dIq^OfW&v3>7XgJgc;LfBNdEc-1Lodg0$77<D87

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_history2.png b/OsmAnd/res/drawable-hdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a96c2de4257ae349939841dbc73798fdb6adc7
GIT binary patch
literal 2118
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
TZv1S7_0KL8MDuIIw&wl^!{${O

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_home2.png b/OsmAnd/res/drawable-hdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdbbd32c3da20e21dd236fd97463c294cf5baf69
GIT binary patch
literal 1373
zcmbVMeN5bB7_Wl>*)lTYM+7(06^FQaZSQ(_y>=Yqpm*aI4%rO^w=n6o??HiUkG60J
z%Ce1pp=Jp&GDR1VOv8*{#1AqY1NMi&n87eJ62L^zg%Cf$Oheq3>3hJTe~|rQ)4re2
z?|FXDSDOp+_io;pyb(c=&F);z3ui;*ONfIbn>^bFrzG83q90KFdWcs6;t&-dK-~ep
z9C!gQ*4K=H3<Qa(lL|}p5>Fm0C;^<0$l&2X5TX$zV^2893spczeV|;D?byOs{TM2V
zcC6UqAw9tyP$A_usNg_DexcA%B`_kkClk#Gvrs_*=sX$@RLdG0wqwhBS-6fI6BxQI
zqF33m6;dUh0yIZa0cydm27xr1QJTSx7Awur&!Q%{CrBG%A`K+NS}2w@p{oxDt*N4)
z^>VINTX1K`Ds(-_5=1Bz!b23UsO5x_VHkom5hjxXN*J_yS?9wBSxb#-;D9EmQc#x^
z8I5S<eM+rv#~{-c7Xm?#XHBuJtp*B)j0p2V!ibYZAQ16uSz6P*;9nZ+N^6DnK|pwc
zrqrqe%!fZU3Wl+Ju%U<`WWzqEN-!yWHKz!*0U+yc&W^zwT$DuCYBE!Pn)eyZei$}h
zG{eCUD1(Lc^Jd0MT1`GGs%JgC%jL4=kPgP0Z892-PII==;bJJKCEH4KoXKK~V%@T)
z^RfV<wk2qL6>EDSmd#NCuPbVyqEtt#prAt06|F)EqB%LsSx3{0C0SHL+B1<ft$57=
zRjLD`OH~5sa-3Od9S$^Q_AxfI#UPTD#o#lWMT1QcfPpdsQJ`&tpP~KODqj4*@gpE9
zB2p~>DW2#NtjNf6trg&At(kxfJ4l7C(lUSaTLgKi(akvu!;`<f_07Hw{G+GNJ6uz5
z_U>xA32s@_x!)7TErYeYleopS*yfJX(T=W7XF5xr-)AjReOIUa!>(WNK52_j0bei7
zInJJ@+7E9Xy7b}6_R+F4pI;n4-O~C_X6(cdTVDn<Z_7<|@aoc+KaV#q#$LOO-|k)b
z;EyM!k7dsuIkq%}yI(3x#P64k&CO|Ndv<O+dWd|X=H7`PV-Af^U7r|iyB*hjnNBN>
z`K05snR|(I6M1fW;Az|a^2%*B=TFJ=k5?(B`?q&#eXaQXmW-xXW+xBN^uAj;pD^9j
z`F>sJ@SmxVjlbH)#+-|5+tq&e`grA~c5jn1@Lli``qq`f-tira38z|n$F?sKAMNZL
zO`iN>+8Ubgem$)b$;`UZa-@Ic;FbQoJFi)^vF`XcPLA!idG;+0Z0cg~oG5zl#f7~M
zu_@-8Wkuc2vHdAT@lQRU)~C;oJbXM?QGesH_@cjEPuaPH7o5@e221@l^!$Z$Lp?|g
YLL|}Gc5Jwq75U-0o%!6y*=5K70pxV@p#T5?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_info2.png b/OsmAnd/res/drawable-hdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3cbd96b90c6e67a2ea29c11f864e3589f05b7c8
GIT binary patch
literal 1644
zcmbVMc~BE)6pt6BsCb}7@n9RQQX$#RO;%IQDJeNPqQJCbH@h2HLU!Y3B?0YF(ouoR
zl!{gXtxhXmodWidDM-CWDOLf|X&sA<D5XVl01p%#OE*Yt|8V@HJG0;Sy>H*|z2CdG
zFy6FkYEW1Zhr^kwkJTiyJJ0t92Cyp}cB`D-<}%t8CW*2!ZiL1;N{q7NfZl<m<B2$e
z<*aYQmvcB1vI$EHlVUW$DCOWIJ{`Wt;bhSq&hix=CxY5>2C(Ak1gYTm)t}@71g797
zON@}wsm3#i*jyS<$~9TgTstbqxGUZPmV02<fCFa`z~jgwU9d;N9kmOyXWuo*1x8gE
zyMp_iREjYkP*XGxNcd773JJu3OwJcbq%yfI8W6HF2*rRxhzH4Gi3o;-z}UlOz0sHr
zPSohee6f;(o53(n7zEvJH{UJdQ*=5gkjv#DBm{**9;?A~<&X^G;gPNgzXc8MLTSRu
z5EKdcEFxBF1Eb)wOrM9~a2ky-43n<0M6oFYJ%|$&@FCFQ@WnN%?P3z~e`&l_+hxgd
z;$R}~qBhVdTMt`=AI#?N)sB3MEF0KN6KqkCEDeQjaNs1P*C@E`7d}Q{uv91(*<^^7
zC$_O^LohMB*l-a~0@)C;Tnb5rR*~P%%kVm#E=CP0B~q18AP{K9DuGfb7ilFbsZ660
zN@Dz2J?UZ)62<+#3D)-*R{TmVtfp~<p=b+5W%;`xK7(Q?R|e$-)aucy1ChxDiBWFX
z+rBbAk6MG%L^h7;XvzVM<{2hl!a*hyTjeog2@iur5}s8o#&|I(it|JQ97AO>s7)@j
zamVo3|IHuBk^+6r@}K7MU$GtOJH8kNR(LT?ILS^B&5lau_>vk9XZ$w3MrrX}zgpH1
zH(xnt>z~0ctM|*w;_yXEQ``^Js|SK6-}}BKHrfE}#luc&kF}1hoH<K7y=fIXJ-S&J
z1v<PF<t=$D3k!0KhBpo<*0$Vec((iZik!}Tl*;Z#vTf<v9r1mw#r<;=TE~?SxfggQ
zEj^Xz3<y5Gu76(E1F9wA*1%6;P+-6*dj&n)Ajy~z{$zMuN<iGrpB=Z6U4Ph5hxSi1
zbk8_GxsEEjJ9NRks_x-r=**{&A_@ZKGdep)Cg}G5dRJ4ou-7{`esNHUrB7U&)RzpO
zFFmw+VhFE2ZEJE5zh=@=O^x!N!%Nn-t?&QtqqA?W+u;rG?TjtA-Io=XUTRtNj2yJR
zUNP%^@JvZf(Yu3%*YtUxLp`d+PYTxz3U?lCgrcu*n{oT=)<{J_+R~+K&qw_gLR^nK
z5t`Y!Y;aS_Ld#7@C+2$G6sZ7?-G46x)8?&#@1V7BFs<0OE#ItJusLF3x3S1{S=BbR
zTrb<v|69Suz*K`NH6c#1wkp-U%O3UN(Xxj}j<*q)4qRE(P+j)$9sLqXscAc-67@{f
zUpaC)fAN{ET@^RVt1`F^neArK8+C4T^=WUyaO}q&X=uxm@Z-!WPu1c6NpoaR!_4`q
z+RF56eP!Zv^RFfK&iiarcX23PDcV16Ph{KKCB3D`N}GdAJKDY4f+-sh&?7bQoyyhU
z9x4cVuzj;J*<P=Hv~GXM{MVul_b%uEy=8U&rk+n0tlt+tB{OMf*I?FTwP~hSeDL~^
zBK2@5-TbKW;`y4;p56oddy~HEdTXTUuKm_9xVODaI;5|UzVNhR_TwgVb-lWd8h@g5
zIFTfS^%sg8&!Oa=<^<Yxn;6(V&m6e#$AM+z0ywpX{K~YFU%v4D|Mgmvrb_jJ_aEym
BcS`^O

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker2.png b/OsmAnd/res/drawable-hdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ec00b2b0288c6dc907f9fb68988ea8ec79938f
GIT binary patch
literal 1706
zcmbVNYfuwc6i&-X5v0;uK(Xp}bx;PA-DLA1DUU)DFq$BbSm=Q0W_JS%BpZ^&1PIE=
zLm4Us#Ss)=Em9SWRz`(Z5gip}7(mh%OGO2WNOb^}8L1EG2Eq1+<B#sl-h0p8^PTgZ
z*KA=#c$llRmotmSa#gI7MKL?u{yI4_tHi5sFS9M6<*{@$rKQcNkzfVml!gElIy8}p
zB2YXd?FQk`VmWLg)v<J}N-4o89S61Ra4b3lgJ!Y(gDeIVOCe}LLnM;=0C42ziy%Pa
z0bq<k1*;5FB8gm;X(XaE!_`=33MR(Epg_RiB4G^Z2pR<}x>UVMVhI4J>`Iuk{Tc#+
zDHS>;0DMg<RuutADI)<0I6^iCbNPTs%;5@zBC%*Cz++?x_JepZ8x~6hhy>;V(+|ja
zGvZoFlq_`G7b69LNi=PcK#<vN=9m!<WlV&)VzC&4c@U4sW;EEQ3_Xon*m~2_84EJP
zgc(T#O;UQmZV}Z`>2v_dFnt|@&Y)7gF|0RDCyGfKWI+uOmjgpOojtB8Z4(_u{7d7l
z+9q{|fq<e26P0enn0jcJ&VZTRz1xvpkzpfQYb2SXps6wnOV<&4S|JMnnJ*li#3e!=
zAJK|X4V$lJ(uU%EX3-J|TL5cOzE}tgc^YKK&fD-XjQ9y<d_)++<8irieh4=>RE)?4
zAwrQ%#uNC>U=?~3jp{LC#y83Mp2qUtiIqr=1WHpzHASV)bU{QCMN_6E$^b~EQ&k66
z#E^QNGMjwtWqKX8j4+a$2t3qC>42#`OUSoy5Fvbx*pDw@<1iv%YxsPe?T29m8{rZ-
zCi26yVv!b{#^e7te-J|ovNy|rnrG&U=}7zW%_uO!n_(jK%mf*kQ9%&gmBo6$MIj4T
zTe@2-RIA)0KWQGxl4<U>1-ixOle#&FfjG~q4)2e^JP-Gq-{vpNF6;%Rt@8XLp6#lO
zs5iU_h#9z+IseS{4tZ%wL5*dub-Qh{Bg1WO;{Dqv$%#?vo!iLZ%Y%sN{+$=RV7H@i
zdc5nBng}Gxp*eWoEr;YL>Xc(+j(MY_wQQO7F+5LlR$Aff(zbQ6@WTG&@>hoz%{evn
z89e)}(q-S#S*^M8dA&z#cJ@Dw+sVtG-CE&sV!Y2(*<LdgI67bLBRbw^&2Cg~aD3JB
z&2#a^Xj|ANhk=-~$?d+jU(f?N`wyt1Cn6PLyUK@o58SGg?`Qs2eexLoE0(f%ctGkk
zYfqCrqJ972199CuLyL3cyKas7?9kZm!4~JuIUi3h8tAuqHFT#c&p8*Z%ngrlS^$lX
zpN8*p7ur;p!DnA^y{oUMb;ez}HKs>PyNdghb;>mxx`Oi4YP?RGG26q-;ETMpto*cx
z!s@O(dAL)5xO4yJ-^&x+JR08HboENdcskm6e#cM-TI!fksNVK<%u`D)d^c;Mjp8Rb
zegAh$<p=536U9N$XuY~F4XIy|?O1duGWHQ`{<+F5>#T#R%asjz%a!fxTc3D0X+sK*
zwIQC>WGAw_WXPv>5N{Ba<)GaQyy%9|Dvz<wx}l2tiPY0xBkKx254k+~WYLm1r;HoB
zbT_$y<J~8Q+*|jhulw_S%buZ;d$pLYY-HbBTNS!_%}*WRV05F3%5nK{aSOYxt~8JA
zj2pe)Ip#DNsi^SoiP~ZwSIGu@`0UCv*1y^xPZSidwkGs$Dd#*J{=-p+P|^H{haBdl
ztn^qh+^7rotafO;?aNK`{nWGS5}gtB9nv?!c|3l+NK>oa^&srvaLJGQ#W5tZe)t0B
z-h6GmesvAmxqHi(wz`*J9qHlsTuf~8?La%4vE7Bwb^bp*U)sdNt;O3)&?ArRe-DK`
KTvi*haqB;ox}ARj

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bus2.png b/OsmAnd/res/drawable-mdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..04e7e890709a6b282008083d7a5e96d4c020a42c
GIT binary patch
literal 1354
zcmbVMZ%i9y7{3k%4P&-Qq8m%_a$BNkulJ|dKX+1SX+f$MSRvBwQ?GY#=>d0F?haa*
zo7<uRGh&v-B?OX<xn$uJnK4;RHg#KC!DZ;w%@F*sS(TXhmoJ773-}f&`ho0&m)!fl
z&wJ1Bd4A8od$*(QmAw@;6$pat4YdX%aIY=A<}$dxOwN7)xBW(Q)aX<bMw-_E;uqC8
zKtnR$10sMIhX=j@^$1cjBy~lNX!vzbP-Qz`(6MLa6htFPePbrY3w^*q<Df@Uyx5=D
zKf_Q-^kUu4Fd0q-KvHTQ(Lm=&TbD4>C$J*c*nrk&IA}ly29IXsensapUTniI2hW9T
z0z)@cj6N^6Nh%udKm)1<P^aC63nay$Zq`mYU2fKGLun`zq=%qMoMbttgCl8l>%pKm
zO-yi+V9S;-D0#7@VWc>MNT<{Gw8O4yJp{$FEJ4x)P2*4l*M}8@&)|xFuxKF&bU~9+
zhNLQJ!6F}52MsR<nQn$4r^4ZF!-~F@D3~%L!>0(!P7<<Qh-*VzHzMF)8arz1UBf9r
zM1ZaiY67fB;$RUBbN6IN1x3h)Yu6-L6uv*G3WG9Gj8M>v!7p}E5;+&mI1+9?jx!0E
zHeO`lk^m0eNhWxPb&)PQ?kL*X2~P$B0l$N0Tun4hQO%6s6L2*<-5#flCH+loQxO|d
zbc0s}Q1mT9-&<J66R})C1H7SXU8>q&?1GM@YN&crO`(CnM%B?5x+O(a(|TQ@Oq)>$
zfhG+Bu|-p5bR*B4v;zmXgNd^q#)*rh!->ZkM#MdW0B{EdM8WM560AFcZQ;fLn?C}Q
zA_~p&pXMoE!Hz5(w?_dA+rtDDI6)d5m9-;pEg*=gHx%@DWtQTP*Vh|M%y0kXPac{s
z&9?daE3+^9Y`e3!eRs>Ur<1)8OI8T<#GdR|Cs*y(i>CZ>-<y^rKTL+kW0UWgsy({~
zs;%FXR!i)us`5CF4w>@C%p!%(mgl|mH52zLXUg)Q96I`{Ici$5qhHPeYW_U#yF2eY
zj?nrp>#_JpAD=z-_cSt<yJB2jES<{THm*j^pT}-hJ-q*3&-jfyS<)A~pFezN^kUAI
zUB3SH^p*2D%c(`v(h}mVyl^hI+&NSG#?1cq(1)JdG0UzM6>UI%uHN(XrI9t?LMxif
zUoKr;y*a?FQ4!lU?B-m#&HUHO(HqE^eCfeu@B8hx3Cn|$Z~8`GBeaGSyR-3*Ynb&p
z%yH|E@5g-yGNTJ~Fa2`%%y*A^f6IM)FVYbpo}J3ApUhNUSgxzvcVNQ&yIlF{xnIjo
z4b&rd&HD4yGij{uaYc4PjE?u0js4NmjaXwyoyB)7cX+b!w?snCZNb^5*y(=&n+VWe

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav2.png b/OsmAnd/res/drawable-mdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f6253bf37c67d41a5f41e35590dac62429b8b5
GIT binary patch
literal 1428
zcmbVMZBP_t9A7l$rSU_isbsphIB28$a(8<#yLSiOaR*#_2OJ2Ly|}mg9NfU}p1X^;
zGG&Q6!I(&IU=}m#P|grBF&L3%@Bt|rXT-3?$ef&Vrb2L<F>EZS=a92LIDTkn_IaNF
zv%lZ}{l87c!Gc8@nHdOzEb<q6LvUY}c+(cb)j@S1h1&|vSE-fC5iQOs0C5X)7@&TU
zs{$dw2|Kop04IXX-ySWi)G7m;SY8$hE`cF*F$UQP;>^`!9A5)8Gz_Yuk_($YIe?*2
z!G%>=0#qQD2dblm^$IAh50>%uH9R9=xjCp)XQ2WSXdJ4GwUWx}E^JmW3(tvb5<_Pp
zT8#_4<5Xp!7|oLvfLaJE&QnGjwK0UzVzn{04X6pqBxNT}6izX$#mrJBbnd~RHART9
zA#eViEhxFLYE6r=BpHv#iMW}Nl`7K6FbqkVNRtVN2wdGEX`GHrYF1K%7pS}vjcHL?
zLK7Ofuw19PFzD%>5X4v@a96RU&Ls+_jMTXpX(T986ccgHqE#&f{&nM?Xtiud43Ht9
z%5@44>k-LHl40)dZzutT-mpbV6c&Z6^~!vm2qew#bz$%eAw&h%YNE{%8yCju2uvF%
z&~S+WGj5?G9L-oMt0`<w>bV!6%Cq`tizVOcF`0};AMLio3yaNeu`-m~!+4ThzocrM
z#Dk>mD6~Dt_1%}t<|%;FWTi}&Ym;42TrF#|S}n)Wyu8_}qw6Z7k|4*`#}j3`6SWs8
z(d|IUS7Z^L%`+RlhYvP09cJvb1s5o@1rO7-fZKT<;ASHbc$=M%Ft!Lb#~1!@{z&K)
znP`^(G*9vhc4XpscNCy-cbI?#CrE*#V(81gfFLQy{a$yO{@wZ3Q{)5g<*!`x?YX^j
zZ`!d^gW)OST>9Rz#&tz>zxRV99`&W&XIrPb8N9t=xMIZD@J4Yg-M|b~>};zgdgCX1
zSBGC;J2N$P#%Xhyr@KmswnuLtrGsS6zSLbQ!H<Vl-PR5bJbk6{eL5pjNN?JfalGZz
zkA}XEoKsF69y`#iuN=ZJEH2t(2(F*P7vRn6Q0FJ34|j}9Iax0}(%An)Mt7H1k>2r*
z$I)n%vKGhBU+n#Ta^d&8tFC+35Df*x1C9F9u3K+5IQ$=COnu<F8w(GnUN*eD=y^>n
zzpAHhYM4RZleNimvfH`*=Vxv{yJ~#qwM(5j^RxT^D5*c4bM`m!*p?P#ZBF5Vix=9*
zUi@p`@ZgcuUs7)Ab?-cpGq_=<eIg`G6kR&A*}q2G_-a#u17tft`}H9*JhofEd3k?j
z@X+U(e{NqrX)J$h=V(_}>-5#^(|>P_99eR}-$X9C(Q&P%xxc>o$*p^{da{=_rQYoN
zN!xE<TID9cyuPQTon7(m2>W)GqsQITabnHEc?(h>>>NDd@3UNN<F_pvzmle8u4ljK
hn>f5>^N$5Dry!%dLXQc-uL6nxq~90xc6+uq`~!#)|Cj&(

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_history2.png b/OsmAnd/res/drawable-mdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c856a653d76c1c3c0c84bd935aacdc4fd4c7c54
GIT binary patch
literal 1729
zcmbVNX;2eq7!Id`AjK0c>KaBw$+5W)i5Lh+s=)w3h!loRvVm2SU6O?a&{{dF4ppoc
zQ2|j3URcBt@S*}<hzE=n6#<Ldf{s)Hhlygfc7tI1!|_LVX20)yzkQzferLDH!$Mr0
zXFHQfBv)yuB!bxITHlF|#JU8mDkHX8cu));iE42ZWPnLx4XT0xsSZknBVb6Ap3(yQ
zkw|uFh$04$k*yG_Q5_AkVrXU^MzBdFKYud@sn^0dpn?+-y@)(;u7M078WA~~BLihv
zAe@ARW*Feej4*{dW35`CA^R@{{LDf^feywYz^qHw8-->Oc~q~EI9spjWMCA6uN9F$
zI29w41A(Xk1~@b>RSh!O08c<;aJW1Hj{-0WnGW*lOppo+gdCO-WCCLknXqQiXoV4y
z;4xc-BqAr_I3}diO(qk~#G;{wL^?wt5YRy;oynvU2&yq%k3(jv-sm;1K>{1q1_Z+q
zR1a7+LMk*B7m*21KZKyeWU`Nn^~SM85h<gaA&kzTfpneD8rLY=h)2Nxy75W0QIU?p
z^a$99rW({lJ+xlqWFmK;H)I78-UwG35TYnhvIJG9>R>%Cm59j17n%mq2)Rr)OUr{)
zRJN8#8>C?qixy^4IiMC|3%DScsbY=m`4k@v<OZ=hToyNg$z(8s*kV3$!Qt^aTmdK!
z5Cn{KrFtU{>DBPKZG^Br#$|q%D-1Ni5RMuYD4IOp1@a^mM~z7+1_TC<Rvqw(M)Vrg
zWL#t|(}$=fumMSfHNgf{2aM)fh<w5a9*eCK@Yx)y24r!lDmGg~<*U^&mBoNHY93#$
z74Wp=F}~*i=8sM|MYlG~f0}3fis(q|@#82E!pC8P^~3}jh*23D*t~^AvVA0#h!y6}
zONE(9TT?umpL-O=DsNXKCk{L<*BzACsEpBp+F;47YvkN1;R|&YZ!cP!cP;OWxEAMr
z>wb5g!MCt?SFan=-m<`}YiRwm%$LI%=#%yNmi9xhUY&okenU@B?}(_)xTEY=((!%O
ze=LZq%8hJH1}9C+^4vc8{Km<Ho;gj*!7Je%xetMA2SxbRB)b+L(5?O3{sgzviFc4j
zF-|i(Sype}tDNFvV_If60bbnQRhIqyA=BgFzS@l?39~%{+?BOoS9=!QG_;fMX3f~H
z^ImsBvW|DSuUR$FF=VcG>vk+1iJfVl6t=M<fx<uXW(T^rY2r`VEdJ3;g((|U-X~iV
zoArJt<|wfJ{;yYP*EtOHUJN<E2=P7~#VV-qb#QlE80>gfPJL%D{LR0$cDA1_Qon(;
zDywJdwtm;@_y?%HgEqdTseh%swX!5Aj`H3e3zy-A4^q~oPPKnrJ!gNBPWd;*7ZT8#
z#ijO64J6r`yA^3RlKPj$7D;KExHhktT$s~XnSj~mphwd{<(!iDy3RzVozt_LtCyGb
zq&^<<?Y`VkJ$TWx$TZ=wCA#6l&c^k13oeKp=I4F?V`b;Ox6aGUi>^_Iorcwx9SY&E
zgD<At`DTWE(XqIovX+$1*Z<no<RNcfHnjI05?kK+=-W51Yu-Rbo9>5r<iR7pt_N_>
z-7R%4f7Zu8%ibUP{GLnx_4nI<_$qd*bK5-)r)Dq{3w<z;<&EaoIa1`lUow|ZnP1CO
zx)_nAlDsnmjGbA(SM9-arb{X5Gr`mO7GQM~-ck7Kc%$~*;*+_}Uc0Vjb)Wi~Hubyq
zn8IaVp}i;bkHs|b3r=mN*bAd{zm#@iq#HIDm4{p%(h~~IzGmCL%Jb!46t{X=PC3Tc
zAL-H$r{B0P&d;QT;MvNXebdg&&EAp_S3F(1ds~z~%IECJB(H6&+MX(Ic*cbuZ%bfw
lG^rZ)w3OXEa@*h5g=E-Ql>QVdu(AGBq(Nbls(^&7e*hMfoyh<I

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_home2.png b/OsmAnd/res/drawable-mdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..04f357959fc7ffa275cae6db833e02bc78f715a7
GIT binary patch
literal 1255
zcmbVMTWs4@7<Q9TN<|?;K(#5OXO1*FZH_Oolh{q#=GG>3DOnb20U?Ah$Bo<iQrlh9
z3IUrYv<V(61ggqYxAL&P6qv-*q%mnL8k70}DjGsugb+N8hbhk>jpH;aJXCwYlFvE+
z@&En*_uqW6JUuzkf3P3Juz_MBS3&y=-rLuU))8v+GTIKf`I>vmRNaPXLoBVB5(GtE
zoPiZ6DoYDr!z70J&uG<}TPvLqWK)lbo=&8xTL_I|$+4y-%5%^K5}eVD6#n4)mpIUr
z6n>g3Q6(!2>sn#ihNqUNtMc-k%q#fVC`dL1WI%_m2%7r5;RwwX-nJ{Cvv*D6psnK0
zrSM%+wNe>mO&bC(5+h`aW<i{f&|ECe$BzRB$t0B^8H%8Ifr|<h13C|myxEE>RB{s?
zUr0*fb=S27l58{@kw!FP+A}20^E^p0B*PF$gK(A%S8Ni76Yg5bK}WVV%hgN+cos#;
zTy#@7V!9iGZk0-Vh7G5aD3mg?DOw~Qp-5f#;%aL<ZUz2JV_$8jx@1AJ0v&VFmQg*_
za2Jen_h?6+B4Q)FY-^|};(X4O7j<a3#as$UUm}X82r-6@s&P>wSQVvBR9LjAFiLQg
zDzbcxiZN2OYiB<^m1Ss(&g5emhN0;^n@(h7c`lydVmy`3@R=^QXgIED$gt~ML%uuM
z+#|6<)`p^M+Evq>?{-1CZn~yZH!YCOwyO??Piux^Hk_kgnRcVjL0dZml?mI_K|9Za
zwhxDRl$H1d%Ml6{<p_yo6(S+akciSyk>d$j<>M;e!7Kkae<UJBdd>2m=ILIcj`WUu
zqkx3HVS)ylARCR!r{_cOV_47Q#az1D{6YHr;lr_8<JggRdwhPCo+|wOwteVFKU~FH
zV;>MlZdIni>;1RSmT&lilm1rY)!r`>!J+YMANJfG#Xj1&xb^Y)o1qKapWRtY|IS|3
zKlcZR9+UFP*=H}!hOWScQ1C%OO5;2IneV<jDbeBJJ%7sw)bQb#zF%Lye@R_Y=o5~A
zbUP3l_;zGybz{v6+<Qto_g-J{X>Mv|WotcP2QD1CS}X9G?dokvAD^m!vwl9Xw)7-_
zj5++A@2?^eC<LA<kNCvr2Ys!B;E&7MpRj8(7aV-&?)|rhCwg}_KRGb@=Wl1{`pV%O
scZ!1>3(48mm93p)*~!;_c>>(TR=MF{GgB|V;{AGx`RUwd=8bdz09+iC@&Et;

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_info2.png b/OsmAnd/res/drawable-mdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb2e641a74781ca04c23319a50775b814bbf6344
GIT binary patch
literal 1408
zcmbVMeM}o=7{9_s5Jk4gGPh;R*=@2-u6J#(A9u84r7fex)&doXal-ZPZMnhSmAmU&
znA<YuG)5zvZYoohfN@4<4F)9{5io*mI+nQ@-H2gGkeN(3&HM_Q&9^|&Kgj;@l6&9x
zdGGl>&+qxVXZ^mN*;#9|5CqBgl(@>_z9IQ$X27+8NOZz&jq0veE2NMbV`P9hI4KBF
zkHCaMIbgV^#<ReNAnAMfK($)!eVAq?LB}L@ba5d9(FkHIj7J!@9;j##gn7}fz0p6Y
zMS0GytulEDZ^Q}e_>yKBR5benY;!$JaoWP|s4Y%I0|HPPG%hrV3LUp==j_t(oV>=h
z=$wjLZ`aO~s`mO(rz8W^q%&hIp(jxbrPG_t7Rr*38la35R@^{f1Vx*SG+{s&9xe1H
zb0NCiRlMK}N_K6XszzuWkHuoTm{BLmVO&p96iyg$g8_pYn9?MwOdJ!HjVTK*ps+F@
zQF%#3lNOnv6jkk7$aFpgA>#Ee8Wxp>M8TBdaVCQ6bp$R5$++gU6}24vOJhlGCD0TB
zcsWp{sLaB8gf^zYFn4!$lvIRl=tpE87KLeWNo-UAqUv$kweX9M<2l-FAdMjl6U4|6
zOdG?Ia0vk;W+FliNtp?=A!tn5Sqe`$4SGUf<S-W*40^qrbXc8cx5;8PnJL0iL=~m5
z9#K&lkp(H=JoLSQrS6EOoibolNe)O-L#hk>b&@J6by5U%I_Ij6ZmHr$PKqg8lVzHZ
z+682O58#SrNkHfFO!G@{uo%f8WhG4*M;J|5kR&<G%CZ16>H)`EtZay~gtQBI?*HZw
zhotaiv;3!dQdh7elgGtTfWqQ10TE7+3`gbFiT+*$(R6rRjzD~T_?1se)5>z69_<!i
zYRT$zVBeNHa*q6De5(2IS8wNK?*3BOHM8ci!1f)#XB@uPIrLu8f4TD1t@PVxHl2@0
ze?6ab<@188%FIODUNOIBwugLi8TG-vl|yL<{z9^UUbg$Kf_H0!!#9+UdrE81hR+!;
zPhT=ehBp83=c-E0MO$2RQge|x+LJfgX6hYj^lM_M;C+Lv4^$id`RR#+f)_W}e|Bj2
zYDcZNaQW98woQCDb-~ksv>*FeN!Yr-=?T60(COK!PmkQqzrH-&Keg#fMFq7Y+)~pu
zqQ`G#Kk)J&wv$`T?ZV3N#uef3%ii}!nEdIkn&SmNcVu)caObY-jgArPR}L1V`|oSC
zr#0^Cc~sxNx9V@vzb$bh$j;oK`&{?60pIEluw%Tldl1`ys8iE;G;v^k$?<g`UcWx=
z?z`)q+20=DIT^}`HGeTaF!n^wkNr1^k&)if@q_!Kt+&P1q%-riQ)O$9y+C`;Jjo5|
zTQ{HPZ=QHQ<{Pya?EA$kKe#LXQrbFO@0fBfFGpydbPSZz&wNy<$w2yQ{TEzq)A8g#
N(c|{H5=FHw{{Rgi^z#4!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker2.png b/OsmAnd/res/drawable-mdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6789c727ce32d8238f16d8647060d41062b532ce
GIT binary patch
literal 1492
zcmbVMZA=qq96tt@m&{BTO`JMCPnn=x?|OaXI;!>sv`UdT2LY$O-aT#4(q6ecXu%j)
zh%PfD&LFzEjaixUrlNCOHk=X0gqbbibY#9P&J2^`+x!3-I+JZrk-B{_e%K}VJkS5R
z-|zqazqj)9R!>ivn}Q(7blVzhA>0>4-y{WGUnP$pg4;`ScBxz>xa1%s0>s1#PJr5c
zj2jdJhO4PO53&#>zM3yCl}qip23GJXnJ7jX@&zCpL9$kc0u1W~GU^0w-fzV2pFWGB
zJZHp8w06=SumBIgrd9++wRy#Ct(T=aY~>0xD`bEQd_ZQ<kgvio8A3*EQm+A?qt^t6
zPC{g_5qs=ZsXZUH2qHkWN*&IUDh;Zql`5@HPwO*K3d#hTNl+wC(gv;CKvL+`gF$N|
z=Q0#pbEa%T$%uJmIba}&U@)i*s+EH1CR8*{6C_1Y6b=!%RO6SK5bl>2$23@h#EN`C
z<^?|*)yO!7D%prZPalWi3)t;X6#J#AM8T91AtpemlqBKvMdO-8OL8Ij*Nvy5rQ(_Z
zAPRvbREaFChih?+40HEvLs1~~#;{)GVNsY0tH4(IfM2#*jTro*<ao}Yqcm!lo^j$D
z7fc(&Y2e}lYFtaY7!9o>b(B*b)AKYwY0+hCv|6*yOi?OTw#JkRFSPnht&S#5X4)L%
z+WeBt_*oFM%|qK$T+=hT28#$7SrCf_p(54=`5r+QB##h4EtbiuqiH3)pA&*odbCWB
zqqYK(uLfL>DEQFHJRA6@_@Gy7oOGr}i*uw}i#s(M4$ov+fU8x2WA&M=i`KiaDL(gq
z^G86Zh-kC?r+H#mup^_#C!+v`C&L8%aDqfQD!~~;69^JFZnK(-LsyUPJG0JQFsJ{1
zlcF;11RBvT8ol#EQkmvZB+@$?zs18RiQZjhd$0B#-rb&#y?7`UlP)f5ThtQxwC?L&
z<`X-=Z;tPBR1URHgctt2b<j98@@4bbb+)8)L+7TEAI?rx-A0NWbH>BfTed6cK*}FI
zEthW8Pk%JDtueJ^UTNG|&vy?^Z_k{OSdJ<-S&uBRjiO&D3i3v`*W9||o$H-7U$GQ*
z+*-bh?d$HnJA5zxBcNPZBi~Nws(-DsQngz<?D*X2&Y1Y-t3Nl?xx+ZwJ#FR%v$d^Z
z=`|k9yOzEr`DJ8bmG4b-8g=k}wen+X<RBV)xY=XB|KmVWe(Gg7;Oe_$oe5`?pYPbY
zt!r5?9qxUH`K4iPAji?OrSg<zt9sboOfBoRg-yh_bp;){E4l|S{`FgW`zIeNS1ph$
zb8CA}=ER+EY?b>f_AJ?WbYpVsj)BhMYd5a%xUlp@%h;X=&vhyjPMv$u{>XT}sRDoR
z_nsr?O*axV)~3|Ay_@ldaH(befx-N4Cp$QgmQ;ASF2@t@FKtll@0s70mQ@~cuk$CA
zkDqB+e*D+HyCSPcX7?}oyS%KhtD*ji_k)|W_9c>$2SHDwdUo%ew4Xj}YCqP--c(&)
wR^m9|Dv8`#_j=<ieI2s(+~MkD$2P|)kkd1`%ll8>8;JgAZP|I&<7P+QKh?e=Pyhe`

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png b/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..466683aee31797f42e7449e7da2eb8461cc78a92
GIT binary patch
literal 1718
zcmbVNdr;GM97mWaaO&6)PuwI1*+6KMw&^QS5L(b~P%6{`4wW=XOTjiJ4W%%Z15`wG
zw;kuEfOifb!^y<wbb_O>V-9tPC_bi$usOuXpgNom6_)aFyPfAB%l-0u<@@=3-<MLg
zYSA=LKTj7ImubqyibQq|cfM2I*%^KIGtDlunV1wNiPAB-7)`oF5tNn$ltxTXCXyJD
zm)%OT2sf)ilftCL$Duf7<YG=4uFYs>(JWb{&5Yq$Bm-zky}={{2kIL^z(B~rWMMoU
zZ<do8hQ;|bnUt^6;Q3j&lmH_mfN&ei5*SGa18l}sCJSnlfup=AyLVngATTPzWXZrW
zqf+A4fSjU9K*$wwaF~YxVkws=6p5wcP=L>#Ay@+OVGb-sg#r}j1LF_KYNH7qny82!
z*TtS>U<SjOQ3%S-&E@6_xD>62cv7hpg82}i&tWAvmOK-K**GRkzyyPWwBWSC%or#W
z;AF(KR1PBpSxd)UFq-4zUl5xt<AGvB2H7w(#N)z{(dhJRRNBHMlK+_TQfZ4O&rCvz
zq=m|%aW)^ifC(@gyH_i63bNLq3ABMt3bsl?;W<Xq#3&Uqkp03X3<N6TBLbZm({d0U
z8#atU*hxnUI6_#5AyN@6;%fyHJTJq?iuo{tNDxsppU30HAd;9ENfckmlPVBllspQa
zz$#4^1~cL0gl+??dmJlxB^H&_B*sv*hN4zYRDn8!Vkk=nWd`K((X0bO$p#Za<ywNB
zX&UodLDB{*NyO5W5g3g#YIunaVgaI+N)RE3fCWO17C{J(1jk8^fJYLzSc2=MVjVb+
zC;o5zAl4|zSuFo5o{1~ABAwe8t-u~$G!toJJBVgmCFw1%dKVYh%SuI*#&+#~Wm{Iq
zLZ8$6ERJtXZAWo_#@0u`g%yLhl;=H{&GbGMH1}?*FDGc&6<Vr36y35?-BH}P2PoQK
zQr*`QxzJ~Z@3Faq>V06*jp)*wi@KuyDt9P#6~+sXyXA+UiUb2klmaFCp(8wDJzj8U
z<Z-5AQtjk9cE1%XCw)+~Cw(?F%W->FVXytqf~ME%5(;m2&w?6@c@B@&?gM!@PT0RF
zY(9Er%YxL}DIYcY9-JMzq;;2caPra2h><A`lj@pq$2^rjdtId+Q@if?YHifYervC*
z&CA{HrfxTOreAHH9#Q3fFElKPp_dPwP=#PaZhdZ~T4M>@l&1H;vZL>l{wb$5)*?k)
zQA@Y2Q`QiMA8y)tvi{ep;)kWc*=!l?leyk7@Qprg+W`-2h3CMMzc#Mf+gwS54ec7+
zQq{WTN>8Y*)Liz{9@1P}nbouX^0l44sT&VYE&I=K#C>{e?bUKwXfrrA(vo|WX75@z
zuRLX4$PtY`u)47o;fB|gFHe^^x;8!>@qX?ao;<wz_2j7MIhN}^!z&8E%pQ9Ga7o<;
zqWHlZY1W2ZXgyKPJNM|^-Fa);`2OPl`uk9+qvoBFmP3vjvTNCi_;M;Yv{SeJxNk&t
z>tl&;|DoE`i*40Eh)(Sc0gunDVnXA7H<taFlPx>b5%As<d`oPFEvV+>GURCcZn(ld
z#Tq_;>C+I))0qA`bo#vwyS*=FKk?{0?~`4j45(=o#8ugJCrhZ{g3Fno6;HoCXK(XO
zd+BDci(9W=k?8MS@7BeVCH7<UzrV2Lw}hUviRX7ekT3WJ+ojqjT0q7<S@?B*O?cOg
zgm1r-ZQg|RQmK(|e*W%Ukgbz~jE8verLY67BTV2kb@@Po(xxtN+@ED13|+ISv8p(8
zs6#uH*ZH<NFtF#3Gb6$Nm)iYMSN}rGN%vt7*rk4-RjO@Ps+@lkWsFL3AUeJ1Zz|)N
Apa1{>

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..82791f9ac72fcc3ca5a9b4307d9f28f1db737635
GIT binary patch
literal 1916
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
P?*E}$ktna4l~M2yA&~7l

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xhdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b363858797c6d517f997d64c1d8615715235125f
GIT binary patch
literal 2500
zcmbVOXH-*Z8fJh1(xfb?Scnlph4h4w7)nUO8a2oSq_>dVK!!Au06}Sj0|Gimibioz
zR76xpse(vTaS#Wwj39`B3c@ZT#lnD~dr@)shi885J?DPk_kQ<%p0}TKGd$e?X`pMN
ztEQ%Az}P}#fjfEO)zJc1(p<L`+*ZixzH(17Paeyb0%{blI1GR?gzRvD1+cksQMUmQ
zp%KIP@|F8Cx05(xA%eZ2gHQ-1AQ~idR!G>KNI(t^1H$<tN7#5>BMi#tI>LPLOcYZ>
z1tR!cc1Z!xUG83-U6C9j7v}5)B`ZiEfe?_hp$efuBqJ#tVV`+P;CbO134?xCkw-eh
zzBuK}^ng;uQUHoa*uyy}G!9B2BG7ny0+C<`#egyr<$%PX;3y&qk0qfn(60{+v?k^9
zNGzJ$S6iUu2#b)*B_t#=HZ~R!i$#c~;Yc)*NJOGANDKxJYQSZ2A~{<D7s=KwGSC1S
zN6MGT`C<`tfsq|1j+Q&ZKu^DfAe1nf--t!BuZaRvhE%X6NHhY46bcvO`m8OJvw;7)
z@m+11SDXYuvH+PlTFL?I!CSWo26OlKh87e-Z%8|&e6T2N0Zq(_76KwUgXRbWzaY4L
zF3BE)!}191FgT6}rj5<TfeR17!tp2`8%MN9*<-@6i#*@MyV=vIRC@~E-W7vJqv<#Y
zI^BVS!J~;Z9G*g@pcb(Vkxb4OaezhJe9-n+EbecyB&rl(%f(VJu~@L!1s)M%xmXq<
zmO!c0&sB$R@ZpQN;#k?ng))7Kng&SuF#y+1Di%UN=b6O+jt>MZE{y1a!^62KEFK<)
z!*Ssb91Z}-q5&?4;K1P#2|U<WJoo?29};v5xzH^C(>#k;U`H+-zl{PYd>bY}1Wu3?
z9F>HazDzYW$RLA8@lx~*=En(k?lihpY(`JjSxfPRQ0RpwRj@68;;M~&db9NQ?e=Pd
zT2P{ZthHLp&eyoW+E_j*Fwt`OdJ~TECS~iXKaKW5H_!w@k7wtsV+*cb>m^S2z6%<&
zYD{`f9Dn-ZDIxssapJHUfLZYqvy(SbU#92uLvAY8MSRa}l?G{IzNiCnd9}dEJJr9|
zymUZCE3aV>{3OYye{y%__q`i$Qb(=CxlM+)7-!n4`y>yAnl0yS?Bu>OKA39RWFles
zYlc|6E=x&7EA$)x(49b^(;i;7bz*YLD9fdP@AJFeQ;{8qe3hz!(dJ_tdhG^~i8-2A
z^j;YHrzdX=y$F0VzieU$F$i7#SSu!F{^aV2rB_pfF;-eB1?K(jjT1JZFqJ;WK4r!&
z-_G(Q%0ojd;4Q$$Hr0h*DD1bq-Z2n4aW&AH4x1OA%t}Avp8G7C;4m=sAR5-=_9|Yl
zY*pc<Y@L9ywVmAlRGX%Z0mIAPr=6$c0?79^)a3shu?AbwG?eDV49%?>bX_@JUYQ^j
z$4nP<mq&O*f^&!QT5#n3rKu|o2+zy>w9f7(do2H;w_ih}X-8V(t4>qFsY>gsCfhN+
z$xlbf6C79L*=_f<<2fTYZnqWLKV&tG7@E*3qtK@MkR%&2d`uZ~^)5<truJa<(R3Mo
zNA}1tZ&hjfok~xg$irUM!TfRkf@&uDYR2e(T+O2~W396%JFWJ3<u6GaDlR;`{X$l@
zYECyTxqhSH^N;ExkC!1aV<l|QJKE$^XN~}Y`(VnQw!(So!;a@_A!I^P%l^qU%dkL?
zW=|GM#H74p6qUMeLN-7;l&c7(_S?*@MVy(J(3HBi+?~f*&AXc-w?4sBQoS?wA-0u_
z5Zm58REP}y)duum>PftHA!23T;rsxfv=W8f<o@tk4|%Dy-cG>Gl8v?e<J39x9KK#w
z@Q+^bgI2}LSV~)OPy4QFH2m<V8`X>~$CkIBDy@Y&XX%o-oBh*u()oLpI>DRXgfnRU
zvANQO5P!{Zz0t_#2;IipUBR^tbw(*RN>8P%;+Ieh;?EyYqQ0QohSNqVwGnsMcM%M1
zFFkB&AJ&q~gnKH=JP_^lcZJ!P<0B<9#Qh1wTM1521D`Yp`i!9efI#}92ZK__(gd%G
zw?_oRlhOpHMT)oH>RvxZ+FSo_f#vIqwep~b(3t#R2ZLiRR#Z&%w-WL90$7g%16<!1
z6$Rvujy8A3H(z5;6;AEhZL*b0NTCeA+I%UGKCe@53$KD)*(4n2Lz3g#wA~?H)+7Hu
zku7uJC9}~=aiFcUH$T64$;UuHmkQ?LE2`YG-xG#7kKUhq;En8izDX5S++$>Pi$ywM
zdhA7RbyC)(e{N#lTZ4$cqnoin*d5@vm|u5Syy&u0X|yPc4(w3BMs?4yG3fLww-=_r
zF>dRgz_#BYkHbBCb}3~sFDBHphN9|P2ih$6Ov{ie%{RUcdUGX}vbV=WT<-go&F8)6
z`NbV79k}?ZUmRg+#c=(7Z;SM($~MO=%_+X`%>7HD)kn`PyVCvFmYbQH8Y{HVX<;m*
z;*T1xNt%MI#@ru7)(hhI<#zZwT2tVLn^TUrm;2vP0UulvgLK!aOlNI@XlmL>d&UyW
znbodqhKu5T0~qkGZ8!07(<8U*m+mz?ZlJy_wSznxrI|!6uS#$2PSy*XbBw>WcZYU8
zZPqX6;-tj@jH-+_@7{Sj{siM0VNRW>?Jp4KT~v6tW<7>oSXVIqgmH7Ie0$0M_N`M_
zs56;0lZpB1OSAibQKCPP|7CVP(Dt+<W@Y|ROV{H>==L9yO>>;g5o?aX4<GS;F-&FK
zt~r1aosYMBcHLrW#;8@nUmq=LUh4}W<-srCsP1q~dZ5NNUJrU)%mL;F`YBmbR8>h@
zbXDo(iOmJ;iv@S`$HhOk<|IYU9|*6SfD((t@2(wg)V0}$LmV18&Sb^p$Xwzp&Q#d0
qKQGRhZO-(6;`}hPB(K|9U0-d30eW~Q6Kb^ZU&Wxi(|&UeP5BQz!V!P~

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_home2.png b/OsmAnd/res/drawable-xhdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d1bfdfc1e6c281295ac3b30bf195edf987858b8
GIT binary patch
literal 1421
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ-L~|%Q8bEN+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut(
zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC(
zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh*i`vVozAg1M!hp{bd<
zrMZrR5s<HMV4-hhple`hWom3?V59&AN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo<>h+i
z#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8<(HP&
zDgj*z@j`BauP@x-ykclT0fS7xBC$Z<P|rX=Hy7kDu<GKHpj3o2u&OQ&sVqp<4@xc0
zFD*(2#z&emOfxX-@LL2@2y~5=e^DkdQWA4q@{>z*Q}aqZU2K(rGI}YQDOP4iCdO&z
ziAlO9X~1AhOfdlxX{pA#rUq$=CYELfW=2WIFmtf!cQbQzc5^ZVLL);%Lst_ES62&1
zBU3|57ZX!QXGa5=UeCPZlEl2^RG8hFK)a!O9r5b5axO|uEXgkl$<NP$rGkKr{F40Q
zjQj!xXJ>G%D`<pg=B4D97i)r|3F2#))S}F?)D*X({9FZaI9p|6af7+BNs^_7iK%Xi
zfw8G>l8H%*u0?Wks;;qNYD%)XMRJ;@d72Vbe+s$brw??LJ}9vuB_5a%Fhzox@T>sj
zz%x^79xw+L0kg^iw+>kb2FA6XE{-7;x8BTl^g9$F&~|%zo9MdNQhONX94#8PBMKSC
zUg(Off54Qdu&z{5?v(FbwaZ5YGU9JnKCbSspJeagHLLDz^0REION%rnd23CMiC~mC
zFfp`je^7pu=F`r2dCgVq6EqL=X{?`OS-)?Yj;6h#-b?LMx8-lN+<#vg9df|(X|s{_
z#@ti4KSea;Ys63SJX?M$m;GPfg#*HETNx#z=SZw?OqZROb@$SDsfu&FtGtb^uHM<h
zR=40y1<O~-c<X!9w;x#QVN)E$|6QHy&6_TcwGx337M{L8$H8BKRd4sJ<)_!(+Wfkk
zY4w@2#>KU3c-N%4rJs3w;j2qIV_4~ZHpiK}*uwVj&J>tZdpqqWTZOKrT+8u?Q9?U}
z8hV#7aB!bL78cNRRPv6M5SMt<rrfB;V@?`ko)%jlB+G4My(YpH>S#ERqqXF&(cu-G
zKkQo%wJxZUkGFU{Ghm0%l-<b*^IL!-d%~M0eY_yH_vE(?T8<~ZABg+Kwtf=WxxK<A
zoPo`t;jmus^TWBvV;i-35*U~z4uHfM5zOk)uK&8gKy|#no`IQxrNM34+Ou1qfeJ`Z
LS3j3^P6<r_BDV7q

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_info2.png b/OsmAnd/res/drawable-xhdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0330ad4b964a30d787d514f8fa1a42a832cc1d9
GIT binary patch
literal 1873
zcmbVNX;2eq7^c;NK~X@wMb>yA>Sl9?tfUY~B2hquFfgLvX0w3>l1(-X3E)*hr|PIt
z93@D#4kCzERJ<sPOaw&*6%|K7o#CoSQCsmqbewJwY=1cZ=+5l-eebvL^St-$rpSne
zZmyGEot&K9l%cXHdJk~CBb@0K{@6m&+ayXJM@17_%8ZbhlT<^fF+iz9lCUTY(PSF0
zVl-k{2Cj;u;=;pVl+dvdhYri4Gtg+7EYM;=&{T{9)L0U(moQ&eU1S2dM#790gtNm9
zAy_gVnnhyKSrIBUD-{)Mn1Me60T!4h&|wq;SafN66Ks(%2Y6xn?6`)Qz<>&sDq((h
zDlR+{2q8!e5U_+G%I5F^k(k912t{Jie1J>K5ZfQ(vO%^O7Vuy;7Z`k)v^7$rg`;GO
zL0hyWVJ1_Q0fr#6*~~KYSOl2_al~RV#O6X=E=X&Drc6DBSU|mL#t?%HGod7Ipm0JD
zI2aK%kxogNw5Oj#&>6zRzYyz9gNdS323ZgT#9^@^oz4;0fVPQ>!v1yRtJ)@2rU8SZ
zFcXnZqI5m9Glsx)?!Ilvp-6iJFClTdC`g)&K+|=Yo>IyrO!^B;gKJ<Rm(SCR5H-lx
z(rH69e0tGhJW#;aB7CusE##_sLp)!@D}>SzMX*pL4CZn;968@#F87ym1st)AFOY^v
z*+W>R-b5jK6dSUQ)3yh(!f#^X5E4Tuf>aSi+E5onCKD84N+t|INXS6dfjP0bUPG8o
zevUGIj#`G1cm}3Xkc18x$TN(8#Rn0OuNM3B1)zq_6M$+yUjzE1C<gL4m<AR3qgt^@
z%N)dO{%`&u+9}A<EdObqp)0y09mg-DKnq`n3DeUPMAD;zhOcO%C(x*rNmZ8CuDv%?
z$4b4fB;Fp5gT-|T4UNm)61<A!^1FG?@-4|tIZYL{Im~{SQ{%nL-jwEVxrn<K|EiK6
zNCD4G04)`w;*`0kid~BCy%P|NQ!3tzZ9Ojn`huoEZTQeLn^%!1s=iUNwp7t%r`UUK
zBPxDkaCBk3JY;;nPlHHXU{lYwi5ixJJ6-4K3GX{~Q^&OgKX;K&%e5unNWCcQ=a}{@
zk1V=XUiynJZ1a2jYhG2^`TXzjqQurPrBC_<h3CzD&L77g2%0^1ooTva(q>C?+idZ#
zPP8rTS3|u8m7qA;<8t$-`a)#Y!N6OO@vH5j;D*01Jj;6-y`VYJdTCvkS0wnLb`+OE
zCd{09c6N;YC^xRQzS1LaYFpX3%Q4x@p4XT9Sv&L8=HIP`oUs0-<PzDe#~T;rR@rj8
zs)KGwx?O!%vaH#i=O5;Go}Kg}FTDVbxzTKX6~6y{Znih~W?6no_7+Ab!#Cp5rgQ!+
zuJ4lj=6rY+dA<7Bea6e(3%TWW5ytpgg}_Ti$J+KcqZ8q>xU7xjhV480pHK6Z2Tk3x
zVSyl{dY6m0vEEZ}Y{{y;U6Y|IO5Dd??>wR$$q2HHw2h6QK9v*d|9$&$sl9!jAP`@(
z^Qwsa^Jn)Lh9gq*IX8QwGoyTi;WE&^-+do1)H2Q9>&$?H`i@BLJoir;>tFobl2M+Y
zoZ1;VxxUi_wDosim+NZ_c3*aLUo$c`^$J?!gnYDKJYUxvs;`Xg6!o%W`*^$_q#ZFX
zKLM?Nc*(x{o=>G6vMn8RZQJIyxk&A-tz$Z2wX(22Vxl}z>85<rx+h|D-cfc3v-jaJ
zvj}9V!X_4<H||+`YR3mZqu<;#x6arV^H(+M3qVz!$u@~R&|~e2=ypZBo4Ze@zdhGg
zcvv>^M14=vqspL+U~<L$*N37~z$Cx;l7NntEgn~mXYNl~eDqMABC+AX^_x?6#w)AJ
zyYDXU%r<U28Mv>+8z|Vl+_O7vr7Fr}`{Qd{8y>=q%};vwby?@W+dogz%f3{2Fim-D
z<kpi<Mi$5T&UCpwtFY?rqmY)Av(mE0M{$bQ7uM>8m^=Ap*Syn)chvmwY|8d%+~ss>
z{p1?B^i5EAYeM>APtPj9u4#2`vX&xCsmrCOrxnXGy~Yf4-_~)VWU^1)hj}$lg#o|K
UXB;dW?fA(l<q@)D!7JDQ14swyc>n+a

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb3cc5e4a44fec88a66338dafa96d310cf93eb0
GIT binary patch
literal 1968
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
Saq~-of2dxYrD=cFSo0rR^8>{I

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..78ee74d36d8d98a5643213c295fca6e1acec7742
GIT binary patch
literal 1997
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
MGBQ@NU$%PVUqz=B(*OVf

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ef5ba418260f9063b1c9625d69d82b47c3e5f3
GIT binary patch
literal 2439
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..72179cc54bf97d0a88fda63993182031a11547fb
GIT binary patch
literal 3353
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
UQ-@1-uKuiey805XI!6fp11M*kdjJ3c

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38f14f71c57fdb5b7f9e9beb7d33245e8a141bf
GIT binary patch
literal 1784
zcmbVNc~BE~6wc^W5v8J{h#h2!Rsq@U=4K<2LN-XmAomf$A!IiaVY4w=OhSvbShT5#
zK`cTGYNJziTJb^@3R1j45fHRWRqWV7jIAd!iuLLS2<;z^e{^T|ckTDR_kQnvZ`KkW
zwb;#dmMeq7aFa!#vGlBPye{MDF=$`t7<%%eq{&nqsiurdJ<bTl$P65i5z3W#EUv`N
ztIy-X493_sn)qZYS-w=HA_<n#fnk{l9nEGif<sI?r78=jfDC-4Mk{7M`niz_XfQD|
zi7$ucItiYsiOALCak)|Ps@yCUf-yrD0l_8_ZGgZjC14`5wFZ$%%p9^SqSuaNhzSfq
zs4OvaIH+WKG$0}MIKXEKKo!j90YZeu<_m;~Fc9F-dk7AKI4}q!B0g6HbAXYDNqf^{
zYEdj2KH`hsiJ6%cr4vDr(P(5Dxhzt@5@I6=0>K=J!vSdoXfSIjr3us;<~S{&xIv}Y
z=qL@T1soQY8DtJ6X3~)kUxCoc<)enRhLJ?kDT7Q(9mHnA5J5QZHH0=$vG~7Xyc2DR
zH|uaH7B`SNdKFy{^&BUe&fWVRIe>IDqGfswT@+<DN~&@QTuaGNF_Zqn!Zesjz~OP#
zLS+WXQ`2cvVmx|K<6MvrtCc)N01G%7T&JCP@ud<8Ul=A82*NmQHe1RI<8k>xFw7H#
zbNNyUEOc^ZS_7rjs&J=o4efh`%YQFdB+=taiqyxGWVTZU(U~Mg8Zt>8Adw7J9q>!i
zXfe`g@OPAH_|_<{*Q~*@a6L%?LwOcy-VuY4%gaE5czh6pxqL8#$HTxNl?n&BY#dVw
zgH&onsAi7vvHzPthz<&Jh~+=xaURi%bSy_(f!>TZ6RxE@NKd!Q=ENcs-GMV@XlT6Y
z`u)lWk#RAMa~*xWw(Xa^{5jj)7qF8r!Ao2wd>QJpH9aOj@6hC!7$4i@eD^`$ztdv|
zd~Lh-`Q^{e|N55w^+DIGhHkD^zvfX-!;L)i+Q;zShhnHPt-bxXa&AJvH-#=csy!mA
z(TSE)`<{~W2KW6bi(PBmZ?r~Wvvyj#q+i^W%rJ#)3S>6&slnz%jHtv;@4PlxhQ9nn
z*gqSoYf?Qk`j`sQYrio1-H__@?D6J{>(EbCp8eCj47&R>xAcIW5B-4Oi$gu{PU^47
zM;EGGUle9P*J+`S%B}V`q^Lezw90Sydc4AF-;8Vt4pn^S*IN3d3|}%JO0+ItbbNjr
zC+Wo2rPcO%y{sc1>E4k)?e^bqTVCwhQZBl3tffv-GOuo;dE><^hugib)`I@Fm)3(V
zx5r%}{(5yva7HlzC+S{{`!K~^qYSFDJx#5BFsUi9x#srxBaqfMA4wf3e|%{D=@u*%
z^^x4_{{YUW4iiUXJc+&9j$&|LeRqv`V(zzId+c}MK#x>bMd|Lj*GtVG)vmH_B%W3R
z^@C}<^0;^X_3h~PqxU6|$x<Vev?9~;`ntEbAF|YtU7v>)l?|r9{3B;9)4fwt@yc`Q
ztL~1IZhS>`kH_nR!m>fmsYMToZT1OqxB4ClpX}Ya;D#l4(+<I%$;YVgdZS+e9aIAf
z0Z_4^B=~yw^UI-|PUZ)H)v^j|N$Ab1dz@C?b2C+1RqmcmZCK}#c2oD~X^UOm>#LWo
zeS4eP!@Cwx=WQ;y*s4kBySK0BNBivFIkDSX-^TV{IMIB-Ug1wJ^tMWx3ooa%@3)J8
zs5c`4#wxD^eXIw4DN~ACR-X-CA*b+)^A{4@uzN=akK0S4Rv-ln0=PAC&!RRMni4>C
zOjG+oAK!+=0r@#l_WI3)WuAN9ptVu7rXs7YnU>N_f2%!t$~h?fNmhZPYx;rjCBt&d
zw9J?ac81wLR@e%hP~Xm};9LcLG@?kXxT`Vj*Xg6MW=qJJNsKeKSU2H)cAev2B$Gy=
JRblD*{{VZhzL@|3

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..459af1e1526f3ba41175df59d532cb43a2e81a4c
GIT binary patch
literal 2345
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..acdda2ad518d63dd527c3ad8cfdc1caf67cf69a6
GIT binary patch
literal 2527
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
P{mT^;5XLC;-=6UweFQOd

literal 0
HcmV?d00001


From 1ab81835db2982bafbc21e4cc44737b405f1d8e6 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 12:59:03 +0200
Subject: [PATCH 018/138] New icons.

---
 OsmAnd/res/layout/dashboard.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 090e6d3608..2693dd37f7 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -33,11 +33,11 @@
 						android:text="@string/address"
 						android:layout_marginRight="1dp"
 						android:layout_marginLeft="1dp"
-						android:drawableTop="@drawable/ic_action_home_light"
+						android:drawableTop="@drawable/ic_action_info2"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/coord"
 						android:text="@string/coordinates"
-						android:drawableTop="@drawable/ic_action_marker_light"
+						android:drawableTop="@drawable/ic_action_marker2"
 						style="@style/DashboardSearchButton"/>
 			</LinearLayout>
 			<LinearLayout android:orientation="horizontal"
@@ -46,17 +46,17 @@
 						  android:layout_height="90dp">
 				<Button android:id="@+id/fav_btn"
 						android:text="@string/my_favorites"
-						android:drawableTop="@drawable/ic_action_fav_light"
+						android:drawableTop="@drawable/ic_action_fav2"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/history"
 						android:text="@string/history"
-						android:drawableTop="@drawable/ic_action_fav_light"
+						android:drawableTop="@drawable/ic_action_history2"
 						android:layout_marginRight="1dp"
 						android:layout_marginLeft="1dp"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/transport"
 						android:text="@string/rendering_category_transport"
-						android:drawableTop="@drawable/ic_action_bus_light"
+						android:drawableTop="@drawable/ic_action_bus2"
 						style="@style/DashboardSearchButton"/>
 			</LinearLayout>
 		</LinearLayout>

From fbbe8c8dd19f2d30f69c416cbd565fa3c047adfb Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 13:13:37 +0200
Subject: [PATCH 019/138] Fix Dashboard icon.

---
 OsmAnd/res/layout/dashboard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 2693dd37f7..612f572eb0 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -27,13 +27,13 @@
 						  android:layout_height="90dp">
 				<Button android:id="@+id/poi"
 						android:text="@string/poi"
-						android:drawableTop="@drawable/ic_action_info_light"
+						android:drawableTop="@drawable/ic_action_info2"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/address"
 						android:text="@string/address"
 						android:layout_marginRight="1dp"
 						android:layout_marginLeft="1dp"
-						android:drawableTop="@drawable/ic_action_info2"
+						android:drawableTop="@drawable/ic_action_home2"
 						style="@style/DashboardSearchButton"/>
 				<Button android:id="@+id/coord"
 						android:text="@string/coordinates"

From 5c3de0ecdbcdd2a2a5f2bac7c69f3b567d124490 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 14:41:01 +0200
Subject: [PATCH 020/138] Fix dashboard title.

---
 OsmAnd/res/layout/dashboard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 612f572eb0..1c07382a24 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -91,7 +91,7 @@
 					  android:orientation="vertical">
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:layout_height="40dp">
+						  android:layout_height="38dp">
 				<TextView android:id="@+id/fav_text"
 						  android:text="@string/my_data_Button"
 						  style="@style/DashboardSubHeader"/>

From cec4732324b0f79712aa970d02cee27db9e38ebd Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 16:21:46 +0200
Subject: [PATCH 021/138] Added menu in action bar

---
 OsmAnd/res/layout/dashboard.xml               |  3 +-
 OsmAnd/res/values/styles.xml                  |  5 +-
 .../plus/activities/DashboardActivity.java    | 71 +++++++++++++++----
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 1c07382a24..3785e04847 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -85,7 +85,8 @@
 					android:visibility="gone"/>
 		</LinearLayout>
 
-		<LinearLayout android:background="@drawable/bg_cardui"
+		<LinearLayout android:id="@+id/main_fav"
+                      android:background="@drawable/bg_cardui"
 					  android:layout_width="fill_parent"
 					  android:layout_height="wrap_content"
 					  android:orientation="vertical">
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 845bb0c9bc..0bc08446ac 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -14,14 +14,15 @@
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:gravity">center_vertical</item>
 		<item name="android:textColor">@color/dashboard_black</item>
-		<item name="android:layout_marginLeft">16dp</item>
+		<item name="android:layout_marginLeft">16dp</item>ll
 		<item name="android:textSize">14sp</item>
 	</style>
 
 	<style name="DashboardGeneralButton">
 		<item name="android:layout_marginRight">16dp</item>
 		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_height">36dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">@color/dashboard_blue</item>
 		<item name="android:background">@drawable/dashboard_button</item>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index e610ac602b..c711c71292 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -1,21 +1,19 @@
 package net.osmand.plus.activities;
 
-import alice.tuprolog.event.LibraryEvent;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.text.Spannable;
-import android.text.style.ForegroundColorSpan;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.*;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.*;
@@ -35,7 +33,6 @@ import java.util.List;
 public class DashboardActivity extends SherlockFragmentActivity {
 	public static final boolean TIPS_AND_TRICKS = false;
 
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -46,10 +43,15 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		getSupportActionBar().setIcon(android.R.color.transparent);
 		setupMapView();
 		setupButtons();
-		setupFavorites();
 		setupFonts();
 	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		setupFavorites();
+	}
+
 	private void setupFonts() {
 		Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Medium.ttf");
 		((TextView) findViewById(R.id.search_for)).setTypeface(typeface);
@@ -62,33 +64,38 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	private void setupFavorites(){
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		final List<FavouritePoint> points = helper.getFavouritePoints();
+		if (points.size() == 0){
+			(findViewById(R.id.main_fav)).setVisibility(View.GONE);
+			return;
+		}
+
 		if (points.size() > 3){
 			while (points.size() != 3){
 				points.remove(3);
 			}
 		}
+
 		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
-		for(int i =0; i<3; i++){
+		for (final FavouritePoint point : points) {
 			LayoutInflater inflater = getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_fav_list, null, false);
 			TextView name = (TextView) view.findViewById(R.id.name);
 			TextView label = (TextView) view.findViewById(R.id.distance);
 			ImageView icon = (ImageView) view.findViewById(R.id.icon);
-			final FavouritePoint model = points.get(i);
-			name.setText(model.getName());
-			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, model.getColor()));
+			name.setText(point.getName());
+			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, point.getColor()));
 			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
-			int dist = (int) (MapUtils.getDistance(model.getLatitude(), model.getLongitude(),
+			int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
 					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
 			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
 			label.setText(distance, TextView.BufferType.SPANNABLE);
-			label.setTypeface(Typeface.DEFAULT, model.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+			label.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
 					final Intent mapIndent = new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getMapActivity());
-					mapIndent.putExtra(MapActivity.START_LAT, model.getLatitude());
-					mapIndent.putExtra(MapActivity.START_LON, model.getLongitude());
+					mapIndent.putExtra(MapActivity.START_LAT, point.getLatitude());
+					mapIndent.putExtra(MapActivity.START_LON, point.getLongitude());
 					startActivityForResult(mapIndent, 0);
 				}
 			});
@@ -205,6 +212,42 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	}
 
 
+
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.help_icon)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_action_settings_light)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.headliner_close)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		if (item.getItemId() == 0) {
+			if(TIPS_AND_TRICKS) {
+				TipsAndTricksActivity activity = new TipsAndTricksActivity(this);
+				Dialog dlg = activity.getDialogToShowTips(false, true);
+				dlg.show();
+			} else {
+				final Intent helpIntent = new Intent(this, HelpActivity.class);
+				startActivity(helpIntent);
+			}
+		} else if (item.getItemId() == 1){
+			final Intent settings = new Intent(this, appCustomization.getSettingsActivity());
+			startActivity(settings);
+		} else if (item.getItemId() == 2){
+			Intent newIntent = new Intent(this, appCustomization.getMainMenuActivity());
+			newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
+			startActivity(newIntent);
+		}
+		return true;
+	}
+
 	private OsmandApplication getMyApplication() {
 		return (OsmandApplication) getApplication();
 	}

From 31dff59f4bda460d4e40ca8b23e84adffcaa444f Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 16:31:17 +0200
Subject: [PATCH 022/138] Icons for Dashboard actionbar.

---
 OsmAnd/res/drawable-hdpi/ic_ac_help.png       | Bin 0 -> 1832 bytes
 OsmAnd/res/drawable-hdpi/ic_ac_settings.png   | Bin 0 -> 1762 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_help.png       | Bin 0 -> 1555 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_settings.png   | Bin 0 -> 1499 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_help.png      | Bin 0 -> 2155 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_settings.png  | Bin 0 -> 2000 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_help.png     | Bin 0 -> 2758 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png | Bin 0 -> 2605 bytes
 OsmAnd/res/layout/dashboard.xml               |   4 ++--
 9 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_help.png b/OsmAnd/res/drawable-hdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..746232e70f25d57636dcc300820da9573f52a913
GIT binary patch
literal 1832
zcmbVNc~BE~6po;X5kbK!D#tdI5rkzo*@R>x5dt9y8jOg7ipVCr36UfllEp+FEk{*Q
zsT3<Js2o~lJOW5XMXfTP%&7H1K&zEXv3P5>2#Tc}1lvCx|LE@Q?|k2T-@9h><grns
zm=l={24ht8bV(dN!?w@SfgTg=de+j@1S&F-nnS86GiD?hVw_YEK(r216LAEFFH3JE
zLKqDDrJDFeDp595s3dhkm`x_gqBGEF1|uZYV!)JX1O+GvwMH*uJwJYm1!!;)D}g72
zWrheMRWp6Lk(jeQHeR_rO^M>H&}l%3MMx{q5flbkbXvVhXc4jc^$O{=?HFPK{UTJF
zi1mR~qD&4%kVXRF1qFjjn9T+FXb_th%t!fw0EgZ~umIw~AdCumh!Exg0}qR~X2ey(
zIEi$?7QGX(QYp$Hgdnro9Arj<NTV8JqbLf&9EigKX$jD@Oiy7JP;c@X)F2^DN~6X=
zX-GX_(}*d^3`)eJnSO9VXOPK0D%P6@0!4=mvS0>?9Rx!<oz1U)X%iJk{7d7L(x&)j
z1_FvBOk{>pN#{f5GYF<*_jyA$L7I(lmQh0|1=C7MWrmK>Q_&I;i@piMHMlUC!$nkl
zOaXFLbl5PQOAjgn0eP?r<D$WEFh_w5>iHC&4GSb(sel_C&SkUNkz8?vI8qwULnC>7
z2_lXZ3}U18CJNIli9y>M+V%hz`7Bl#VI(k$G{%#pcCZTMsU$_3Qb_|45z(J@z%N0g
z$4Rrv-<GBiUP}n0W+{P7jie6fkF!wo2@VKOz+6<J0ue63262R|02L_C1K9+w;9&^C
zXRFw(0X+VH;|I~CAX~Bgr+5aB=!&#0KehtB`PfW^p6(zc-71&Uc6~{A;PhyTINoym
z$u?Q4n|SO6w*cukU1gP(DYM1C3g_&m=6PvX{c<O-&s~>2y!?lC-s4aDC5ODtx_<xI
z+Hs+=*$b}i)3KYC;{D~t#W~$WBEiH*3B4}8<BN{o+EG<M_D#b^?NarxCypSm9$eO*
zNDMr`=g`dcvh+NUT#xR1o?DZ<8gJC@t1rrQYGusJULrrIUfi(oh3o4qeL=$YpPp@~
zu>VtZ)Xl^G@U)Hx1-ulO=S0IWgIlk&(or`wr)@#z%Z}Ye8LPiN|MkN#yCesfhAAV@
zBzAU|Upb3Ug-h}eXCFOx%zf__uR08K?E_5>D+>z!-c7vYP<7g=+DY49RoYae=I6``
z_8cv}Qwaa<BVg8tU26xQJB)7#@%Hqu^R2jLUKr6CQaQp8aca(vb!k_gXldk}8B)Kb
zb<buLsIT=cyCi6JX1cy*22S;oTUYBQp}@|?g<Gpx*}o_C{gLDRVm0+*rw`gZqPVr<
zDbsCuaai2_gLTKP>a67IjREOjRITW_v_BRdqkGOtFPmF2hMgXj)aR1f;ni{W<a=wM
zPvLia=JT0(clIP#WR<qbqpNzr1^S-TFP=>P>qp<JM`2Q9%>qYjjI`G5g%)07ZSike
zb8qyL>g_$NRPGu0utZ?~5wY6&D{x|8en8C%>vnl%X;XUH?ZTG|-rXS%NpI>hbC|+$
zj|Fl~L$`Mdw22$lY;uv8m+j>o06Y8*yYRq!HLs0!p6*D~j`o;G&gEuazW0svvXsuS
z@hy%~S2iCwJ0<RFdfTyb`=66qkcN5oiy+FQlTWp+Y*cK4uio6dDTYGUw%ir&9J<ST
zu+r){>Dfa;fg0+xUX&Ht$xhvy5GQv(={j=pZP|6rm@{j`xvO&3QMa9Q-D-V^uA}0@
z`@MNHcH)-&mDjqU8=@LPjArC-Pmk2-0`|IIm{C~MSTy98c5YYF#YR8x%$v;F7g1!<
z?v!5Om*VP&VH@7HNWFwNqrVS5`0_#N)$ZAo8n<t8Jf~TcP*TcY-?VKWJDI;@+@clk
z+Cv2piY62bC&verJQ?nVgsd}_9FV>be9ZLRNae%t!+o0b9^?K;)^SR=O7ySJpKo0s
lwfK?Ga2EZBZw|F{Vys$GzDs-A*WUK;ijItxSi@7Y{{i=n#hCyA

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_settings.png b/OsmAnd/res/drawable-hdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbeb62be371f3c97a9782ca9c33dabdfef91b53a
GIT binary patch
literal 1762
zcmbVNc~BE)6c15Aw4eeWfW@5%D%xasa}ctVfFTJIY(O~#wOBUU4XluCNLC1<OekY*
z=^#a@9mNg`r4><%U_~l&DIns3M^R}Nyao>h+oEU{?S{kl563^cGy8qt`}Y0b@q6#h
zez`Jqx#Lv#sSF0gQ5h@`r+3KuPO+ocXy%J;^yWq>VyFmGOQoVloFT<XH4Z3sXgnT{
zqgYyUJ1%B0CZ!OOF;tA|V?;yhIH*;JW7ZjHG=m`yFdI-!B2EEnJf6@?ScAtKSO9@Z
zSkVF%q%z3x1R{8o5s%mu8mZZos1aeT0DnMiMrZ>%oI(M!E=g}f%o5h9U4%YcuR#_t
zszN17SYtuOs8#|p(ue~BjxSpS!F)g{;=lr5p-A`<z@=pn@&maL8xkP`9s+TJ@rOlw
zGh$jKTpl#;i<Ts;1d1{sAefq(%1PyMNMk$*i$o$2;(}Z*o7P~P()1K+X6sE0CM?Kt
zlg3CGD1y`jR*R^b+(=1SbfjY`=nN{=Tf=(OI8iiZpcyrQFb4v4I%{5|+9oO-|2K?x
zYMUa{3^*8$o5+nu4P6iIf(bCq-TNI`73pY@Fe5=11x=EZnvFVKPbuXR7X5{T5g6jj
z<@2;cRL$mVY1&YXPcK@W#}+_ZlrQpye7S1ggq?TcVaQL;5AuV21NkrvEBI2GR1p*?
z5Ge#gIZvwao4_jdCJNPS@Cn}p?RyL>40<mXkr{E6B8`zGnKaP_D-%eHG$oJ*Kqecl
zI<PpJ&|_q($;Vozv8?5|kx0R@AS0;*MtMevcf`QMaELEbYuP+L4zn>HU(HsFFaaCJ
zF|`2Y;X+sov&Qk*|K$&)g95G1@}K6JxS~7KdVD(ywD5MAa6LUiMtW2Zp2@1FCy=R>
zOC!zQ{kuN>;_NEdw)p-HHQoiKUS90L;ICE{Zu$CjQTXe+(^*jw`ww~l`C}!ku2-?M
z<z#`kn79`eoH*iEcJ3&+w768UVW!8O^xZtS-90DzZuZ<58Clp6QM7wkIx?IwIQaU!
zWH?lu-+n6l`sb&ze`nd`S>D7hD~n&Tu0&O*iK|ho>n$z4WyyC>HA&N$<$QQs=5;hS
z(0gx4uTXN3x$v_p^=#n7Ye#^|1z8BxR`Q)TqZaCNg`!~3?CP68TU>fsX1jqbRaysb
zd!PBVIYuV6Z!15$E@Rs=;W5XG%(cqOWAX6tqMY;02TY%uIbxfR%?B;R^U{gT_V3#d
z*aeLIaPhL|OGW90ru>|HbGNp_bG$}4`vh@Hi^pRWI<uN_;@F}|6|VPvgxymU82Pf5
z14)y3y2<@V`k&Y*FsDgvWknZ^g{l)fkIbx`Kje|pHEBcR>Q1M6_^~+O;Te3`Db%Z#
zc|Q5x^N?$+0vd*LUHyq?d7)<=XW!5jZtZRq8&-6#;h7gdSy1$s`}{K_=}mT>eW{CH
zGgfD{xi@s!brdTuXV}fN?_TOc_((H@5;kA5V^Z}c_Qme(tKWD#Mf444&gd*Bgd*a>
z=AK&DWxV6dSB3N?RcBfd)ytI1maUdsy~zBo6_c|<g17fEZHDS&8HeKb9I`A4ElG4t
zIa?T)*BtNvvS6yFV)BJ1#KVSt!2Q(8R?G1^hfCYVJIZeLcvj{T(yK`sV1dLf>gE2}
z9ZuEZ`R82r=G;|HIdHM2cYluMr^Eg1b)84UqC)Rib<Q$?jZG2G$`{I#$iRL^gKO^9
z7Uw@69$z0lUFpkRa+`B+%ix_2Mw_|Qeb-)jjuoX@TpB+xWKV0`Q_3%`eZJQFThClW
zW4Ub?X4~_q-`UB(WqDWbn^)^w`)q%4L7qgvxSf26H48Yb>@DrA**QF|*0K5N--+ix
zaehSoTDHPws5sT(m48c>(74ZK*|X-nusG(x;&A=I!QUQMoiq=HZSew}XE;o`k}(Zp
XtU(K<T^+)D>t9Ey2$fd^#(nk=gHNe_

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_help.png b/OsmAnd/res/drawable-mdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..8341644395e52ac4347b5f956241ac0f41daada7
GIT binary patch
literal 1555
zcmbVMeQXnD7(Zyrpiri06bO>rtutGoy}N$j(K7lq+F<84IyRGS?Ap7oM|-_;cU`*;
z3hpC{L6(f@5YbIY00DIxnS-fpOy&n46A36E4xAw(0k*k8{J`LKtmq$vKfL7L_kG@b
ze$VrJzHU=N{&Kl&z6<~WxyxxU5_d59PM;>Od~NNxxXlwBrNT<qFT@Cr0xTr!r9c-$
zR8d6~LDsDOnlb@^q?-1W3Z?Gna39O4h@_4x&O}5s0GM*)5yBUw1kg)W(P1+*+<gQB
zY0?ap=-h}qVxt1IvzDV)*5-SBwLu?7Lb*#pQydo!FqA-maV8Yz@wge9u#1c5<TVU|
z6DmT`4BaPH>Mj6nEJuMlm0syXP%UV{RH#mGzzmB)wJ5`g5mqBg1jBV298rUl4<vfy
zNIza=&ztlmN@ge^2oW5HW3iYjrctq66^vpS1|w=%tyYQ}O1>s65OHOg&rDgcQ@oF(
zBLdBa!K6jP%SHt=Br?4p0uyn&9~chvlZg^j2FHmAjH(crVUlr8X!Al5^)HQwYV)3&
z2n82WJR9YFVm<tsDX^HkM>|R?ifr)bIa(|V5wf$sC_{w>m)#7BUsNPb;(E1K<2Mjq
zrPeQ|jUct+;-@r99pWdnm>$uqy_%Grhv89+&8jsRje4sVMNx;=Vo_W2Ftx*?(>V~k
z&6vWv!n{C)eN@UfE&86s8Xk$oZ5%}iEazd_P^t?G0<6ID0X72KY!g)nvrFhO$;SAc
zWSQ<qZKpW8nj-T!mH{X7jMER{pdl$li+TM@jg~@{q(<vidNER`L@Cm%BQ%r&^`p=v
zp8UW0gGEwsvRVGqJgF<OBa_DmqaX?ohKUM`6U2$5Qn7t(7yzbfTy~2me&I%|+vzEM
z^2^J-kY#KqTUOT{4E(B>He66Zn=@29t*`3eTcba{b3|fqf{0Z^#)d7{`W0`Mf86$A
zvGnA%XPLsA-l0E^jHFi##D<r&&WpU0mN;=Wv4g+0<d?y^{@bPjY{k3$sZ!N~y}4({
zMw{rw({m+~_Ovqpy;w*3V8g6zS~s5C90AMl-bM49n>K&4HDjbDUtu})R7RIvR$1mV
zWuvE*98)~oG<A5HiM+AM*%0k)`0k5?XR5K0d#75h)qg)>0<e+cIcs~TJEc2{gRQ-W
zj^LOS@9J(Jm32w=>-(SS<QMF3Y*e`4@}~K<ZRI(C_S{hzr@d79%K9}SC0V`$cg)_q
z>-BGqoyRT*ugC*aN_v8Ka?YPSP>gqH%~s4hpGZHj(b50o=+&NRXR~}yW`^tN6q|SO
z^!UBerrqCnBpy4FxBkVY$1je<bERz-Nj$XeV&;tAteHPA?E9z>`SkYH`pnbiH+|al
zRkX=bwJ#xWZVaBSY4g=t19zQ6%L=b;Je=6jVP0G|=Hg_(UD>_th0J*1jjp;mY3g-F
zyDC1f9-N`yleK7uB`4&SD~>OB39`5AS3fSBc_PuuY`r^eAhd9oWa*)Ud(XeN<*&on
zzw)GqHtIVnv-?)9W6CeJ6|_bzLmk_GKe}&E4s!0s5-G9M8ZRk%`G-r5-6lVM%h_`C
zo1gX<_A~p2)H6>iV$p^VDuV5c2hPM@+reAMHuUksJ(~atKquJip9MmB$=|fgk#B$B
HT3P=O3=urA

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_settings.png b/OsmAnd/res/drawable-mdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2c85b7345a6b23df901596e0c6a978ef67a6bf
GIT binary patch
literal 1499
zcmbVMeM}Q)7%xSXp=g-MsLXj3BcNQbcfGdUNp+<MYmov1n<YyI*WOz=<$Cq*pe@7b
z*i8I@xP?vGrdbn~shFX#=*A?BxyhzxZt60{EgNypF=HHwOPGU&y+z9Q2l0<xa_{>-
z?>)cg`8{8^r>x|e#DwJuDwQhHVQ0$Wjzr%0`EZq+n*M;BMk#P96{1%Ouo6&NInfOe
zhrrf?a=>z-ZRbIrN)_A4SGp9JvzYdXf{u;o=z@YDqE)KA4M9Ka*$NcI4QhFxMf>}i
zPqYZnS+tvtPQBA_19iN;Ndgs3C6%70tsaWgZdi}x1!-tN01Ar)g?gV%2QAuZyEHsU
zt}!h#t)gtTXdjYtIm-~6C;`N%Goc<mP9kPXhZ{|1%AA7`P{#DR7@<e?6m2xndIFhw
zw9uQxdFgVdaK;yuEZRCn@zWR<2n2KigHDucF`S|(Oiy40fkF*b4*3)|i2CG=s09Yd
z9*OrWyy!zB7FoC0pjfn!>BA5NztcHu*eA~<3Z@JTvVIKL=`lfw#5JugE9Kx{8gpvP
zl_5XC%7H94NFG=ZZ$=ahbN6UR5k<&`E|qv#6t<obJq-fzDGtV>g<o_W&(S7=G<eOd
z8zsFkZ7fH^#S09mQSW6*%A_|DZbQ`0TzK4S%O}mbq$!`oalC-ES_x|*MHE<##sWQK
z%Z*|kK3QRX9uW1-L*Fx4!y~b@O#-YUN|mBmAMJv&I#ChjI?<2VY|~XovNrQRP7KJ|
zkup7ungJ5u2)IH?6p-mW)BGG93>?stl-r9MNPwf9fpnv8iZh}(;M_*m0L-`-*UsR%
z|C>JylENa*@}K63Ucrux9A`%X3bVrmd~kv!I4W`3e}Ab`#Y{LDYi01p-Gk07W>fMP
zKiRT-UfsXz4YqSt5xKh;S({e<z~0+lkA9ol?z(>cH6|W7E+>P|=A2u{Kh1KpRxVrf
z^%Pl)fAz!okK6MM3*|c>cHF<$H$HXG@@xOPuJ`z&9Mrm}=Um*Xg5csjFCH3s^4(V+
z?6)5KZEwl=i9pzXGPf$--a3?&Jo;z5wfnGIdb+2k`Auu_uA1g$_ET$ip1!iMWH5a+
z?$pR4QWNh|UkuOtXb`;~yR<203zLzsnqAq^ix0;h3LhaH9WjMMx9P@Z$8bifH>ojg
z1-q|x=W~0`kJhiNs#`s(9)EmWBB9=r`=B)?(DLk9!V7~5SqlR5x9tm87Y-&KyxM<>
zd3mI2WQW>D<FVld{TC0UCmy;Qx@`<z6jn@~EnU9pt+vOGRxJy+6b&;8J@nyoZ@(WO
zKHWF;OBQiwOO<+uDfL=NL$@?M<ylj+vGN4_&d=MwS$w50dEH==KlO8?^t`!mN!Eq9
zqbBNVv(9$>bovLex^Cf2ThTQ%V`s|v<V&gx$IQcPI&OC&FV6E!Y6cFtc7M#KrN%6|
z+j)sz8^~OABeV48$k5Vw>NCy2%H6G9N79<d#J{?}lP4Ct1ZMq7O^W?&<05yXEhTf}
z<`ZMzhcf$#V56pO<FV@3i|^jAI$Yc~Wu6>Y55%RadTYHEnHjfwBEMTlK?&2HU(@mr
DutF4!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xhdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8423d305c45111f7bc8320ee14b7ecaa5671f37
GIT binary patch
literal 2155
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8376cd0aa027c6ddcf173a555f746b7d85a0015
GIT binary patch
literal 2000
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec5431de617717099d655758728eb324f3043910
GIT binary patch
literal 2758
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..588432071c6f239c5f33f2bbbbac9b9bb11920ca
GIT binary patch
literal 2605
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 1c07382a24..1ec0fdfad0 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -19,7 +19,7 @@
 					  android:text="@string/search_for"
 					  style="@style/DashboardSubHeader"
 					  android:gravity="center_vertical"
-					  android:layout_height="40dp"
+					  android:layout_height="38dp"
 					  android:layout_width="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
@@ -68,7 +68,7 @@
 					  android:layout_height="wrap_content">
 			<LinearLayout android:orientation="horizontal"
 						  android:layout_width="fill_parent"
-						  android:layout_height="40dp">
+						  android:layout_height="38dp">
 				<TextView android:id="@+id/map_text"
 						  android:text="@string/map_Button"
 						  style="@style/DashboardSubHeader"/>

From 8b4c03384d7d9f6b3df0a15b521286131a458489 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 16:59:26 +0200
Subject: [PATCH 023/138] Close icon for actionbar.

---
 OsmAnd/res/drawable-hdpi/ic_ac_close.png   | Bin 0 -> 1726 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_close.png   | Bin 0 -> 1489 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_close.png  | Bin 0 -> 1994 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_close.png | Bin 0 -> 2501 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_close.png

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_close.png b/OsmAnd/res/drawable-hdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..f664f8ef8f7a235ca1d04aae001b56da61e36b7b
GIT binary patch
literal 1726
zcmbVNeNYr-7(eh-WJHok!Ah3}1(dtp`~HvvJnjx|^bp}tY|Pl*+k*r4_PkxV191Y1
zqQm6GJSe$zD9ewsqzoCII2ly5M$C^v6on8)Cj&wy$g=i8tUnz8XlM3)-{;-u_dLJn
zYxcd=l%xRv1^z4+D?pp9N@I4|`})mb)^)z)?=o8`t<I#=Nh57TtT=0hfkbgYOCZ^J
z8jcu>Hl4v^S*&S=CVeKIsaqw-NP>%ab+~rI!k}5K*m%1I!SZk#K=EvoSpg0mYXJe1
zK>@B4>0q5D5zjFt7hCc4;uJkroQKH_V0;`9YnL+y2%JU$JCSdu<aPx(VOP$az1I*3
zOsLR#3UHECrY;poB&|3g;)*#K%o73<8J8y#OJtH5fX~PfEQR<m2bRf20y)eFo;)Dq
z&1x{p(^Q%#z8FaX=Fqf74na1XjcXHdNozL5lgVTd%!l}V4x_=Lip(@(=a{MRDGMr`
z!mK6>Z6eKp*CK+F1+)TWm`;X3SaiClhRxKIL@_CY?1%;8abbucym3uvQ*;{sFO6qv
zQ~Dwc4yEA~SzyJOdKkl}z)bF*@5rmju#vB}nwX*>`6?1CAaFCSRVhH`3)f&W$i;l2
zz$igbj?l=Y4KWCr#fS?yBG`xsWnx&&M+H-Mo`si41xm4m4~vyT5s#;4AWDHopq8pN
zYJpO~OPs=L%@mE8F?`CmiSa#&<!PRal_y$pgeI+elFXm#g47(6CaE0K0wg9*R2_&~
zXEGZ|8x`#>(`3{t+-fSs4H_#+026tZo1VczC@~5#T#9lKjA!H^0-=b5ig`kg0Ymvh
zQ~+Zln2CQ9Z}`9YgBVhfw^{zvJX2RpM|zJ>M}ZNZ4ij!>CdkT+N`Ezy&SLrA(5hDG
z?N{%uSL6k+33g}jGSVU*E*%sv2&>Q;wA~T=GIJJRN&bkgQK{c79h=5J`NA>bT`>Ac
zWsNHQWuhYF;H*KHqhfzB9a~#phP&Or%f4X`v?5(a_Xic(x3AlJHm5rpqNG0-Mo9bD
z`bDw-9P-^(KotFb{!(XjZ;-`DI<21lN7r|OB|e2^O`c_09qo_CXTIb6pr^N>mz%n>
znXHt~?Cw7@V>l#p`r`+v-{rDukE6Uqa`5n1V|DH635$k<udvP)hn(ue+;NW@=fUk+
zRKgjI>$*d^dHlI>`{x^fu%zwhopO>sr^{+R$#VpswAoM8-C)Q1YN+}fNud|3N~=8i
zfw`Aru;sIyqmhoc37_<YoP?A?x1s0THrJJ;*V)P27p!&e&g#?UI{dn_ceI$mh|z%g
zK9pnhuK0p3$Y0dnboKG-WoUQfOF-U-n=0-v-cvuUQ3j0oJmN;9TQ|A!m|lnG@BvHI
zJ{29_qFr<Vv~_7bbw=d@)lp|P(XH`(ed3FnC9OM4Jhz%N=CBv4j@Hayj)d>&X&BQ>
z_qtxZnt!G$puc%<Oz6gr{ME<FpP^OJDZ01NPE&k7Tc~hCw%L(xG`nrF&J!8fFA1_X
z;9+Q|#^ahflF^#c=6b(W1Xv>$?W(G*+^}`}J=5`u(14Mpa|Mo&p$q4n`ipnU8@4nP
z8><J#bI<<e2A4kAZtU3Lx_HoG*rx3aaOh(iK2B}kQDZx)F0HS-zNWuiSMg=8v$n3O
ztmn|?zD^GsINDaV_19bazJ<eKNh3kOeBXiXe8Y3OxAzr6-j0yY(%o^>E4SQy?X&G+
z<1?_5hllG{HV(xq*PoBFE}8e!KrqH$Kg(|{cVPU}!dPcd*l$JGk(+t(!%L*n(;rZ~
zh^oie?k#VPzI=8=%lTxtJtg_o%6Ojpwu|0FD4^YSaa2*Gu^Ae()#^+3L+oH*e;>t>
b7T?*d$ZJhG55aWG`$y5LQ&fkPS>^u#a^sT#

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_close.png b/OsmAnd/res/drawable-mdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd30cd0c92d49e78c08dd59748964125750ec78e
GIT binary patch
literal 1489
zcmbVMeM}Q)7;mdEz@alDOpJ0K3hKPxwY`2q(b5Acp@5|WwvdhM^)1}!_0GEk3d~K}
z<~Egm#i#*8qDvg}0~eLB35yV?qGn^VKQt}`mQ9I9hit~daAR+Qy8S`?W0&0fzR!El
z?|FXD*S%kuzd1H0F-D<K#5!^)7u=E18x;vxslNUp+?L5%rE(GPlWS=aC~RKd0}uyC
zR{$5Fy>(kJgLH*rUJdIml}nv@7KZ24bVx@X<OGOTDAG3u1)8Y>GU5RhY`}_+cAY~J
z)@wye^iIMl*g++mQ!j#|`g}K2U&WZc=*A2rJ!pXjI3UwVkn;y5OVEl=+qJ-R=o&|n
zX%)H3iq4QKbrvFaUId6<ZNL~pLn21ATBA1@&BhIg7Roqb!nFiOm@Rsph0r3i4+_1B
zUZ2H9WzYJ8k`=9#Wx;~uwY9bCTAi8~D{zh3Y{m&KuGL~t1C#0kG9APMQgYY=1tdmf
z1)1doNXR1X;j3jU3YpG?zzI(06T<;%Hc>ETc#sxwjhetYE)>_awj{g2zcl95mfUp$
zz+FJ%t3?LZ!<QTe!`waHQAiQ8u@s0bEDG(Xc&3^I0og%WQTRpeWxW=Imel!-v<D-7
zFm1G#go_X8Fg@X;Nwa}4Xg#{How@KPElE(OETbWl)N3?Zq&d@OG7&aHW724~MjI8z
zIs%eR2N)3c%|hR^Si@7X7P|;&nHSwW?+<rDVI?o~QY9}ScKdYIk+mgkz{}T4>q2Fk
ziJAf;TLZk=BF`bydA6`~a3GC7k^v?UMl%{8M(apD<}qkU%*%MRq(?_EdIH8jgZKX5
z{Na!k9%`2VG*9>nc4X-IWE7zAWSBqzPLK#krI=pduTUt*9F)x+ym@cGwIEXyw{vu9
zNxAEpYe~bG0_g4o&-e5?drfzHZXZv%NbS)*j(l8BE=~pL)`Y=`)WPzU@#3MDj|Lt+
zQboVj`imov>#rNV!!`(AgYCNf7U80QN|iF1-P)h``-m-mb&u-6Pvfb<h=Son^32NO
z{B85wxP@gzFlTJ)rBlk^;<nCj{`5v88B{hj51)F+)cIY9J-Tm4+H)()8<NXfmb-gW
z*1r5k$GYWNf5xmvB6IDLqf56OE~rxO-*u*QVvXMZMdBY{V@;dy{E)ld^jg}kF|Lr_
z-n?pj-pG}Ghxk{O%f1~;SJL0B);Zoz=)PdS)O@1vW>ik)K-ZO%3v?G+qs(9SxypWK
z2B%WwgKN&OY(QOBwCw8eLcU<=*}MsN$HC|yhjWL{r)Rf6>`Xg){lV3WrtXnf=p)-c
zXdCFv-DKVLAh*A!E&p9VZ%`doHeQPT%nm*@sJ<z>xn<8tY((mAQ_1m!4BkJVbT6Sh
z5w@+SfciuNOEQKg*MD{Lg}?8==eZ}K$#=V{;`lcc<33LwSaE)lpvb;<dO_0U*<btQ
zMSFV>9a-r=VNbecOFOK(;TenQh`%1c^M3T`M8@6?r&rxB+X32RZ|pmE;&OJ8e738+
tDNB!a+<GyRFC7}0Iu|?Dy`5J^DjGk2{jZM2smDS;Sw~hr)t*`2_zyVB86^M!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xhdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..047cc68c601c688bc331e6d649ee4d79a3f7bf36
GIT binary patch
literal 1994
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
A!~g&Q

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..237956975f9e67a6ecc91a32d52b9d74d8e310c0
GIT binary patch
literal 2501
zcmbVOc{r5&9v?<Rqui)$X^c}i%)T%a!i=qEa1at@mUqlx7BgcnO_st@S;}oaCM9*1
zla$jrC6cY0&?*xVQ>U&D8BUFIbzhb4z0cEg{<!b+yubDP`7WRD_xnC?L2#g-v5}<_
z1OhP*@TY}<bL`w}pbw722UA_a$wKB6DGL>GWvNUF0P*68SO7dgz>EVz0466r=_cR?
zfk0FEVUe;(2A#qd2~f;A8C04;45A?rw{>Y^COZL;!C62YU+9h)ztV(&^EvK_2qFW+
z5K{pj-#<eFgk}VWu`?3bWDa7T2iz@<0xA#yGA2AtkSLT=(%ccB^isg}+%Xyf|0E(y
za7TQ0Dv}Wlr-~#1oQNVJ*%&MV?m|Xki6j@Yi!&St?$H=mG!BErkSRnw1%rcsc@UsA
z35QDwq4|EX1@7DtJef>PL8DVsQ&FjSlt>bX#*)coGzN#p;gFyNQkpK5G1HJjsolH=
z8X#p$_+lAfB!tgtWU@rbGIs>%>E{pxVg}=@Vxja4Q6OdLG^QAhMPbka!CYLQq@}VD
z;6HABQ(799E(XvcfK-$$VT1YL+RcMO?*7`)oFM28B}l>tlfq1-iP*^kKqw2Kxg)?E
z6o=2DkZ=S%*M-SK61X63Ob!7YxBwnW#BiAeG6_S%vGDVHzKJK1NEjC{7m_!Dh{gI4
z$TVMqj~CwC+ZRW~d3(FgV*`Xz8B@px=56!mY=6d*{t`=}N&u!zBncCV66dQRm?x5n
zq&$%rPNjazI@}?GFXV_)rH*rH`W!V4knmFgj;}-{fPdnd!vBU31Q#xW4Y;z9Og5H_
zWa0@#B#VS4AUSLnj=;iW*hCB%|7Ses|K$%2I)$Dqmj5cA`6I9*=ayev0o;6TCO`;w
zkOXWMa_YjT5Xge(0W`0$G}Y^vnEZ_!&9>lYO&Is7<emO6mNYt6nc3x<t8(;1V2EAQ
zhxh0Gpk#bs7`*Cgc&u_N_CaWT&yoT~-W1+|=zZp)n?p-jNCDn^=i<D+qJ*U0=I4Po
z+~dYC^*;T*|Ih0k7-fHb@9eeAx8r@I7a4TA+}1|L(8V{yFb8$G^6M}R6vmZX#A2XI
zNRAEn#cb<Pf@)$QCwgymc69F5MdXF)i!PLX95>Q@ufb^|)EJ3Dy3sUL^IKG_(-z}I
z&orgaTlgy9TJIE&mTq6>apmGO5xY}I{e#-R^T$VejJ8De8g-Id)agM|P={12x1IC2
z_BIKX&|m=(n@X%SZW<HK@n-BLsm1QgN`W=?wuL8SFtk7XzKb*~*ZhUF?}qhlWjI!G
zWNk;5us-yq^ga317|zOb@O(_CXtw$UU1tNiVc>9TPPxux@m9pv_1nh0>KZ%ix}1L0
zk!`N<t#$61;jQlIkC8zi**1BmEEAWi+UkCG`iBnTk%u#(d|%$;+8d`TEj;mk?@H<w
z+JkM$uN(_?9tdqbyX2Z!{h+76g}TJ*X#8LI0nN`#?e3Mer#yqKbLQ<nQq7(<(CaPv
z&iHY`)g`y~eMt8{v|q=mxSKjUM6Q)C)$h5ueaB78fb%g;R>A5;hR}v=rK)SRbA?&!
z3EW$w=-vOEIobM4Z)&Bc&=c@4UOzCNsav@9+=s^A$qcmJV2-MG^ZvDR5@F0_d6VVK
zK%Q9>LTn#AP_g%+-reBWo0t>SLp=^zjfNY$6GZPU%HNy6anK4*)9t~d1M=axe`Vs8
z0P=zH<6%eTX?ei4;h^CQaWM@%D^I~-RJWqWVy#z%>4m~Urykh3<Ubb07(a&Ko}?V7
z_n7UF5PtQ#FDGWNJbBSjHJr)6H>N$bv4u)=G-VY8rS<p(t$@DVbms}Q=>B#_zN5!8
zlDg4SKR0?pMzn3vcBwAQP9Cp#b>>k)zf!ML+hjRxTFx^+Z_sk1E%)*8TK>pAy#Yf?
zr^>ntajlGm(&q`u?++^+JucJRqhUQ+T^$eg1QW+DCSixdd;GSTvhssoKEMoFwt8(=
zeB5KS0$NMU$B&mLoo1{|5){VDM>Dp=Oxp=CZ4G3&1IMJ@kZ(0YfE+BVI=Gt%b3Ib5
zZ8S*<wMTdHoqdjO@Slm_3luaO-?p|DhmS1QI(kji6!aTXE%k%P@@fnVDhdq=x|9=4
z$m(n6{`46$y4KRVH2d<H;f`{JwvM5VPFO=%oV6P<EL?S4@7^$*0i7M%+_i9-!IeFy
z`7MxyN-pGCOt<2SZec}lF8QbA^o~DsJoI}uIaa9s?zA3=3K4Q!Y`WJDRVGZ1BtVcG
z#wX3<C?!?Blhyd^5!+fe57p7eGd<**KZ*>Fn8f3&?&=v%_(ekFv>t;2W&2`gkZ*`P
zF_vj(6j8k|HWX#0d<b0sMAGENj(<eMm6WcmItX?6ju*h4-hVTq>ukZ&-BS*7`{Iw6
zinWBXK_lH)n5r(rC5XX9Tj*2IET<&fn`Igq>&=zrCLc3volbHg#%(0;h7*213m%?Z
zs8<0i=_=RYCGMJvrG-28jHY;LDs43jj?sjuP1W?|^rBJyGgh98hanWQR%F;(O>yf=
z&aO1~RKP;_$vd#KdYJZPEj&!;c>Nli9M!W+h!o`s>koCsc|5goRf^O?L)+Q9?mD&t
z7E>I){K;TR&G7~Z>8JB=MyyBT_gdUyHLFY87OSB{Z?wB~ceysKRA}4xn5Q3IIQ{li
zn9JXnn#?ZkxKP9n^*KvZO&Moe{c18@G^Ji+hZ6TKBA1V1bMuegoDrQC@cQqR{qnQ!
zyT6S@w{ubT``G!r!nO=k@6Y7W*INZmr)sXYR`*3_X;ynw#3$GK;1x-&54z9p*t1Na
zb>0>AB1(0)vOeBrl71kiYF1q_RcVt!pYh9|u&g=Ct53bvk=Gc|{XZX3i&%YgB?RBB
d$hXpkL0Z=N&IaofexLiX3h)V})q2Nf{~KQ^7M%b9

literal 0
HcmV?d00001


From e83ef8cb515477c1697866db4bee368d9f4e808e Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 17:04:29 +0200
Subject: [PATCH 024/138] Set proper icons for action bar in dashboard

---
 .../src/net/osmand/plus/activities/DashboardActivity.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index c711c71292..55b4aa037a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -38,7 +38,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dashboard);
 		getSupportActionBar().setTitle(R.string.app_version);
-		ColorDrawable color = new ColorDrawable(Color.parseColor("#FF9305"));
+		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
 		setupMapView();
@@ -215,11 +215,11 @@ public class DashboardActivity extends SherlockFragmentActivity {
 
 	@Override
 	public boolean onPrepareOptionsMenu(Menu menu) {
-		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.help_icon)
+		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.ic_ac_help)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_action_settings_light)
+		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.headliner_close)
+		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 		return true;
 	}

From 6b62ef553600c11927eb38545b92f0b9a23af1f2 Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 17:42:39 +0200
Subject: [PATCH 025/138] Fixed issue with favorite points duplicates

---
 OsmAnd/res/layout/dash_fav_list.xml                         | 2 +-
 OsmAnd/res/layout/dashboard.xml                             | 4 ++--
 .../src/net/osmand/plus/activities/DashboardActivity.java   | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
index d477e14185..23a77fd644 100644
--- a/OsmAnd/res/layout/dash_fav_list.xml
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="horizontal"
 			  android:layout_width="match_parent"
-			  android:background="@color/color_white"
+			  android:background="@drawable/dashboard_button"
 			  android:layout_marginTop="1dp"
 			  android:layout_height="50dp">
 	<ImageView android:id="@+id/icon"
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index c69f14b6cd..bde48aab45 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -11,7 +11,7 @@
 
 		<LinearLayout android:id="@+id/search"
 					  android:orientation="vertical"
-					  android:layout_width="fill_parent"
+					  android:layout_width="match_parent"
 					  android:layout_height="wrap_content"
 					  android:background="@drawable/bg_cardui"
 					  android:layout_marginBottom="6dp">
@@ -22,7 +22,7 @@
 					  android:layout_height="38dp"
 					  android:layout_width="wrap_content"/>
 			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
+						  android:layout_width="match_parent"
 						  android:background="@color/dashboard_divider"
 						  android:layout_height="90dp">
 				<Button android:id="@+id/poi"
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 55b4aa037a..e8c9e45afb 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -37,7 +37,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dashboard);
-		getSupportActionBar().setTitle(R.string.app_version);
+		getSupportActionBar().setTitle(R.string.app_name);
 		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
@@ -64,6 +64,8 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	private void setupFavorites(){
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		final List<FavouritePoint> points = helper.getFavouritePoints();
+		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
+		favorites.removeAllViews();
 		if (points.size() == 0){
 			(findViewById(R.id.main_fav)).setVisibility(View.GONE);
 			return;
@@ -75,7 +77,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 			}
 		}
 
-		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
+
 		for (final FavouritePoint point : points) {
 			LayoutInflater inflater = getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_fav_list, null, false);

From 64b8c6e0a4be4a12df1b6b81ab175c88c43a3283 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Thu, 13 Nov 2014 17:59:17 +0200
Subject: [PATCH 026/138] Fix 9patch.

---
 OsmAnd/res/drawable-hdpi/bg_cardui.9.png   | Bin 1426 -> 1429 bytes
 OsmAnd/res/drawable-mdpi/bg_cardui.9.png   | Bin 1385 -> 1385 bytes
 OsmAnd/res/drawable-xhdpi/bg_cardui.9.png  | Bin 1468 -> 1469 bytes
 OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png | Bin 1490 -> 1494 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/OsmAnd/res/drawable-hdpi/bg_cardui.9.png b/OsmAnd/res/drawable-hdpi/bg_cardui.9.png
index c589b465f09ae9c662764cfee8472bfe3376bbbc..035983f72eb122d6a521694d54e358903e66c5ec 100644
GIT binary patch
delta 591
zcmbQlJ(YVy9Fu~%k)^qjg{za9lZlI=p{t3bi-C)ai-Eb3tEscGp|k1aIwl#IB1fEx
zb}^->B%39g8kr@f=q9Blndq8WnwaZaT9_s4ni!j!83Tc-aa!7BC+4Pl-K<y23=E80
zJzX3_DsG(#JL`AYfG6*cqq(AQjKxO=8|V2`=S!Q%b);v6Dq0xMVqu?jsx)`ovZ-xL
z{m))I5<h3hznm_c&nY?2^vopRpPlIY=j;8z<+mpH?=`qKPf1gC0YhtyQt?MmLnSk=
zL?z9W`3kc=KCd|JGQ&gn_7R6Yg7r$QO_Lmyrg7xD2-b`DRJfe#FBUF5c;fQ!Cd(}>
z@r7~n_a)!v311W|Y~8W$^{;KYx7D-Xw%Z>(w8y}H4fpHC^K-v&zwv7O%^mnwp!$gK
zWfOk8!xMfOuIaBUd$Og@qgNpFfa;<{bN4eHsC#$({hVt3)1Ua-=XW^UJhQuN%~5Vu
zuM)_YxM7E%uU$Zw^Qk+kVVmCXey}7eFd}J^{$!86K^h5)ni)%lja(8ot~el58sW&M
z?tb9vAzhW?E+*cIpANkZ?}!MMdRrl@d244{YleEcRUr2oo&3n>zjmK9TKPFjsrSjs
z*Sn_61g+V7-lcHPH2E#x!a`Cvyttpt`_3<9re4UIbgkgRsfJE!%Y}A?_y<p1UjBMV
z$7j3c>W}A~JIM7nNO7z7m)~D>CO`k;(dYVo|E`0ZzwS+c{o%USzg6$^8QB<aE{MqK
TzqV0^0SG)@{an^LB{Ts5!IS=s

delta 588
zcmbQrJ&Aim9Fu~RrJ<#<ftjnBrKORfp{t3bi;1(Fk)^Ado27|`tEKVeIwl#IA{U&B
zb}^->7#f+RSQ;3l=^7*(80#jRm>BCOnOd0Znwp!LCt8@8r5P9`PIh8$s+ZZD|CWJ)
zag(QuV@SoVGvVHT%!WL3Em|{MLpCNJWwdZUe=7ZWA9rC}m@<oY!lVZsJBngwmk9-I
zOi{h;`A6vX<LA59`3cS5y>fQ!(dzOC0``B)F03#;RT=c`+KQ$khII)I*$EqaV#*ul
zGI}V?vt_nsS^JocbAm&&#SyWJWq0aDW>hVc+Q25!RrYkJ@B!-um*#F>l+HBgUiqPf
zgkO=@dY{hSoaF6Le1-eU>8n|#dvE5*IdSB_<T&~I)2}`H@Ab=`9o0Kgv*5?mXx)J6
zE5cuY{iPSm!F2!m-=pW6Do<ygbk?(VfBW&td4>&hetkSH5x@7lxkat}UyVFDO_2ph
zN@mx)m^MV7vNQg9K!b0}PTfaaEs6qGYi#LAJ1v-D#KmgT)D&1F6f(iVc;x|+vLCEc
zcZwTRx^HlZ@v;>y*wB*FK23U+Px4OlO^af+9e2Ks^Z9;*N&B?-)cF11SshDHdM%Ny
zl4^Unl1(K0y>jxLjHm4D_u8gQ>ipUs(cG>anReoJAnWNblTznQIvK(g{c}o}O@Hnb
z6}{hcCZ5f<YG3fhd+xP$AKn{x`pmne>{__{|5e_3Yu?*Nw*P<rKXo6A1jBLTumasP
RidhUm;OXk;vd$@?2>{=5{igr`

diff --git a/OsmAnd/res/drawable-mdpi/bg_cardui.9.png b/OsmAnd/res/drawable-mdpi/bg_cardui.9.png
index e206978a9fdc08b780a44d2d59eb8ebbb2e36441..3232a33d7c5b270fb7e5c700d5a92d9e39929582 100644
GIT binary patch
delta 547
zcmaFK^^$8t9Fu~%qnVMTv5AwJlZlI=p{t37qmi?-p}C2ZiLtYRnX|#<Iwl#IB1fEx
zb}^->B%39g8kr@f=q9Blndq8WnwaZaT9_s4ni!j!83Tc-aa!7BC+4R5F4yL*3=E8&
zo-U3d6}OH|i}X8Uz|%IH)sWvt@rddUq4Ec-LU*z>?_gNe>1lHEL~`Bs$t;;VkuMkh
z*u43MS@3*;YO}SIeIMHwFIA4dueLvNMt>T+&nb?Fatx~jPv7G$aBD8=<#@xmVU=i?
z%ms&ujGj$fpO&&dnc=mgB`hEztNs+nbaB_||L;x}Y_tqvy1v9db<F|$iQx%tGL!67
zYUe!vY1;C^m3Py+*Y5MCKNq)dPugzf?dBlc{lQMMqWqlg_IroltoZ&<)wXVPhjXkT
zH{Yd7{pyCxnU5ylnABaIFjYJFpz@<B&E;*UPUkl|uWjO+J8|NoYAdeR^4m>QT7?|y
z`&X2?Eq)o-G~0pK<KB{~OOMUsetTo?5nCm}8+#fiP4aeMC>ScKdui4lca?^WhmMa9
zOmRA#F8<a;pX0-`d0{Vh>70%>D#&4x`)o7uiRUzv5dXXO*Dfo3o4&`wW1?jscY(wU
znMEvFZ@D&#HS3rA_lsP#{pvN_Bk85vZpR(Vt7|phUtzfWwmJXO!`a%Oo_l0Af6_j{
YkY)Lwf0zAwVFn=ZboFyt=akR{02t2Y761SM

delta 547
zcmaFK^^$8t9Fu~xfw7aBo28qXrKORfp{t3LtAVStv8$t-vx%FbxvTl)Iwl#IB3GP>
zb}^->7#f+RSQ;3l=^7*(80#jRm>BCOnOd0Znwp!LCt8@8r5P9`PIh8$s(*iEZ3P1Z
zW2dK!V@SoVBhv!?4jb^ay;kY4{m>#X{ejn=#?@hWRV5xVb*L#`oOH@~fA}PYvy-Og
zh5os@GI{ngyUsT=qs)UJTmM?DeEr|-JEDhcmdX}{gmIKJMD$91o84e6H6`02fxRKL
zH{eMF8yAm+YJ_!Mw8ONOE#4WdmCNcw!YcM??E3R=-5QQF3x#&5{ng86{nxdJ$@s~H
zFN!Z8+nis2@Avr|3a@wVdtO^vzp+@O%sk!GLAU#Zouoxn_WbDgiDg$TzfY3eA8}-#
zi!`stlDE;{7?yuNrvA}W@6!Q|@MTTzN3=S(J3f7Ceqdpkqo=!3P>H|$!Vh`U0h<CC
zU(^ep^^@sc_M0P*Ni|^4;%n2Ss`WNGr!6n&_h2y7?=#ohS|TD9F#V#^+N0GjHXUMW
zLhQ?gUfJ);cwQUVkofJC#`V<5dy^W2l|M}Reo{$4TI$vEZ}Puair+W4n&{DJ87RF$
zeuhjFOV(qr6lFI1ck?7Q7yN!V#n7;8vGiQFhvs)RW>+s~d+|=DW-{k|wpUr(d*vC~
Z7?#fYFSy74z#;}9@O1TaS?83{1OP7b;-LTl

diff --git a/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png
index 5de19064b58ff8ca7e181e8a2513b5bb4f0041bc..ce357bfa94814b85a8b7020dd70e7f65aa80aaed 100644
GIT binary patch
delta 631
zcmdnPy_b7K9Fu~XqqD1pi-Dz?lZlI=p{t37sk4Ebv74)<ld++jk*WFQIwl#IA`6^~
zb}^->B%39g8kr@f=q9Blndq8WnwaZaT9_s4ni!j!83Tc-aa!7BC+4R5&(W(cF)%RR
z^>lFzskn6{Jl5~90na)A_GOAJLJEEdG$%YLD(K&vv%cE7Biw>@`-(7urlrT^G(TOk
zhz(+yXty;gss5+Y@v^O2(g*I9uG^?L=lUVGD{}i+XB~KXVX`%QBTt)$^YUZ+i<fv<
zMs@BH3dwTIkZ>vzReZHT($K@JwBEsE1COGm`qPv?N7gRKpj(#fm<m2gWV&zpc;Vm5
z8*EkXw*+Ms(mIll{4CnJCvyGu{&PFSJ$Pm<FWoZl&7Qw!ey_ffrl>MkVOfXrk(Wsu
zcetgSrtn1hm!-V_>$CU1#>!MJe*y8*SbK+q3f7yx*I8}drhIkc<GDXvgYSIpHhgAK
zZ~k~o?(ej<dyiZ%Kf?a#^8fv}6O21wY*lT!?O~E8#&Y+Zsd485qpUj}vFqn^cBIJ0
zPCC)5a{04mnD0lyKin((RI)v$F6)^k{WY`YXzmiPl>0LL9<uonx-$2+FY9=F`<&sW
zxs#1Kr>@JK^;{@uOLfu`+pUI6V~^fg6Sg|~PU+m5m7CmlThDKF+In#T*XlDjYwY$P
zim9@n@*{KJwTo4ogje-E+BrQw?YH;WlEa_YKF-osd^N@V0iU;3`wQI_E$i0yt~l{_
zqC;2QU-r8R>rG{|mL31HH%NX@xavh#S-YN}Ya}MuyWWpy;$b)zK2bQsp|zL+2s~Z=
KT-G@yGywp{0T%-R

delta 630
zcmdnXy@z{49Fu~Rk-3qnk&%m;rKORfp{t3bp_ze`fvJn5iHn7)i>1@#Iwl#IB4?b6
zb}^->7#f+RSQ;3l=^7*(80#jRm>BCOnOd0Znwp!LCt8@8r5P9`PIh8$s=r=4rI3Mv
z@s6j9V@SoVBjK@rhYfi8CiD3^bEr7XX$V$0`1FBX_072NZ362HxbgzmDzJF>@}7LM
z)YChtPN_C(>y3Y(mUg~v(vsGgr+8hG>$&1ahOfQ<Lrn!rUWBt9XOZNa*ygykdfE%+
zsTsjfLY-7OoOA^yt>&1>&XMG!*;?N)A(6$Y$W!a&ng%YBWUrO{F{~4w7zX)oDP;J*
z`UsO%^sCNq9L9$fAC~NliCcU9b#?Yz<8M6k(yh0p+dsE2{<!Ky()K07ho%%bSj6dw
zO&3{ntmojjH^=|!ox5_hcaqe?PaOqe*T2e&@qA0J7eBt*be@RPZR<j};Ha;YuT|Nb
z*FWBp`#Y(}a{2M_L(&iL?v1bezM|T1y{6(Ho6e~7P0rhk&z78Dcq!{nN9_8yEN+|l
zrl@>!nZ((cd{rd>;Qk3tDv`<YnWt9lG;Hvb*gjEfVr}ss(U-UHZHS84mG3Kfd-{CQ
zCDzu<t3z%r%arr>IQiajLfMsLQ+{=Aj9eRbeakDW>flu0I&(ed)~v<tT5F8dKmYvG
zRP^#~z@z7t+mfrld56sOyUnQd@xP1h-Hw{<rMI*SUri~V!02t&{z7+!P;9hx;KbX?
ziLbsKk}qkVd#z-}Ou5V7m;HK>A1b8r;zQw?^rP!*PS<c4FmSK!lMs0=m%{)Ap00i_
I>zopr0Llpv&Hw-a

diff --git a/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png
index 688a197b3aa5f25028aff5dbd1e21469cd3a30bf..97fe3d89f1cef2cdb0d68870129cd21b2f2fdc4d 100644
GIT binary patch
delta 657
zcmcb_eT{oV9Fu~Xk%6VLk+FrDlZlI=p{t37p_!Ajfs3Psfs2WYk-6jKIwl#IB6FOI
zb}^->B%39g8kr@f=q9Blndq8WnwaZaT9_s4ni!j!83Tc-aa!7BC+4PlhEVf+3=E9l
zJY5_^DsG*bcGi!{k*DG1h6kIDBqa54itnxX*cMm8Bkv)s-*Vh=U%OhI19Q3DftFSc
z>*VY-&y~i%jX&m3YP-4g?e@8Ex3#+6Fv{UC?R_}=>l5ayWo&%1A8tr68oTlfh%#7)
z+}x|xkhS}I>O^-|hXeuDZx0xr)$do3d&F&_#W=}i<_aba&tpp-GP|=LkP$I__<*f=
z4zqdK0-iep@7J|%YQN-a>0l|v!>0cE=N~iQ%j#=Ovu-TP-sS&)vfRt)-Rr(y7FxcU
z`P|~{#VQ)MMFw*H`qy87y%G|!;=9i;u{)dVZoO$KTVQiaB31rrfrZSxMT^CQlPB8M
z-<-Jjt8jP5+zUtK&Kt_k<cvsh|8~t^Y2m4le%m{*y#K!5DQn5r>|b`qPfy&lu?}5+
z*^<BUSYgevzbCww$z<+nWp>bJSvAEg#vpvj{%!wwxaRdOG!(qwJZr6C{u;U2i#&Q)
zEUwxb<?FN{!~AKTN=)Uhqv;ppbi}?Z25i}#+&aJh_t$H8=XSYVytc+eIJ((ed(!rA
zeQt}pS0!9h{<~`Hba&~UyUyg8?T*u%&L25#Z;?Rk<G=2I{vW%Xs&q5;LHn<lZF_^~
zdAOMsD$AVgxz|ypC2Sykxw(w7_Oe37v1zM}Cvm5(>RC`E#bPMh^tdG^Q1brrPp^yL
l@1Ola+mhqsUq!J44C?o9JeGd<!kz&LJYD@<);T3K0RS459-06E

delta 653
zcmcb{eTjQR9Fu~hvw@S7vzwEdrKORfp{t3Lxw(t0tC^d*fr*8oqk-GxIwl#IB1fEx
zb}^->7#f+RSQ;3l=^7*(80#jRm>BCOnOd0Znwp!LCt8@8r5P9`PIh8$sy`B`q`<(y
z_{r17F{I+wndxW!4mk)kSbHA~N-|J9*3uofr@~p^rj36|r}&}A68D{j^%pc+^Cvhd
zdhI?pLw6?6?!PxXcARX<wKk4Vx3;!+cwlZa+c`G*N2={lr>%1vUD;*Kq7IZ?<ZfYg
z;0sM#$F*SQ%=FZW?W_(70;<mv80(+ySBOhumzl=kDdiKwI7KB@Xvcv>Mg#U%9}A0w
zzTyYRIHoi*e|$Sj!(Bsmitv=n2NMeH=AW0Jq*8fylg`DQ3#NCMKVRbh>)5*FKPKEo
ziPEv$s%|eQHGizA*&Mfi`L06_d(AJIKUnwia+3Cw9wR49x0k%_hq+6>tjp%Pq;9>b
z-n>pJe2a|K?5CECRWHjmzd3R5N2h8?<bm5RufG4@ZfAPwhH1=gpU6$-=l!ncZC_ur
zAW$T>$bQo#O>e3EhYT0KG-@qPlGeFzre$%!LPA7F-L0+j$J5dqS$|Ky`grbnuvvuO
z>Z@6gm|b^keph~Ysxa!0$lIeyAD;jP+{1qCykDOs+PP?L<V3Y)Y}3P3(%;JVx?K-F
z2=q{Bwtm0ambpfoZ@$Uf8DqCR^VdPglHTv}AAatAJcToL%7*2iOAhbT^jFd4FVvMe
z*>kU>N=w*4^saLn^R8Wv1zU7Ot5u|Z!ZRIH%{dlnvz+F-x#-fmwV$5XzTf})!}o9T
e&!QU`84CXjU3yjKGozLP2s~Z=T-G@yGywoU)fUwN


From 93b89d6a81b890bb26401c9319e2113834a00cf6 Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 18:06:48 +0200
Subject: [PATCH 027/138] Added version to dashboard in actionbar

---
 OsmAnd/res/values/no_translate.xml                           | 1 +
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 073257a582..b002279e27 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+    <string name="app_name_ver">OsmAnd 1.9</string>
     <string name="app_name">OsmAnd~</string>
 
     <!--
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index e8c9e45afb..3b5ffbbf56 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -37,7 +37,7 @@ public class DashboardActivity extends SherlockFragmentActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dashboard);
-		getSupportActionBar().setTitle(R.string.app_name);
+		getSupportActionBar().setTitle(R.string.app_name_ver);
 		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);

From ccf17a4c511bc4206250cfa8d596fd7747a6fabe Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Thu, 13 Nov 2014 18:57:59 +0200
Subject: [PATCH 028/138] Refactored dividers in dashboard

---
 OsmAnd/res/drawable/dashboard_button.xml      |   1 -
 OsmAnd/res/layout/dash_fav_list.xml           |  53 +++--
 OsmAnd/res/layout/dashboard.xml               | 222 ++++++++++--------
 OsmAnd/res/values/styles.xml                  |   1 -
 .../plus/activities/DashboardActivity.java    |   5 -
 5 files changed, 148 insertions(+), 134 deletions(-)

diff --git a/OsmAnd/res/drawable/dashboard_button.xml b/OsmAnd/res/drawable/dashboard_button.xml
index d0c9084828..8095342d73 100644
--- a/OsmAnd/res/drawable/dashboard_button.xml
+++ b/OsmAnd/res/drawable/dashboard_button.xml
@@ -3,5 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:drawable="@color/dashboard_divider" android:state_selected="true"></item>
 	<item android:drawable="@color/dashboard_divider" android:state_pressed="true"></item>
-	<item android:drawable="@color/color_white"></item>
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
index 23a77fd644..01ad0665a1 100644
--- a/OsmAnd/res/layout/dash_fav_list.xml
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -1,32 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
+			  android:orientation="vertical"
 			  android:layout_width="match_parent"
 			  android:background="@drawable/dashboard_button"
-			  android:layout_marginTop="1dp"
 			  android:layout_height="50dp">
-	<ImageView android:id="@+id/icon"
-			   android:layout_gravity="center_vertical"
-			   android:layout_marginLeft="12dp"
-			   android:layout_marginRight="12dp"
-			   android:layout_width="28dp"
-			   android:layout_height="28dp"/>
+    <View android:layout_width="match_parent"
+          android:background="@color/dashboard_divider"
+          android:layout_height="1dp"/>
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+        <ImageView android:id="@+id/icon"
+                   android:layout_gravity="center_vertical"
+                   android:layout_marginLeft="12dp"
+                   android:layout_marginRight="12dp"
+                   android:layout_width="28dp"
+                   android:layout_height="28dp"/>
+
+        <LinearLayout android:orientation="vertical"
+                      android:layout_gravity="center_vertical"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content">
+            <TextView android:id="@+id/name"
+                      android:textSize="16sp"
+                      android:textColor="@color/dashboard_black"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+            <TextView android:id="@+id/distance"
+                      android:textSize="12sp"
+                      android:textColor="@color/dashboard_blue"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+        </LinearLayout>
+    </LinearLayout>
 
-	<LinearLayout android:orientation="vertical"
-				  android:layout_gravity="center_vertical"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content">
-		<TextView android:id="@+id/name"
-				  android:textSize="16sp"
-				  android:textColor="@color/dashboard_black"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"/>
-		<TextView android:id="@+id/distance"
-				  android:textSize="12sp"
-				  android:textColor="@color/dashboard_blue"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"/>
-	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index bde48aab45..3261c3471f 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -1,112 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:background="@color/dashboard_background"
-			xmlns:android="http://schemas.android.com/apk/res/android">
+            android:layout_height="fill_parent"
+            android:background="@color/dashboard_background"
+            xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<LinearLayout android:orientation="vertical"
-				  android:padding="6dp"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
+    <LinearLayout android:orientation="vertical"
+                  android:padding="6dp"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
 
-		<LinearLayout android:id="@+id/search"
-					  android:orientation="vertical"
-					  android:layout_width="match_parent"
-					  android:layout_height="wrap_content"
-					  android:background="@drawable/bg_cardui"
-					  android:layout_marginBottom="6dp">
-			<TextView android:id="@+id/search_for"
-					  android:text="@string/search_for"
-					  style="@style/DashboardSubHeader"
-					  android:gravity="center_vertical"
-					  android:layout_height="38dp"
-					  android:layout_width="wrap_content"/>
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="match_parent"
-						  android:background="@color/dashboard_divider"
-						  android:layout_height="90dp">
-				<Button android:id="@+id/poi"
-						android:text="@string/poi"
-						android:drawableTop="@drawable/ic_action_info2"
-						style="@style/DashboardSearchButton"/>
-				<Button android:id="@+id/address"
-						android:text="@string/address"
-						android:layout_marginRight="1dp"
-						android:layout_marginLeft="1dp"
-						android:drawableTop="@drawable/ic_action_home2"
-						style="@style/DashboardSearchButton"/>
-				<Button android:id="@+id/coord"
-						android:text="@string/coordinates"
-						android:drawableTop="@drawable/ic_action_marker2"
-						style="@style/DashboardSearchButton"/>
-			</LinearLayout>
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
-						  android:background="@color/dashboard_divider"
-						  android:layout_height="90dp">
-				<Button android:id="@+id/fav_btn"
-						android:text="@string/my_favorites"
-						android:drawableTop="@drawable/ic_action_fav2"
-						style="@style/DashboardSearchButton"/>
-				<Button android:id="@+id/history"
-						android:text="@string/history"
-						android:drawableTop="@drawable/ic_action_history2"
-						android:layout_marginRight="1dp"
-						android:layout_marginLeft="1dp"
-						style="@style/DashboardSearchButton"/>
-				<Button android:id="@+id/transport"
-						android:text="@string/rendering_category_transport"
-						android:drawableTop="@drawable/ic_action_bus2"
-						style="@style/DashboardSearchButton"/>
-			</LinearLayout>
-		</LinearLayout>
-
-		<LinearLayout android:orientation="vertical"
-					  android:background="@drawable/bg_cardui"
-					  android:layout_marginBottom="6dp"
-					  android:layout_width="fill_parent"
-					  android:layout_height="wrap_content">
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
-						  android:layout_height="38dp">
-				<TextView android:id="@+id/map_text"
-						  android:text="@string/map_Button"
-						  style="@style/DashboardSubHeader"/>
-				<Button android:id="@+id/show_map"
-						android:text="@string/show_map"
-						style="@style/DashboardGeneralButton"/>
-			</LinearLayout>
-
-			<net.osmand.plus.views.OsmAndMapSurfaceView
-					android:id="@+id/MapView"
-					android:layout_width="fill_parent"
-					android:layout_height="110dp"
-					android:contentDescription="@string/map_view"
-					android:visibility="gone"/>
-		</LinearLayout>
-
-		<LinearLayout android:id="@+id/main_fav"
+        <LinearLayout android:id="@+id/search"
+                      android:orientation="vertical"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
                       android:background="@drawable/bg_cardui"
-					  android:layout_width="fill_parent"
-					  android:layout_height="wrap_content"
-					  android:orientation="vertical">
-			<LinearLayout android:orientation="horizontal"
-						  android:layout_width="fill_parent"
-						  android:layout_height="38dp">
-				<TextView android:id="@+id/fav_text"
-						  android:text="@string/my_data_Button"
-						  style="@style/DashboardSubHeader"/>
-				<Button android:id="@+id/show_all"
-						android:text="@string/show_all"
-						style="@style/DashboardGeneralButton"/>
+                      android:layout_marginBottom="6dp">
+            <TextView android:id="@+id/search_for"
+                      android:text="@string/search_for"
+                      style="@style/DashboardSubHeader"
+                      android:gravity="center_vertical"
+                      android:layout_height="38dp"
+                      android:layout_width="wrap_content"/>
+            <View android:layout_width="match_parent"
+                  android:background="@color/dashboard_divider"
+                  android:layout_height="1dp"/>
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="match_parent"
+                          android:layout_height="90dp">
+                <Button android:id="@+id/poi"
+                        android:text="@string/poi"
+                        android:drawableTop="@drawable/ic_action_info2"
+                        style="@style/DashboardSearchButton"/>
+                <View android:layout_width="1dp"
+                      android:background="@color/dashboard_divider"
+                      android:layout_height="match_parent"/>
+                <Button android:id="@+id/address"
+                        android:text="@string/address"
+                        android:drawableTop="@drawable/ic_action_home2"
+                        style="@style/DashboardSearchButton"/>
+                <View android:layout_width="1dp"
+                      android:background="@color/dashboard_divider"
+                      android:layout_height="match_parent"/>
+                <Button android:id="@+id/coord"
+                        android:text="@string/coordinates"
+                        android:drawableTop="@drawable/ic_action_marker2"
+                        style="@style/DashboardSearchButton"/>
+            </LinearLayout>
+            <View android:layout_width="match_parent"
+                  android:background="@color/dashboard_divider"
+                  android:layout_height="1dp"/>
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="90dp">
+                <Button android:id="@+id/fav_btn"
+                        android:text="@string/my_favorites"
+                        android:drawableTop="@drawable/ic_action_fav2"
+                        style="@style/DashboardSearchButton"/>
+                <View android:layout_width="1dp"
+                      android:background="@color/dashboard_divider"
+                      android:layout_height="match_parent"/>
+                <Button android:id="@+id/history"
+                        android:text="@string/history"
+                        android:drawableTop="@drawable/ic_action_history2"
+                        style="@style/DashboardSearchButton"/>
+                <View android:layout_width="1dp"
+                      android:background="@color/dashboard_divider"
+                      android:layout_height="match_parent"/>
+                <Button android:id="@+id/transport"
+                        android:text="@string/rendering_category_transport"
+                        android:drawableTop="@drawable/ic_action_bus2"
+                        style="@style/DashboardSearchButton"/>
+            </LinearLayout>
+        </LinearLayout>
 
-			</LinearLayout>
-			<LinearLayout android:id="@+id/favorites"
-						  android:orientation="vertical"
-						  android:layout_width="fill_parent"
-						  android:layout_height="wrap_content"
-						  android:background="@color/dashboard_divider"/>
-		</LinearLayout>
+        <LinearLayout android:orientation="vertical"
+                      android:background="@drawable/bg_cardui"
+                      android:layout_marginBottom="6dp"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content">
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="38dp">
+                <TextView android:id="@+id/map_text"
+                          android:text="@string/map_Button"
+                          style="@style/DashboardSubHeader"/>
+                <Button android:id="@+id/show_map"
+                        android:text="@string/show_map"
+                        style="@style/DashboardGeneralButton"/>
+            </LinearLayout>
 
-	</LinearLayout>
+            <net.osmand.plus.views.OsmAndMapSurfaceView
+                    android:id="@+id/MapView"
+                    android:layout_width="fill_parent"
+                    android:layout_height="110dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_marginBottom="2dp"
+                    android:contentDescription="@string/map_view"
+                    android:visibility="gone"/>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/main_fav"
+                      android:background="@drawable/bg_cardui"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical">
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="38dp">
+                <TextView android:id="@+id/fav_text"
+                          android:text="@string/my_data_Button"
+                          style="@style/DashboardSubHeader"/>
+                <Button android:id="@+id/show_all"
+                        android:text="@string/show_all"
+                        style="@style/DashboardGeneralButton"/>
+
+            </LinearLayout>
+            <LinearLayout android:id="@+id/favorites"
+                          android:orientation="vertical"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 0bc08446ac..910e4d3c56 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -36,7 +36,6 @@
 		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">@color/dashboard_black</item>
 		<item name="android:background">@drawable/dashboard_button</item>
-		<item name="android:layout_marginTop">1dp</item>
 	</style>
 
 	<style name="ListText">
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 3b5ffbbf56..3122c79c65 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -101,11 +101,6 @@ public class DashboardActivity extends SherlockFragmentActivity {
 					startActivityForResult(mapIndent, 0);
 				}
 			});
-			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
-			int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, getResources().getDisplayMetrics());
-			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
-			lp.setMargins(0, margin, 0, 0);
-			view.setLayoutParams(lp);
 			favorites.addView(view);
 		}
 	}

From 0b8406572be9933e2c0c020affac32e7b00fc004 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 14 Nov 2014 14:03:00 +0200
Subject: [PATCH 029/138] Fix layout.

---
 OsmAnd/res/layout/dashboard.xml | 8 ++++----
 OsmAnd/res/values/styles.xml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 3261c3471f..ccb12c6e7f 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -19,7 +19,7 @@
                       android:text="@string/search_for"
                       style="@style/DashboardSubHeader"
                       android:gravity="center_vertical"
-                      android:layout_height="38dp"
+                      android:layout_height="40dp"
                       android:layout_width="wrap_content"/>
             <View android:layout_width="match_parent"
                   android:background="@color/dashboard_divider"
@@ -80,7 +80,7 @@
                       android:layout_height="wrap_content">
             <LinearLayout android:orientation="horizontal"
                           android:layout_width="fill_parent"
-                          android:layout_height="38dp">
+                          android:layout_height="40dp">
                 <TextView android:id="@+id/map_text"
                           android:text="@string/map_Button"
                           style="@style/DashboardSubHeader"/>
@@ -107,7 +107,7 @@
                       android:orientation="vertical">
             <LinearLayout android:orientation="horizontal"
                           android:layout_width="fill_parent"
-                          android:layout_height="38dp">
+                          android:layout_height="40dp">
                 <TextView android:id="@+id/fav_text"
                           android:text="@string/my_data_Button"
                           style="@style/DashboardSubHeader"/>
@@ -119,7 +119,7 @@
             <LinearLayout android:id="@+id/favorites"
                           android:orientation="vertical"
                           android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"/>
+                          android:layout_height="50dp"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 910e4d3c56..c0742cefbe 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -14,7 +14,7 @@
 		<item name="android:layout_height">fill_parent</item>
 		<item name="android:gravity">center_vertical</item>
 		<item name="android:textColor">@color/dashboard_black</item>
-		<item name="android:layout_marginLeft">16dp</item>ll
+		<item name="android:layout_marginLeft">15dp</item>ll
 		<item name="android:textSize">14sp</item>
 	</style>
 
@@ -29,7 +29,7 @@
 	</style>
 
 	<style name="DashboardSearchButton">
-		<item name="android:paddingTop">10dp</item>
+		<item name="android:paddingTop">17dp</item>
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_weight">1</item>

From 9d1e94cb252d5035d38124e25c857ff6b0d1f417 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 14 Nov 2014 15:04:26 +0200
Subject: [PATCH 030/138] Fix Dashboard layout styles.

---
 OsmAnd/res/values/styles.xml | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index c0742cefbe..ef697b3ea4 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -12,33 +12,34 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:layout_height">fill_parent</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:textColor">@color/dashboard_black</item>
-		<item name="android:layout_marginLeft">15dp</item>ll
-		<item name="android:textSize">14sp</item>
-	</style>
+        <item name="android:paddingTop">11dp</item>
+        <!--<item name="android:gravity">center_vertical</item>-->
+        <item name="android:textColor">@color/dashboard_black</item>
+        <item name="android:layout_marginLeft">15dp</item>ll
+        <item name="android:textSize">14sp</item>
+    </style>
 
-	<style name="DashboardGeneralButton">
-		<item name="android:layout_marginRight">16dp</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">36dp</item>
+    <style name="DashboardGeneralButton">
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">36dp</item>
         <item name="android:layout_gravity">center_vertical</item>
-		<item name="android:textSize">12sp</item>
-		<item name="android:textColor">@color/dashboard_blue</item>
-		<item name="android:background">@drawable/dashboard_button</item>
-	</style>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/dashboard_blue</item>
+        <item name="android:background">@drawable/dashboard_button</item>
+    </style>
 
-	<style name="DashboardSearchButton">
-		<item name="android:paddingTop">17dp</item>
-		<item name="android:layout_width">0dp</item>
-		<item name="android:layout_height">match_parent</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:textSize">12sp</item>
-		<item name="android:textColor">@color/dashboard_black</item>
-		<item name="android:background">@drawable/dashboard_button</item>
-	</style>
+    <style name="DashboardSearchButton">
+        <item name="android:paddingTop">17dp</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/dashboard_black</item>
+        <item name="android:background">@drawable/dashboard_button</item>
+    </style>
 
-	<style name="ListText">
+    <style name="ListText">
         <item name="android:textSize">20sp</item>
     </style>
     <style name="ListText.Small">

From 10588608161626c6064bcf682f1d5588846b8036 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 14 Nov 2014 15:07:54 +0200
Subject: [PATCH 031/138] Updated view of search button

---
 OsmAnd/res/values/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index c0742cefbe..fe6167e562 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -36,6 +36,8 @@
 		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">@color/dashboard_black</item>
 		<item name="android:background">@drawable/dashboard_button</item>
+		<item name="android:gravity">bottom|center_horizontal</item>
+		<item name="android:paddingBottom">11dp</item>
 	</style>
 
 	<style name="ListText">

From 0b6cc1489eae3a8fda456e34c5adbd70ab75d461 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 14 Nov 2014 15:14:41 +0200
Subject: [PATCH 032/138] Fixed bug with waypoints layout

---
 OsmAnd/res/layout/dashboard.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index ccb12c6e7f..3614e61693 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -17,8 +17,6 @@
                       android:layout_marginBottom="6dp">
             <TextView android:id="@+id/search_for"
                       android:text="@string/search_for"
-                      style="@style/DashboardSubHeader"
-                      android:gravity="center_vertical"
                       android:layout_height="40dp"
                       android:layout_width="wrap_content"/>
             <View android:layout_width="match_parent"
@@ -119,7 +117,7 @@
             <LinearLayout android:id="@+id/favorites"
                           android:orientation="vertical"
                           android:layout_width="fill_parent"
-                          android:layout_height="50dp"/>
+                          android:layout_height="wrap_content"/>
         </LinearLayout>
 
     </LinearLayout>

From 2dccfa3db6edce7d101df75426b2efb443e2119f Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 14 Nov 2014 15:25:33 +0200
Subject: [PATCH 033/138] Updated headers

---
 OsmAnd/res/layout/dashboard.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 3614e61693..294650a97c 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -18,6 +18,7 @@
             <TextView android:id="@+id/search_for"
                       android:text="@string/search_for"
                       android:layout_height="40dp"
+					  style="@style/DashboardSubHeader"
                       android:layout_width="wrap_content"/>
             <View android:layout_width="match_parent"
                   android:background="@color/dashboard_divider"

From bb3348dc24cd481cd2f5f39c3b3cb664b28151da Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 14 Nov 2014 15:52:25 +0200
Subject: [PATCH 034/138] Fixed headers and favorites size

---
 OsmAnd/res/layout/dash_fav_list.xml                          | 2 +-
 OsmAnd/res/values/styles.xml                                 | 2 +-
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
index 01ad0665a1..19134a41ca 100644
--- a/OsmAnd/res/layout/dash_fav_list.xml
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -10,7 +10,7 @@
           android:layout_height="1dp"/>
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="match_parent"
-                  android:layout_height="wrap_content">
+                  android:layout_height="match_parent">
         <ImageView android:id="@+id/icon"
                    android:layout_gravity="center_vertical"
                    android:layout_marginLeft="12dp"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 16d4b17a84..10c9b4d7a1 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -12,7 +12,7 @@
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:layout_height">fill_parent</item>
-        <item name="android:paddingTop">11dp</item>
+        <item name="android:paddingTop">2dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:textColor">@color/dashboard_black</item>
         <item name="android:layout_marginLeft">15dp</item>ll
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 3122c79c65..72ce7fb337 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -101,6 +101,9 @@ public class DashboardActivity extends SherlockFragmentActivity {
 					startActivityForResult(mapIndent, 0);
 				}
 			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			view.setLayoutParams(lp);
 			favorites.addView(view);
 		}
 	}

From 3154e60106f7fe2c6430ec4d52819eb1f91ee060 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 17 Nov 2014 10:29:29 +0100
Subject: [PATCH 035/138] Upgrade version

---
 OsmAnd/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index a080fdac30..dff75c743f 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:installLocation="auto" 
 	android:versionName="@string/app_version" 
-	android:versionCode="191"
+	android:versionCode="201"
 	package="net.osmand.plus">
 
 	<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />

From 941c0d008ef94847dcc80ef5c27ac6cbefec43a5 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 17 Nov 2014 11:55:43 +0200
Subject: [PATCH 036/138] Smaller margin between boards

---
 OsmAnd/res/layout/dashboard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 294650a97c..59ca42e988 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -14,7 +14,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:background="@drawable/bg_cardui"
-                      android:layout_marginBottom="6dp">
+                      android:layout_marginBottom="4dp">
             <TextView android:id="@+id/search_for"
                       android:text="@string/search_for"
                       android:layout_height="40dp"
@@ -74,7 +74,7 @@
 
         <LinearLayout android:orientation="vertical"
                       android:background="@drawable/bg_cardui"
-                      android:layout_marginBottom="6dp"
+                      android:layout_marginBottom="4dp"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content">
             <LinearLayout android:orientation="horizontal"

From 1f15739a102bef70a0f09c0410469979d0a0d926 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 21 Nov 2014 17:00:22 +0200
Subject: [PATCH 037/138] Added sorting for favorite points in dashboard
 activity

---
 .../osmand/plus/activities/DashboardActivity.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 72ce7fb337..8bce5aa1d7 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -25,7 +25,7 @@ import net.osmand.plus.views.OsmAndMapSurfaceView;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.MapUtils;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by Denis on 05.11.2014.
@@ -63,7 +63,18 @@ public class DashboardActivity extends SherlockFragmentActivity {
 
 	private void setupFavorites(){
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
-		final List<FavouritePoint> points = helper.getFavouritePoints();
+		final List<FavouritePoint> points = new ArrayList<FavouritePoint>(helper.getFavouritePoints());
+		Collections.sort(points, new Comparator<FavouritePoint>() {
+			@Override
+			public int compare(FavouritePoint point, FavouritePoint point2) {
+				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+				int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
+						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+				int dist2 = (int) (MapUtils.getDistance(point2.getLatitude(), point2.getLongitude(),
+						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+				return (dist - dist2);
+			}
+		});
 		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
 		favorites.removeAllViews();
 		if (points.size() == 0){

From 65f929b0523038216d415b0bb7c1a1a54eac094f Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 24 Nov 2014 17:16:08 +0200
Subject: [PATCH 038/138] Refactored dashboard. Everything changed to
 fragments.

---
 OsmAnd/AndroidManifest.xml                    |   2 +-
 OsmAnd/res/layout/dash_favorites_fragment.xml |  23 ++
 ...h_fav_list.xml => dash_favorites_item.xml} |   0
 OsmAnd/res/layout/dash_map_fragment.xml       |  29 ++
 OsmAnd/res/layout/dash_plugin_item.xml        |  35 +++
 OsmAnd/res/layout/dash_plugins_fragment.xml   |  20 ++
 OsmAnd/res/layout/dash_search_fragment.xml    |  64 +++++
 OsmAnd/res/layout/dash_updates_fragment.xml   |  27 ++
 OsmAnd/res/layout/dash_updates_item.xml       |  32 +++
 OsmAnd/res/layout/dashboard.xml               | 112 +-------
 OsmAnd/res/values/strings.xml                 |   1 +
 .../plus/activities/DashboardActivity.java    | 270 ------------------
 .../plus/activities/MainMenuActivity.java     |   2 +-
 .../plus/dashboard/DashBaseFragment.java      |  14 +
 .../plus/dashboard/DashFavoritesFragment.java | 124 ++++++++
 .../plus/dashboard/DashMapFragment.java       |  66 +++++
 .../plus/dashboard/DashPluginsFragment.java   |  71 +++++
 .../plus/dashboard/DashSearchFragment.java    | 100 +++++++
 .../plus/dashboard/DashUpdatesFragment.java   |  24 ++
 .../plus/dashboard/DashboardActivity.java     | 103 +++++++
 20 files changed, 736 insertions(+), 383 deletions(-)
 create mode 100644 OsmAnd/res/layout/dash_favorites_fragment.xml
 rename OsmAnd/res/layout/{dash_fav_list.xml => dash_favorites_item.xml} (100%)
 create mode 100644 OsmAnd/res/layout/dash_map_fragment.xml
 create mode 100644 OsmAnd/res/layout/dash_plugin_item.xml
 create mode 100644 OsmAnd/res/layout/dash_plugins_fragment.xml
 create mode 100644 OsmAnd/res/layout/dash_search_fragment.xml
 create mode 100644 OsmAnd/res/layout/dash_updates_fragment.xml
 create mode 100644 OsmAnd/res/layout/dash_updates_item.xml
 delete mode 100644 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index dff75c743f..18ed41dee3 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -66,7 +66,7 @@
 		</activity>
 
 		<activity android:name="net.osmand.plus.activities.HelpActivity" />
-		<activity android:name=".activities.DashboardActivity" />
+		<activity android:name=".dashboard.DashboardActivity" />
 
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
 			android:screenOrientation="unspecified" android:launchMode="singleTop">
diff --git a/OsmAnd/res/layout/dash_favorites_fragment.xml b/OsmAnd/res/layout/dash_favorites_fragment.xml
new file mode 100644
index 0000000000..1cf9e25484
--- /dev/null
+++ b/OsmAnd/res/layout/dash_favorites_fragment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/main_fav"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical">
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="40dp">
+		<TextView android:id="@+id/fav_text"
+				  android:text="@string/my_data_Button"
+				  style="@style/DashboardSubHeader"/>
+		<Button android:id="@+id/show_all"
+				android:text="@string/show_all"
+				style="@style/DashboardGeneralButton"/>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/favorites"
+				  android:orientation="vertical"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_favorites_item.xml
similarity index 100%
rename from OsmAnd/res/layout/dash_fav_list.xml
rename to OsmAnd/res/layout/dash_favorites_item.xml
diff --git a/OsmAnd/res/layout/dash_map_fragment.xml b/OsmAnd/res/layout/dash_map_fragment.xml
new file mode 100644
index 0000000000..a140aee42b
--- /dev/null
+++ b/OsmAnd/res/layout/dash_map_fragment.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_marginBottom="4dp"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content">
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="40dp">
+		<TextView android:id="@+id/map_text"
+				  android:text="@string/map_Button"
+				  style="@style/DashboardSubHeader"/>
+		<Button android:id="@+id/show_map"
+				android:text="@string/show_map"
+				style="@style/DashboardGeneralButton"/>
+	</LinearLayout>
+
+	<net.osmand.plus.views.OsmAndMapSurfaceView
+			android:id="@+id/MapView"
+			android:layout_width="fill_parent"
+			android:layout_height="110dp"
+			android:layout_marginLeft="2dp"
+			android:layout_marginRight="2dp"
+			android:layout_marginBottom="2dp"
+			android:contentDescription="@string/map_view"
+			android:visibility="gone"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
new file mode 100644
index 0000000000..3bafdd75e2
--- /dev/null
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_marginRight="12dp"
+			  android:layout_height="50dp">
+	<View android:layout_width="match_parent"
+		  android:background="@color/dashboard_divider"
+		  android:layout_height="1dp"/>
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="match_parent"
+				  android:layout_height="match_parent">
+		<LinearLayout android:orientation="vertical"
+					  android:layout_marginLeft="12dp"
+					  android:layout_width="0dp"
+					  android:layout_weight="1"
+					  android:layout_gravity="center_vertical"
+					  android:layout_height="match_parent">
+			<TextView android:id="@+id/plugin_name"
+					  android:textColor="@color/dashboard_black"
+					  android:ellipsize="end"
+					  android:lines="1"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+			<TextView android:id="@+id/plugin_descr"
+					  android:ellipsize="end"
+					  android:lines="1"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+		</LinearLayout>
+
+		<include layout="@layout/check_item_rel"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_plugins_fragment.xml b/OsmAnd/res/layout/dash_plugins_fragment.xml
new file mode 100644
index 0000000000..182052a886
--- /dev/null
+++ b/OsmAnd/res/layout/dash_plugins_fragment.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/plugins"
+			  android:orientation="vertical"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent">
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="40dp">
+		<TextView android:id="@+id/plugin_text"
+				  android:text="@string/prefs_plugins"
+				  style="@style/DashboardSubHeader"/>
+		<Button android:id="@+id/show_all"
+				android:text="@string/show_all"
+				style="@style/DashboardGeneralButton"/>
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_search_fragment.xml b/OsmAnd/res/layout/dash_search_fragment.xml
new file mode 100644
index 0000000000..67ebad9f26
--- /dev/null
+++ b/OsmAnd/res/layout/dash_search_fragment.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/search"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_marginBottom="4dp">
+	<TextView android:id="@+id/search_for"
+			  android:text="@string/search_for"
+			  android:layout_height="40dp"
+			  style="@style/DashboardSubHeader"
+			  android:layout_width="wrap_content"/>
+	<View android:layout_width="match_parent"
+		  android:background="@color/dashboard_divider"
+		  android:layout_height="1dp"/>
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="match_parent"
+				  android:layout_height="90dp">
+		<Button android:id="@+id/poi"
+				android:text="@string/poi"
+				android:drawableTop="@drawable/ic_action_info2"
+				style="@style/DashboardSearchButton"/>
+		<View android:layout_width="1dp"
+			  android:background="@color/dashboard_divider"
+			  android:layout_height="match_parent"/>
+		<Button android:id="@+id/address"
+				android:text="@string/address"
+				android:drawableTop="@drawable/ic_action_home2"
+				style="@style/DashboardSearchButton"/>
+		<View android:layout_width="1dp"
+			  android:background="@color/dashboard_divider"
+			  android:layout_height="match_parent"/>
+		<Button android:id="@+id/coord"
+				android:text="@string/coordinates"
+				android:drawableTop="@drawable/ic_action_marker2"
+				style="@style/DashboardSearchButton"/>
+	</LinearLayout>
+	<View android:layout_width="match_parent"
+		  android:background="@color/dashboard_divider"
+		  android:layout_height="1dp"/>
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="90dp">
+		<Button android:id="@+id/fav_btn"
+				android:text="@string/my_favorites"
+				android:drawableTop="@drawable/ic_action_fav2"
+				style="@style/DashboardSearchButton"/>
+		<View android:layout_width="1dp"
+			  android:background="@color/dashboard_divider"
+			  android:layout_height="match_parent"/>
+		<Button android:id="@+id/history"
+				android:text="@string/history"
+				android:drawableTop="@drawable/ic_action_history2"
+				style="@style/DashboardSearchButton"/>
+		<View android:layout_width="1dp"
+			  android:background="@color/dashboard_divider"
+			  android:layout_height="match_parent"/>
+		<Button android:id="@+id/transport"
+				android:text="@string/rendering_category_transport"
+				android:drawableTop="@drawable/ic_action_bus2"
+				style="@style/DashboardSearchButton"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
new file mode 100644
index 0000000000..0334c02e46
--- /dev/null
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout android:id="@+id/maps"
+			  xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_marginBottom="4dp"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content">
+	<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+		<TextView android:text="@string/map_update"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"/>
+		<TextView android:id="@+id/update_count"
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"/>
+		<View android:layout_width="0dp"
+			  android:layout_weight="1"
+			  android:layout_height="wrap_content"/>
+		<Button android:id="@+id/show_all"
+				android:text="@string/show_all"
+				style="@style/DashboardGeneralButton"/>
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
new file mode 100644
index 0000000000..441041f8fb
--- /dev/null
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_marginLeft="12dp"
+			  android:layout_marginRight="12dp"
+			  android:layout_height="50dp">
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content">
+		<LinearLayout android:orientation="vertical"
+					  android:layout_width="fill_parent"
+					  android:layout_height="50dp">
+			<TextView android:id="@+id/map_name"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+			<TextView android:id="@+id/map_descr"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+		</LinearLayout>
+		<Button android:id="@+id/btn_download"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+	<ProgressBar android:id="@+id/ProgressBar"
+				 android:visibility="gone"
+				 android:layout_width="fill_parent"
+				 android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 59ca42e988..a5cb3bbaf8 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -5,121 +5,11 @@
             xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout android:orientation="vertical"
+				  android:id="@+id/content"
                   android:padding="6dp"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content">
 
-        <LinearLayout android:id="@+id/search"
-                      android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:background="@drawable/bg_cardui"
-                      android:layout_marginBottom="4dp">
-            <TextView android:id="@+id/search_for"
-                      android:text="@string/search_for"
-                      android:layout_height="40dp"
-					  style="@style/DashboardSubHeader"
-                      android:layout_width="wrap_content"/>
-            <View android:layout_width="match_parent"
-                  android:background="@color/dashboard_divider"
-                  android:layout_height="1dp"/>
-            <LinearLayout android:orientation="horizontal"
-                          android:layout_width="match_parent"
-                          android:layout_height="90dp">
-                <Button android:id="@+id/poi"
-                        android:text="@string/poi"
-                        android:drawableTop="@drawable/ic_action_info2"
-                        style="@style/DashboardSearchButton"/>
-                <View android:layout_width="1dp"
-                      android:background="@color/dashboard_divider"
-                      android:layout_height="match_parent"/>
-                <Button android:id="@+id/address"
-                        android:text="@string/address"
-                        android:drawableTop="@drawable/ic_action_home2"
-                        style="@style/DashboardSearchButton"/>
-                <View android:layout_width="1dp"
-                      android:background="@color/dashboard_divider"
-                      android:layout_height="match_parent"/>
-                <Button android:id="@+id/coord"
-                        android:text="@string/coordinates"
-                        android:drawableTop="@drawable/ic_action_marker2"
-                        style="@style/DashboardSearchButton"/>
-            </LinearLayout>
-            <View android:layout_width="match_parent"
-                  android:background="@color/dashboard_divider"
-                  android:layout_height="1dp"/>
-            <LinearLayout android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="90dp">
-                <Button android:id="@+id/fav_btn"
-                        android:text="@string/my_favorites"
-                        android:drawableTop="@drawable/ic_action_fav2"
-                        style="@style/DashboardSearchButton"/>
-                <View android:layout_width="1dp"
-                      android:background="@color/dashboard_divider"
-                      android:layout_height="match_parent"/>
-                <Button android:id="@+id/history"
-                        android:text="@string/history"
-                        android:drawableTop="@drawable/ic_action_history2"
-                        style="@style/DashboardSearchButton"/>
-                <View android:layout_width="1dp"
-                      android:background="@color/dashboard_divider"
-                      android:layout_height="match_parent"/>
-                <Button android:id="@+id/transport"
-                        android:text="@string/rendering_category_transport"
-                        android:drawableTop="@drawable/ic_action_bus2"
-                        style="@style/DashboardSearchButton"/>
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout android:orientation="vertical"
-                      android:background="@drawable/bg_cardui"
-                      android:layout_marginBottom="4dp"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content">
-            <LinearLayout android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="40dp">
-                <TextView android:id="@+id/map_text"
-                          android:text="@string/map_Button"
-                          style="@style/DashboardSubHeader"/>
-                <Button android:id="@+id/show_map"
-                        android:text="@string/show_map"
-                        style="@style/DashboardGeneralButton"/>
-            </LinearLayout>
-
-            <net.osmand.plus.views.OsmAndMapSurfaceView
-                    android:id="@+id/MapView"
-                    android:layout_width="fill_parent"
-                    android:layout_height="110dp"
-                    android:layout_marginLeft="2dp"
-                    android:layout_marginRight="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:contentDescription="@string/map_view"
-                    android:visibility="gone"/>
-        </LinearLayout>
-
-        <LinearLayout android:id="@+id/main_fav"
-                      android:background="@drawable/bg_cardui"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical">
-            <LinearLayout android:orientation="horizontal"
-                          android:layout_width="fill_parent"
-                          android:layout_height="40dp">
-                <TextView android:id="@+id/fav_text"
-                          android:text="@string/my_data_Button"
-                          style="@style/DashboardSubHeader"/>
-                <Button android:id="@+id/show_all"
-                        android:text="@string/show_all"
-                        style="@style/DashboardGeneralButton"/>
-
-            </LinearLayout>
-            <LinearLayout android:id="@+id/favorites"
-                          android:orientation="vertical"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"/>
-        </LinearLayout>
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index cfd14ce43c..64afeb32bf 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="map_update">Map update:</string>
 	<string name="search_for">Search for</string>
 	<string name="show_map">SHOW MAP</string>
 	<string name="show_all">SHOW ALL</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
deleted file mode 100644
index 8bce5aa1d7..0000000000
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package net.osmand.plus.activities;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.*;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import net.osmand.data.FavouritePoint;
-import net.osmand.data.LatLon;
-import net.osmand.plus.*;
-import net.osmand.plus.activities.search.SearchActivity;
-import net.osmand.plus.base.FavoriteImageDrawable;
-import net.osmand.plus.render.MapVectorLayer;
-import net.osmand.plus.views.MapTextLayer;
-import net.osmand.plus.views.OsmAndMapSurfaceView;
-import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.util.MapUtils;
-
-import java.util.*;
-
-/**
- * Created by Denis on 05.11.2014.
- */
-public class DashboardActivity extends SherlockFragmentActivity {
-	public static final boolean TIPS_AND_TRICKS = false;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.dashboard);
-		getSupportActionBar().setTitle(R.string.app_name_ver);
-		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
-		getSupportActionBar().setBackgroundDrawable(color);
-		getSupportActionBar().setIcon(android.R.color.transparent);
-		setupMapView();
-		setupButtons();
-		setupFonts();
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		setupFavorites();
-	}
-
-	private void setupFonts() {
-		Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Medium.ttf");
-		((TextView) findViewById(R.id.search_for)).setTypeface(typeface);
-		((TextView) findViewById(R.id.map_text)).setTypeface(typeface);
-		((TextView) findViewById(R.id.fav_text)).setTypeface(typeface);
-		((Button) findViewById(R.id.show_map)).setTypeface(typeface);
-		((Button) findViewById(R.id.show_all)).setTypeface(typeface);
-	}
-
-	private void setupFavorites(){
-		final FavouritesDbHelper helper = getMyApplication().getFavorites();
-		final List<FavouritePoint> points = new ArrayList<FavouritePoint>(helper.getFavouritePoints());
-		Collections.sort(points, new Comparator<FavouritePoint>() {
-			@Override
-			public int compare(FavouritePoint point, FavouritePoint point2) {
-				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
-				int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
-						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
-				int dist2 = (int) (MapUtils.getDistance(point2.getLatitude(), point2.getLongitude(),
-						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
-				return (dist - dist2);
-			}
-		});
-		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
-		favorites.removeAllViews();
-		if (points.size() == 0){
-			(findViewById(R.id.main_fav)).setVisibility(View.GONE);
-			return;
-		}
-
-		if (points.size() > 3){
-			while (points.size() != 3){
-				points.remove(3);
-			}
-		}
-
-
-		for (final FavouritePoint point : points) {
-			LayoutInflater inflater = getLayoutInflater();
-			View view = inflater.inflate(R.layout.dash_fav_list, null, false);
-			TextView name = (TextView) view.findViewById(R.id.name);
-			TextView label = (TextView) view.findViewById(R.id.distance);
-			ImageView icon = (ImageView) view.findViewById(R.id.icon);
-			name.setText(point.getName());
-			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, point.getColor()));
-			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
-			int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
-					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
-			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
-			label.setText(distance, TextView.BufferType.SPANNABLE);
-			label.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
-			view.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					final Intent mapIndent = new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getMapActivity());
-					mapIndent.putExtra(MapActivity.START_LAT, point.getLatitude());
-					mapIndent.putExtra(MapActivity.START_LON, point.getLongitude());
-					startActivityForResult(mapIndent, 0);
-				}
-			});
-			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
-			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
-			view.setLayoutParams(lp);
-			favorites.addView(view);
-		}
-	}
-
-	private void setupButtons(){
-		final Activity activity = this;
-		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
-
-		(findViewById(R.id.show_map)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
-				activity.startActivityForResult(mapIndent, 0);
-			}
-		});
-
-		(findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
-				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				activity.startActivity(favorites);
-			}
-		});
-
-		(findViewById(R.id.poi)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-
-		(findViewById(R.id.address)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.ADDRESS_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-
-		(findViewById(R.id.coord)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.LOCATION_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-
-		(findViewById(R.id.fav_btn)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.FAVORITES_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-
-		(findViewById(R.id.history)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-
-		(findViewById(R.id.transport)).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.TRANSPORT_TAB_INDEX);
-				activity.startActivity(search);
-			}
-		});
-	}
-
-	private void setupMapView() {
-		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
-		OsmandMapTileView osmandMapTileView = surf.getMapView();
-		osmandMapTileView.getView().setVisibility(View.VISIBLE);
-		osmandMapTileView.removeAllLayers();
-		MapVectorLayer mapVectorLayer = new MapVectorLayer(null);
-		MapTextLayer mapTextLayer = new MapTextLayer();
-		mapTextLayer.setAlwaysVisible(true);
-		// 5.95 all labels
-		osmandMapTileView.addLayer(mapTextLayer, 5.95f);
-		osmandMapTileView.addLayer(mapVectorLayer, 0.5f);
-		osmandMapTileView.setMainLayer(mapVectorLayer);
-		mapVectorLayer.setVisible(true);
-		net.osmand.Location location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
-		if(location != null){
-			osmandMapTileView.setLatLon(location.getLatitude(), location.getLongitude());
-			osmandMapTileView.setIntZoom(14);
-		}
-		osmandMapTileView.refreshMap(true);
-	}
-
-
-
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.ic_ac_help)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
-		if (item.getItemId() == 0) {
-			if(TIPS_AND_TRICKS) {
-				TipsAndTricksActivity activity = new TipsAndTricksActivity(this);
-				Dialog dlg = activity.getDialogToShowTips(false, true);
-				dlg.show();
-			} else {
-				final Intent helpIntent = new Intent(this, HelpActivity.class);
-				startActivity(helpIntent);
-			}
-		} else if (item.getItemId() == 1){
-			final Intent settings = new Intent(this, appCustomization.getSettingsActivity());
-			startActivity(settings);
-		} else if (item.getItemId() == 2){
-			Intent newIntent = new Intent(this, appCustomization.getMainMenuActivity());
-			newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-			newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
-			startActivity(newIntent);
-		}
-		return true;
-	}
-
-	private OsmandApplication getMyApplication() {
-		return (OsmandApplication) getApplication();
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		return true;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 5084673c42..bebbac5ba5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -11,8 +11,8 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.dashboard.DashboardActivity;
 import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.download.DownloadIndexFragment;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.sherpafy.TourViewActivity;
 import android.app.Activity;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
new file mode 100644
index 0000000000..945619c13c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
@@ -0,0 +1,14 @@
+package net.osmand.plus.dashboard;
+
+import com.actionbarsherlock.app.SherlockFragment;
+import net.osmand.plus.OsmandApplication;
+
+/**
+ * Created by Denis on 24.11.2014.
+ */
+public class DashBaseFragment extends SherlockFragment {
+
+	public OsmandApplication getMyApplication(){
+		return (OsmandApplication) getActivity().getApplication();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
new file mode 100644
index 0000000000..ef3f5d4766
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -0,0 +1,124 @@
+package net.osmand.plus.dashboard;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.base.FavoriteImageDrawable;
+import net.osmand.util.MapUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Created by Denis on 24.11.2014.
+ */
+public class DashFavoritesFragment extends DashBaseFragment {
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_favorites_fragment, container, false);
+		Typeface typeface = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) view.findViewById(R.id.fav_text)).setTypeface(typeface);
+		((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
+
+		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Activity activity = getActivity();
+				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				activity.startActivity(favorites);
+			}
+		});
+
+		return view;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		setupFavorites();
+	}
+
+	private void setupFavorites(){
+		View mainView = getView();
+		final FavouritesDbHelper helper = getMyApplication().getFavorites();
+		final List<FavouritePoint> points = new ArrayList<FavouritePoint>(helper.getFavouritePoints());
+		Collections.sort(points, new Comparator<FavouritePoint>() {
+			@Override
+			public int compare(FavouritePoint point, FavouritePoint point2) {
+				LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+				int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
+						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+				int dist2 = (int) (MapUtils.getDistance(point2.getLatitude(), point2.getLongitude(),
+						lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+				return (dist - dist2);
+			}
+		});
+		LinearLayout favorites = (LinearLayout) mainView.findViewById(R.id.favorites);
+		favorites.removeAllViews();
+		if (points.size() == 0){
+			(mainView.findViewById(R.id.main_fav)).setVisibility(View.GONE);
+			return;
+		} else {
+			(mainView.findViewById(R.id.main_fav)).setVisibility(View.VISIBLE);
+		}
+
+		if (points.size() > 3){
+			while (points.size() != 3){
+				points.remove(3);
+			}
+		}
+
+
+		for (final FavouritePoint point : points) {
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_favorites_item, null, false);
+			TextView name = (TextView) view.findViewById(R.id.name);
+			TextView label = (TextView) view.findViewById(R.id.distance);
+			ImageView icon = (ImageView) view.findViewById(R.id.icon);
+			name.setText(point.getName());
+			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), point.getColor()));
+			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+			int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
+					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
+			label.setText(distance, TextView.BufferType.SPANNABLE);
+			label.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					final Intent mapIndent = new Intent(getActivity(), getMyApplication().getAppCustomization().getMapActivity());
+					mapIndent.putExtra(MapActivity.START_LAT, point.getLatitude());
+					mapIndent.putExtra(MapActivity.START_LON, point.getLongitude());
+					startActivityForResult(mapIndent, 0);
+				}
+			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+			int marginRight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getResources().getDisplayMetrics());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			lp.setMargins(0,0,marginRight,0);
+			view.setLayoutParams(lp);
+			favorites.addView(view);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
new file mode 100644
index 0000000000..d31c9e877f
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
@@ -0,0 +1,66 @@
+package net.osmand.plus.dashboard;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.R;
+import net.osmand.plus.render.MapVectorLayer;
+import net.osmand.plus.views.MapTextLayer;
+import net.osmand.plus.views.OsmAndMapSurfaceView;
+import net.osmand.plus.views.OsmandMapTileView;
+
+/**
+ * Created by Denis on 24.11.2014.
+ */
+public class DashMapFragment extends DashBaseFragment {
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_map_fragment, container, false);
+		setupMapView(view);
+		Typeface typeface = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) view.findViewById(R.id.map_text)).setTypeface(typeface);
+		((Button) view.findViewById(R.id.show_map)).setTypeface(typeface);
+
+		(view.findViewById(R.id.show_map)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Activity activity = getActivity();
+				OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
+				activity.startActivityForResult(mapIndent, 0);
+			}
+		});
+
+		return view;
+	}
+
+	private void setupMapView(View view){
+		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) view.findViewById(R.id.MapView);
+		OsmandMapTileView osmandMapTileView = surf.getMapView();
+		osmandMapTileView.getView().setVisibility(View.VISIBLE);
+		osmandMapTileView.removeAllLayers();
+		MapVectorLayer mapVectorLayer = new MapVectorLayer(null);
+		MapTextLayer mapTextLayer = new MapTextLayer();
+		mapTextLayer.setAlwaysVisible(true);
+		// 5.95 all labels
+		osmandMapTileView.addLayer(mapTextLayer, 5.95f);
+		osmandMapTileView.addLayer(mapVectorLayer, 0.5f);
+		osmandMapTileView.setMainLayer(mapVectorLayer);
+		mapVectorLayer.setVisible(true);
+		net.osmand.Location location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
+		if(location != null){
+			osmandMapTileView.setLatLon(location.getLatitude(), location.getLongitude());
+			osmandMapTileView.setIntZoom(14);
+		}
+		osmandMapTileView.refreshMap(true);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
new file mode 100644
index 0000000000..b0bf03434b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -0,0 +1,71 @@
+package net.osmand.plus.dashboard;
+
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+
+import java.util.List;
+
+/**
+ * Created by Denis on 21.11.2014.
+ */
+public class DashPluginsFragment extends DashBaseFragment {
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_plugins_fragment, container, false);
+		Typeface typeface = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) view.findViewById(R.id.plugin_text)).setTypeface(typeface);
+		((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
+		view.findViewById(R.id.show_all).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				startActivityForResult(new Intent(getActivity(), getMyApplication().getAppCustomization().getPluginsActivity()), 1);
+			}
+		});
+		addPlugins(view);
+		return view;
+	}
+
+	private void addPlugins(View parent){
+		LinearLayout layout = (LinearLayout) parent;
+		LayoutInflater inflater = getActivity().getLayoutInflater();
+
+		List<OsmandPlugin> availablePlugins = OsmandPlugin.getAvailablePlugins();
+		List<OsmandPlugin> enabledPlugins = OsmandPlugin.getEnabledPlugins();
+		for (int i=0; i < availablePlugins.size(); i++){
+			if (i> 2){
+				break;
+			}
+			final OsmandPlugin plugin = availablePlugins.get(i);
+			View view = inflater.inflate(R.layout.dash_plugin_item, null, false);
+			((TextView) view.findViewById(R.id.plugin_name)).setText(plugin.getName());
+			((TextView) view.findViewById(R.id.plugin_descr)).setText(plugin.getDescription());
+			CompoundButton check = (CompoundButton) view.findViewById(R.id.check_item);
+			check.setChecked(enabledPlugins.contains(plugin));
+			check.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+				@Override
+				public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+					OsmandPlugin.enablePlugin(getMyApplication(),plugin, b);
+				}
+			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			view.setLayoutParams(lp);
+			layout.addView(view);
+		}
+
+
+
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
new file mode 100644
index 0000000000..98b4da7c00
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
@@ -0,0 +1,100 @@
+package net.osmand.plus.dashboard;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.search.SearchActivity;
+
+/**
+ * Created by Denis on 24.11.2014.
+ */
+public class DashSearchFragment extends DashBaseFragment {
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_search_fragment, container, false);
+		setupButtons(view);
+		Typeface typeface = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) view.findViewById(R.id.search_for)).setTypeface(typeface);
+		return view;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+
+	}
+
+	private void setupButtons(View view){
+		final Activity activity = getActivity();
+		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		(view.findViewById(R.id.poi)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(view.findViewById(R.id.address)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.ADDRESS_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(view.findViewById(R.id.coord)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.LOCATION_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(view.findViewById(R.id.fav_btn)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.FAVORITES_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(view.findViewById(R.id.history)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(view.findViewById(R.id.transport)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.TRANSPORT_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
new file mode 100644
index 0000000000..11ee470320
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -0,0 +1,24 @@
+package net.osmand.plus.dashboard;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import net.osmand.plus.R;
+
+/**
+ * Created by Denis on 21.11.2014.
+ */
+public class DashUpdatesFragment extends DashBaseFragment {
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false);
+		return view;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
new file mode 100644
index 0000000000..9f4f676e84
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -0,0 +1,103 @@
+package net.osmand.plus.dashboard;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.*;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.plus.*;
+import net.osmand.plus.activities.HelpActivity;
+import net.osmand.plus.activities.MainMenuActivity;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.TipsAndTricksActivity;
+import net.osmand.plus.base.FavoriteImageDrawable;
+import net.osmand.util.MapUtils;
+
+import java.util.*;
+
+/**
+ * Created by Denis on 05.11.2014.
+ */
+public class DashboardActivity extends SherlockFragmentActivity {
+	public static final boolean TIPS_AND_TRICKS = false;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dashboard);
+		getSupportActionBar().setTitle(R.string.app_name_ver);
+		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
+		getSupportActionBar().setBackgroundDrawable(color);
+		getSupportActionBar().setIcon(android.R.color.transparent);
+
+		android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
+		android.support.v4.app.FragmentTransaction fragmentTransaction = manager.beginTransaction();
+
+		DashSearchFragment searchFragment = new DashSearchFragment();
+		fragmentTransaction.add(R.id.content, searchFragment);
+		DashMapFragment mapFragment = new DashMapFragment();
+		fragmentTransaction.add(R.id.content, mapFragment);
+		DashFavoritesFragment favoritesFragment = new DashFavoritesFragment();
+		fragmentTransaction.add(R.id.content, favoritesFragment);
+		DashUpdatesFragment updatesFragment = new DashUpdatesFragment();
+		fragmentTransaction.add(R.id.content, updatesFragment);
+		DashPluginsFragment pluginsFragment = new DashPluginsFragment();
+		fragmentTransaction.add(R.id.content, pluginsFragment).commit();
+
+	}
+
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.ic_ac_help)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		if (item.getItemId() == 0) {
+			if(TIPS_AND_TRICKS) {
+				TipsAndTricksActivity activity = new TipsAndTricksActivity(this);
+				Dialog dlg = activity.getDialogToShowTips(false, true);
+				dlg.show();
+			} else {
+				final Intent helpIntent = new Intent(this, HelpActivity.class);
+				startActivity(helpIntent);
+			}
+		} else if (item.getItemId() == 1){
+			final Intent settings = new Intent(this, appCustomization.getSettingsActivity());
+			startActivity(settings);
+		} else if (item.getItemId() == 2){
+			Intent newIntent = new Intent(this, appCustomization.getMainMenuActivity());
+			newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
+			startActivity(newIntent);
+		}
+		return true;
+	}
+
+	private OsmandApplication getMyApplication() {
+		return (OsmandApplication) getApplication();
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		return true;
+	}
+}

From 8ffd96ec8277ee81886b3e5aeecb327c5b5a6849 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 24 Nov 2014 17:31:58 +0200
Subject: [PATCH 039/138] Fixed bug with plugins not update status after resume

---
 OsmAnd/res/layout/dash_plugins_fragment.xml            |  7 ++++++-
 .../net/osmand/plus/dashboard/DashPluginsFragment.java | 10 +++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/dash_plugins_fragment.xml b/OsmAnd/res/layout/dash_plugins_fragment.xml
index 182052a886..1de89a67d4 100644
--- a/OsmAnd/res/layout/dash_plugins_fragment.xml
+++ b/OsmAnd/res/layout/dash_plugins_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:id="@+id/plugins"
 			  android:orientation="vertical"
 			  android:background="@drawable/bg_cardui"
 			  android:layout_width="match_parent"
@@ -17,4 +16,10 @@
 				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
+	<LinearLayout android:id="@+id/plugins"
+				  android:orientation="vertical"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content">
+
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index b0bf03434b..10b57d41ca 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -33,10 +33,18 @@ public class DashPluginsFragment extends DashBaseFragment {
 				startActivityForResult(new Intent(getActivity(), getMyApplication().getAppCustomization().getPluginsActivity()), 1);
 			}
 		});
-		addPlugins(view);
+
 		return view;
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		LinearLayout layout = (LinearLayout) getView().findViewById(R.id.plugins);
+		layout.removeAllViews();
+		addPlugins(layout);
+	}
+
 	private void addPlugins(View parent){
 		LinearLayout layout = (LinearLayout) parent;
 		LayoutInflater inflater = getActivity().getLayoutInflater();

From d020889409d628d0bb9c58bf8d5318eb7a6cc7db Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 25 Nov 2014 15:25:12 +0200
Subject: [PATCH 040/138] Fixed layouts

---
 OsmAnd/res/layout/dash_plugin_item.xml                         | 2 +-
 .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index 3bafdd75e2..ac296c3c05 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -3,13 +3,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:orientation="vertical"
 			  android:layout_width="match_parent"
-			  android:layout_marginRight="12dp"
 			  android:layout_height="50dp">
 	<View android:layout_width="match_parent"
 		  android:background="@color/dashboard_divider"
 		  android:layout_height="1dp"/>
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_width="match_parent"
+				  android:paddingRight="12dp"
 				  android:layout_height="match_parent">
 		<LinearLayout android:orientation="vertical"
 					  android:layout_marginLeft="12dp"
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index ef3f5d4766..920120f102 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -114,9 +114,8 @@ public class DashFavoritesFragment extends DashBaseFragment {
 				}
 			});
 			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
-			int marginRight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getResources().getDisplayMetrics());
+
 			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
-			lp.setMargins(0,0,marginRight,0);
 			view.setLayoutParams(lp);
 			favorites.addView(view);
 		}

From 0a4a26be91b3b5b9da7d36f80846f55e90d42c41 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 25 Nov 2014 17:28:33 +0200
Subject: [PATCH 041/138] Refactored downloads activity to be able to use
 update functionality in dashboard.

---
 OsmAnd/res/layout/dash_updates_fragment.xml   |   6 +
 .../plus/dashboard/DashFavoritesFragment.java |  13 +-
 .../plus/dashboard/DashPluginsFragment.java   |   3 -
 .../plus/dashboard/DashUpdatesFragment.java   |  48 +++++++
 .../plus/dashboard/DashboardActivity.java     |  21 ++-
 .../plus/download/BaseDownloadActivity.java   | 133 ++++++++++++++++++
 .../plus/download/DownloadActivity.java       |  92 +-----------
 .../plus/download/DownloadIndexesThread.java  |   4 +-
 8 files changed, 218 insertions(+), 102 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java

diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
index 0334c02e46..bd0eae9de4 100644
--- a/OsmAnd/res/layout/dash_updates_fragment.xml
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -8,6 +8,7 @@
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content">
 	<LinearLayout
+			android:layout_gravity="center_vertical"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">
 		<TextView android:text="@string/map_update"
@@ -24,4 +25,9 @@
 				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
+	<LinearLayout android:id="@+id/updates_items"
+				  android:orientation="vertical"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 920120f102..a1e306fefe 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -63,6 +63,12 @@ public class DashFavoritesFragment extends DashBaseFragment {
 		View mainView = getView();
 		final FavouritesDbHelper helper = getMyApplication().getFavorites();
 		final List<FavouritePoint> points = new ArrayList<FavouritePoint>(helper.getFavouritePoints());
+		if (points.size() == 0){
+			(mainView.findViewById(R.id.main_fav)).setVisibility(View.GONE);
+			return;
+		} else {
+			(mainView.findViewById(R.id.main_fav)).setVisibility(View.VISIBLE);
+		}
 		Collections.sort(points, new Comparator<FavouritePoint>() {
 			@Override
 			public int compare(FavouritePoint point, FavouritePoint point2) {
@@ -76,12 +82,7 @@ public class DashFavoritesFragment extends DashBaseFragment {
 		});
 		LinearLayout favorites = (LinearLayout) mainView.findViewById(R.id.favorites);
 		favorites.removeAllViews();
-		if (points.size() == 0){
-			(mainView.findViewById(R.id.main_fav)).setVisibility(View.GONE);
-			return;
-		} else {
-			(mainView.findViewById(R.id.main_fav)).setVisibility(View.VISIBLE);
-		}
+
 
 		if (points.size() > 3){
 			while (points.size() != 3){
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index 10b57d41ca..a853e357a1 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -72,8 +72,5 @@ public class DashPluginsFragment extends DashBaseFragment {
 			view.setLayoutParams(lp);
 			layout.addView(view);
 		}
-
-
-
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index 11ee470320..cc24de5ea6 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -5,7 +5,15 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import net.osmand.plus.R;
+import net.osmand.plus.download.BaseDownloadActivity;
+import net.osmand.plus.download.DownloadEntry;
+import net.osmand.plus.download.IndexItem;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Denis on 21.11.2014.
@@ -21,4 +29,44 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 	}
+
+	public void updatedDownloadsList(List<IndexItem> list) {
+		View mainView = getView();
+		if (mainView == null) {
+			return;
+		}
+		if (list.size() > 0) {
+			mainView.setVisibility(View.VISIBLE);
+		} else {
+			mainView.setVisibility(View.GONE);
+			return;
+		}
+		LinearLayout updates = (LinearLayout) mainView.findViewById(R.id.updates_items);
+		updates.removeAllViews();
+
+		for (int i = 0; i < list.size(); i++) {
+			final IndexItem item = list.get(i);
+			if (i > 2) {
+				break;
+			}
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_updates_item, null, false);
+			String eName = item.getVisibleDescription(getMyApplication()) + "\n"
+					+ item.getVisibleName(getMyApplication(), getMyApplication().getResourceManager().getOsmandRegions());
+			String d = item.getDate(getMyApplication().getResourceManager().getDateFormat()) + "\n" + item.getSizeDescription(getMyApplication());
+			((TextView) view.findViewById(R.id.map_name)).setText(eName);
+			((TextView) view.findViewById(R.id.map_descr)).setText(d);
+			(view.findViewById(R.id.btn_download)).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
+					getDownloadActivity().getEntriesToDownload().put(item, download);
+				}
+			});
+		}
+	}
+
+	private BaseDownloadActivity getDownloadActivity(){
+		return (BaseDownloadActivity)getActivity();
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 9f4f676e84..1b2f8a6c17 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -22,6 +22,9 @@ import net.osmand.plus.activities.MainMenuActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TipsAndTricksActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
+import net.osmand.plus.download.BaseDownloadActivity;
+import net.osmand.plus.download.DownloadActivityType;
+import net.osmand.plus.download.DownloadIndexesThread;
 import net.osmand.util.MapUtils;
 
 import java.util.*;
@@ -29,9 +32,11 @@ import java.util.*;
 /**
  * Created by Denis on 05.11.2014.
  */
-public class DashboardActivity extends SherlockFragmentActivity {
+public class DashboardActivity extends BaseDownloadActivity {
 	public static final boolean TIPS_AND_TRICKS = false;
 
+	public static DownloadIndexesThread downloadListIndexThread;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -41,6 +46,16 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
 
+		if(downloadListIndexThread == null) {
+			downloadListIndexThread = new DownloadIndexesThread(this);
+		}
+		if (downloadListIndexThread.getCachedIndexFiles() != null && downloadListIndexThread.isDownloadedFromInternet()) {
+			downloadListIndexThread.runCategorization(DownloadActivityType.NORMAL_FILE);
+		} else {
+			downloadListIndexThread.runReloadIndexFiles();
+		}
+		downloadListIndexThread.setUiActivity(this);
+
 		android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
 		android.support.v4.app.FragmentTransaction fragmentTransaction = manager.beginTransaction();
 
@@ -92,10 +107,6 @@ public class DashboardActivity extends SherlockFragmentActivity {
 		return true;
 	}
 
-	private OsmandApplication getMyApplication() {
-		return (OsmandApplication) getApplication();
-	}
-
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
new file mode 100644
index 0000000000..584dba9511
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -0,0 +1,133 @@
+package net.osmand.plus.download;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+
+import java.text.MessageFormat;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Denis on 25.11.2014.
+ */
+public class BaseDownloadActivity extends SherlockFragmentActivity {
+	protected DownloadActivityType type = DownloadActivityType.NORMAL_FILE;
+	protected OsmandSettings settings;
+	public static DownloadIndexesThread downloadListIndexThread;
+
+	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
+
+	public void updateDownloadList(List<IndexItem> list){
+
+	}
+
+	public void updateProgress(boolean updateOnlyProgress) {
+
+	}
+
+	public DownloadActivityType getDownloadType(){
+		return type;
+	}
+
+	public Map<IndexItem, List<DownloadEntry>> getEntriesToDownload() {
+		if(downloadListIndexThread == null) {
+			return new LinkedHashMap<IndexItem, List<DownloadEntry>>();
+		}
+		return downloadListIndexThread.getEntriesToDownload();
+	}
+
+	public void downloadedIndexes() {
+
+	}
+
+	public void updateDownloadButton(boolean scroll) {
+
+	}
+
+	public void downloadListUpdated(){
+
+	}
+
+	public OsmandApplication getMyApplication(){
+		return (OsmandApplication)getApplication();
+	}
+
+	public void categorizationFinished(List<IndexItem> filtered, List<IndexItemCategory> cats){
+
+	}
+
+	public void downloadFilesPreCheckSpace() {
+		double sz = 0;
+		List<DownloadEntry> list = downloadListIndexThread.flattenDownloadEntries();
+		for (DownloadEntry es :  list) {
+			sz += es.sizeMB;
+		}
+		// get availabile space
+		double asz = downloadListIndexThread.getAvailableSpace();
+		if (asz != -1 && asz > 0 && sz / asz > 0.4) {
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setMessage(MessageFormat.format(getString(R.string.download_files_question_space), list.size(), sz, asz));
+			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					downloadListIndexThread.runDownloadFiles();
+				}
+			});
+			builder.setNegativeButton(R.string.default_buttons_no, null);
+			builder.show();
+		} else {
+			downloadListIndexThread.runDownloadFiles();
+		}
+	}
+
+	protected void downloadFilesCheckFreeVersion() {
+		if (Version.isFreeVersion(getMyApplication()) ) {
+			int total = settings.NUMBER_OF_FREE_DOWNLOADS.get();
+			boolean wiki = false;
+			for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) {
+				if (es.getBasename() != null && es.getBasename().contains("_wiki")) {
+					wiki = true;
+					break;
+				} else if (DownloadActivityType.isCountedInDownloads(es.getType())) {
+					total++;
+				}
+			}
+			if (total > MAXIMUM_AVAILABLE_FREE_DOWNLOADS || wiki) {
+				String msgTx = getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS + "");
+				AlertDialog.Builder msg = new AlertDialog.Builder(this);
+				msg.setTitle(R.string.free_version_title);
+				msg.setMessage(msgTx);
+				msg.setPositiveButton(R.string.default_buttons_ok, null);
+				msg.show();
+			} else {
+				downloadFilesCheckInternet();
+			}
+		} else {
+			downloadFilesCheckInternet();
+		}
+	}
+
+	protected void downloadFilesCheckInternet() {
+		if(!getMyApplication().getSettings().isWifiConnected()) {
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setMessage(getString(R.string.download_using_mobile_internet));
+			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					downloadFilesPreCheckSpace();
+				}
+			});
+			builder.setNegativeButton(R.string.default_buttons_no, null);
+			builder.show();
+		} else {
+			downloadFilesPreCheckSpace();
+		}
+	}
+}
+
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 3f0e10aada..7c5d98020b 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -35,15 +35,10 @@ import java.util.*;
 /**
  * Created by Denis on 08.09.2014.
  */
-public class DownloadActivity extends SherlockFragmentActivity {
+public class DownloadActivity extends BaseDownloadActivity {
 
 	private TabHost tabHost;
 	private FavouritesActivity.TabsAdapter mTabsAdapter;
-	public static DownloadIndexesThread downloadListIndexThread;
-	private DownloadActivityType type = DownloadActivityType.NORMAL_FILE;
-	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
-
-	private OsmandSettings settings;
 
 	private View progressView;
 	private ProgressBar indeterminateProgressBar;
@@ -241,8 +236,6 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		return localIndexInfos;
 	}
 
-	public DownloadActivityType getDownloadType() { return type;}
-
 	public void setType(DownloadActivityType type) { this.type = type;}
 
 	public void changeType(final DownloadActivityType tp) {
@@ -253,90 +246,12 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
-	public void downloadFilesPreCheckSpace() {
-		double sz = 0;
-		List<DownloadEntry> list = downloadListIndexThread.flattenDownloadEntries();
-		for (DownloadEntry es :  list) {
-			sz += es.sizeMB;
-		}
-		// get availabile space
-		double asz = downloadListIndexThread.getAvailableSpace();
-		if (asz != -1 && asz > 0 && sz / asz > 0.4) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setMessage(MessageFormat.format(getString(R.string.download_files_question_space), list.size(), sz, asz));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					downloadListIndexThread.runDownloadFiles();
-				}
-			});
-			builder.setNegativeButton(R.string.default_buttons_no, null);
-			builder.show();
-		} else {
-			downloadListIndexThread.runDownloadFiles();
-		}
-
-	}
-
-	public Map<IndexItem, List<DownloadEntry>> getEntriesToDownload() {
-		if(downloadListIndexThread == null) {
-			return new LinkedHashMap<IndexItem, List<DownloadEntry>>();
-		}
-		return downloadListIndexThread.getEntriesToDownload();
-	}
-
 	@Override
 	public void onPause() {
 		super.onPause();
 		(getMyApplication()).setDownloadActivity(null);
 	}
 
-	protected void downloadFilesCheckFreeVersion() {
-		if (Version.isFreeVersion(getMyApplication()) ) {
-			int total = settings.NUMBER_OF_FREE_DOWNLOADS.get();
-			boolean wiki = false;
-			for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) {
-				if (es.getBasename() != null && es.getBasename().contains("_wiki")) {
-					wiki = true;
-					break;
-				} else if (DownloadActivityType.isCountedInDownloads(es.getType())) {
-					total++;
-				}
-			}
-			if (total > MAXIMUM_AVAILABLE_FREE_DOWNLOADS || wiki) {
-				String msgTx = getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS + "");
-				AlertDialog.Builder msg = new AlertDialog.Builder(this);
-				msg.setTitle(R.string.free_version_title);
-				msg.setMessage(msgTx);
-				msg.setPositiveButton(R.string.default_buttons_ok, null);
-				msg.show();
-			} else {
-				downloadFilesCheckInternet();
-			}
-		} else {
-			downloadFilesCheckInternet();
-		}
-	}
-
-	protected void downloadFilesCheckInternet() {
-		if(!getMyApplication().getSettings().isWifiConnected()) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setMessage(getString(R.string.download_using_mobile_internet));
-			builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					downloadFilesPreCheckSpace();
-				}
-			});
-			builder.setNegativeButton(R.string.default_buttons_no, null);
-			builder.show();
-		} else {
-			downloadFilesPreCheckSpace();
-		}
-	}
-
-	public OsmandApplication getMyApplication(){ return (OsmandApplication)getApplication();}
-
 	public void showDialogOfFreeDownloadsIfNeeded() {
 		if (Version.isFreeVersion(getMyApplication())) {
 			AlertDialog.Builder msg = new AlertDialog.Builder(this);
@@ -361,6 +276,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
+	@Override
 	public void updateProgress(boolean updateOnlyProgress) {
 		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
 		//needed when rotation is performed and progress can be null
@@ -411,6 +327,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		bld.show();
 	}
 
+	@Override
 	public void updateDownloadList(List<IndexItem> list){
 		for(WeakReference<Fragment> ref : fragList) {
 			Fragment f = ref.get();
@@ -422,6 +339,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
+	@Override
 	public void categorizationFinished(List<IndexItem> filtered, List<IndexItemCategory> cats){
 		for(WeakReference<Fragment> ref : fragList) {
 			Fragment f = ref.get();
@@ -444,6 +362,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
+	@Override
 	public void downloadedIndexes(){
 		for(WeakReference<Fragment> ref : fragList) {
 			Fragment f = ref.get();
@@ -464,6 +383,7 @@ public class DownloadActivity extends SherlockFragmentActivity {
 
 	}
 
+	@Override
 	public void updateDownloadButton(boolean scroll) {
 //		View view = getView();
 //		if (view == null || getExpandableListView() == null){
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 7490993b42..548b8e9637 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -43,7 +43,7 @@ import android.view.View;
 import android.widget.Toast;
 
 public class DownloadIndexesThread {
-	private DownloadActivity uiActivity = null;
+	private BaseDownloadActivity uiActivity = null;
 	private IndexFileList indexFiles = null;
 	private Map<IndexItem, List<DownloadEntry>> entriesToDownload = new ConcurrentHashMap<IndexItem, List<DownloadEntry>>();
 	private Set<DownloadEntry> currentDownloads = new HashSet<DownloadEntry>();
@@ -69,7 +69,7 @@ public class DownloadIndexesThread {
 		indexFiles = null;
 	}
 	
-	public void setUiActivity(DownloadActivity uiActivity) {
+	public void setUiActivity(BaseDownloadActivity uiActivity) {
 		this.uiActivity = uiActivity;
 	}
 	

From 742eb0a64a49b6fb10d0e2485785394e2dbbe533 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Tue, 25 Nov 2014 18:23:37 +0200
Subject: [PATCH 042/138] Added view for map updates

---
 OsmAnd/res/layout/dash_updates_fragment.xml   | 10 +++++--
 OsmAnd/res/layout/dash_updates_item.xml       |  5 ++++
 .../plus/dashboard/DashUpdatesFragment.java   | 29 ++++++++++++++++--
 .../plus/dashboard/DashboardActivity.java     | 30 +++++++++----------
 .../plus/download/BaseDownloadActivity.java   | 25 ++++++++++++++++
 .../plus/download/DownloadActivity.java       | 17 ++---------
 .../plus/download/UpdatesIndexFragment.java   |  2 +-
 7 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
index bd0eae9de4..8e4d96408c 100644
--- a/OsmAnd/res/layout/dash_updates_fragment.xml
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -10,12 +10,18 @@
 	<LinearLayout
 			android:layout_gravity="center_vertical"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="40dp">
 		<TextView android:text="@string/map_update"
 				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"/>
+				  android:layout_height="fill_parent"
+				  android:paddingTop="2dp"
+				  android:gravity="center_vertical"
+				  android:layout_marginLeft="15dp"
+				  android:textSize="14sp"
+				  android:textColor="@color/dashboard_black"/>
 		<TextView android:id="@+id/update_count"
 				  android:layout_width="wrap_content"
+				  android:textColor="@color/dashboard_blue"
 				  android:layout_height="wrap_content"/>
 		<View android:layout_width="0dp"
 			  android:layout_weight="1"
diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
index 441041f8fb..b8e32894c0 100644
--- a/OsmAnd/res/layout/dash_updates_item.xml
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -6,13 +6,18 @@
 			  android:layout_marginLeft="12dp"
 			  android:layout_marginRight="12dp"
 			  android:layout_height="50dp">
+	<View android:layout_width="match_parent"
+		  android:background="@color/dashboard_divider"
+		  android:layout_height="1dp"/>
 	<LinearLayout android:orientation="horizontal"
+				  android:layout_marginLeft="12dp"
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
 		<LinearLayout android:orientation="vertical"
 					  android:layout_width="fill_parent"
 					  android:layout_height="50dp">
 			<TextView android:id="@+id/map_name"
+					  android:textColor="@color/dashboard_black"
 					  android:layout_width="wrap_content"
 					  android:layout_height="wrap_content"/>
 			<TextView android:id="@+id/map_descr"
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index cc24de5ea6..c5e5202cd8 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.dashboard;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
@@ -9,6 +10,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import net.osmand.plus.R;
 import net.osmand.plus.download.BaseDownloadActivity;
+import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadEntry;
 import net.osmand.plus.download.IndexItem;
 
@@ -22,6 +24,14 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false);
+		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent intent = new Intent(view.getContext(), getMyApplication().getAppCustomization().getDownloadIndexActivity());
+				intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.UPDATES_TAB);
+				getActivity().startActivity(intent);
+			}
+		});
 		return view;
 	}
 
@@ -30,8 +40,17 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		super.onCreate(savedInstanceState);
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (BaseDownloadActivity.downloadListIndexThread != null){
+			updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate());
+		}
+	}
+
 	public void updatedDownloadsList(List<IndexItem> list) {
 		View mainView = getView();
+		//it may be null because download index thread is async
 		if (mainView == null) {
 			return;
 		}
@@ -41,6 +60,9 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			mainView.setVisibility(View.GONE);
 			return;
 		}
+
+		((TextView)mainView.findViewById(R.id.update_count)).setText(String.valueOf(list.size()));
+
 		LinearLayout updates = (LinearLayout) mainView.findViewById(R.id.updates_items);
 		updates.removeAllViews();
 
@@ -51,9 +73,9 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			}
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_updates_item, null, false);
-			String eName = item.getVisibleDescription(getMyApplication()) + "\n"
-					+ item.getVisibleName(getMyApplication(), getMyApplication().getResourceManager().getOsmandRegions());
-			String d = item.getDate(getMyApplication().getResourceManager().getDateFormat()) + "\n" + item.getSizeDescription(getMyApplication());
+			String name = item.getVisibleName(getMyApplication(), getMyApplication().getResourceManager().getOsmandRegions());
+			String d = item.getDate(getMyApplication().getResourceManager().getDateFormat()) + ", " + item.getSizeDescription(getMyApplication());
+			String eName = name.replace("\n", " ");
 			((TextView) view.findViewById(R.id.map_name)).setText(eName);
 			((TextView) view.findViewById(R.id.map_descr)).setText(d);
 			(view.findViewById(R.id.btn_download)).setOnClickListener(new View.OnClickListener() {
@@ -63,6 +85,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 					getDownloadActivity().getEntriesToDownload().put(item, download);
 				}
 			});
+			updates.addView(view);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 1b2f8a6c17..e51536dcc3 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,11 +23,10 @@ import net.osmand.plus.activities.MainMenuActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TipsAndTricksActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
-import net.osmand.plus.download.BaseDownloadActivity;
-import net.osmand.plus.download.DownloadActivityType;
-import net.osmand.plus.download.DownloadIndexesThread;
+import net.osmand.plus.download.*;
 import net.osmand.util.MapUtils;
 
+import java.lang.ref.WeakReference;
 import java.util.*;
 
 /**
@@ -35,8 +35,6 @@ import java.util.*;
 public class DashboardActivity extends BaseDownloadActivity {
 	public static final boolean TIPS_AND_TRICKS = false;
 
-	public static DownloadIndexesThread downloadListIndexThread;
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -46,16 +44,6 @@ public class DashboardActivity extends BaseDownloadActivity {
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
 
-		if(downloadListIndexThread == null) {
-			downloadListIndexThread = new DownloadIndexesThread(this);
-		}
-		if (downloadListIndexThread.getCachedIndexFiles() != null && downloadListIndexThread.isDownloadedFromInternet()) {
-			downloadListIndexThread.runCategorization(DownloadActivityType.NORMAL_FILE);
-		} else {
-			downloadListIndexThread.runReloadIndexFiles();
-		}
-		downloadListIndexThread.setUiActivity(this);
-
 		android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
 		android.support.v4.app.FragmentTransaction fragmentTransaction = manager.beginTransaction();
 
@@ -107,6 +95,18 @@ public class DashboardActivity extends BaseDownloadActivity {
 		return true;
 	}
 
+	@Override
+	public void updateDownloadList(List<IndexItem> list){
+		for(WeakReference<Fragment> ref : fragList) {
+			Fragment f = ref.get();
+			if(f instanceof DashUpdatesFragment) {
+				if(!f.isDetached()) {
+					((DashUpdatesFragment) f).updatedDownloadsList(list);
+				}
+			}
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 584dba9511..f1b7dad636 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -2,13 +2,17 @@ package net.osmand.plus.download;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 
+import java.lang.ref.WeakReference;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,9 +24,24 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 	protected DownloadActivityType type = DownloadActivityType.NORMAL_FILE;
 	protected OsmandSettings settings;
 	public static DownloadIndexesThread downloadListIndexThread;
+	protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
 
 	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
 
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if(downloadListIndexThread == null) {
+			downloadListIndexThread = new DownloadIndexesThread(this);
+		}
+		if (downloadListIndexThread.getCachedIndexFiles() != null && downloadListIndexThread.isDownloadedFromInternet()) {
+			downloadListIndexThread.runCategorization(type);
+		} else {
+			downloadListIndexThread.runReloadIndexFiles();
+		}
+		downloadListIndexThread.setUiActivity(this);
+	}
+
 	public void updateDownloadList(List<IndexItem> list){
 
 	}
@@ -129,5 +148,11 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 			downloadFilesPreCheckSpace();
 		}
 	}
+
+	@Override
+	public void onAttachFragment(Fragment fragment) {
+		fragList.add(new WeakReference<Fragment>(fragment));
+	}
+
 }
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 7c5d98020b..732fa7e9dc 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -47,7 +47,6 @@ public class DownloadActivity extends BaseDownloadActivity {
 	private TextView progressPercent;
 	private ImageView cancel;
 	private List<LocalIndexInfo> localIndexInfos = new ArrayList<LocalIndexInfo>();
-	List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
 
 	private String initialFilter = "";
 
@@ -56,6 +55,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 
 	public static final String TAB_TO_OPEN = "Tab_to_open";
 	public static final String DOWNLOAD_TAB = "download";
+	public static final String UPDATES_TAB = "updates";
 
 
 	@Override
@@ -66,15 +66,6 @@ public class DownloadActivity extends BaseDownloadActivity {
 		setProgressBarIndeterminateVisibility(false);
 
 		setContentView(R.layout.tab_content);
-		if(downloadListIndexThread == null) {
-			downloadListIndexThread = new DownloadIndexesThread(this);
-		}
-		if (downloadListIndexThread.getCachedIndexFiles() != null && downloadListIndexThread.isDownloadedFromInternet()) {
-			downloadListIndexThread.runCategorization(type);
-		} else {
-			downloadListIndexThread.runReloadIndexFiles();
-		}
-		downloadListIndexThread.setUiActivity(this);
 
 		settings = ((OsmandApplication) getApplication()).getSettings();
 		tabHost = (TabHost) findViewById(android.R.id.tabhost);
@@ -145,6 +136,8 @@ public class DownloadActivity extends BaseDownloadActivity {
 			if (tab != null) {
 				if (tab.equals(DOWNLOAD_TAB)){
 					tabHost.setCurrentTab(1);
+				} else if (tab.equals(UPDATES_TAB)){
+					tabHost.setCurrentTab(2);
 				}
 			}
 		}
@@ -439,10 +432,6 @@ public class DownloadActivity extends BaseDownloadActivity {
 		return ((OsmandApplication) getApplication()).getSettings().isLightActionBar();
 	}
 
-	@Override
-	public void onAttachFragment(Fragment fragment) {
-		fragList.add(new WeakReference<Fragment>(fragment));
-	}
 
 	private void copyFilesForAndroid19(final String newLoc) {
 		SettingsGeneralActivity.MoveFilesToDifferentDirectory task =
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index 3a123d86af..b6f8b3f0f9 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -42,7 +42,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 		updateColor = getResources().getColor(R.color.color_update);
 		osmandRegions = getMyApplication().getResourceManager().getOsmandRegions();
 		List<IndexItem> indexItems = new ArrayList<IndexItem>();
-		if (DownloadActivity.downloadListIndexThread != null) {
+		if (BaseDownloadActivity.downloadListIndexThread != null) {
 			indexItems = DownloadActivity.downloadListIndexThread.getItemsToUpdate();
 		}
 		listAdapter = new UpdateIndexAdapter(getDownloadActivity(), R.layout.download_index_list_item, indexItems);

From 6274356bc9d8356a3f1a8384d989a3a100cecac4 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 26 Nov 2014 12:53:29 +0200
Subject: [PATCH 043/138] Update functionality in dashboard created

---
 OsmAnd/res/layout/dash_updates_item.xml                      | 5 ++++-
 .../src/net/osmand/plus/dashboard/DashUpdatesFragment.java   | 1 +
 .../src/net/osmand/plus/download/BaseDownloadActivity.java   | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
index b8e32894c0..f87f4ddf50 100644
--- a/OsmAnd/res/layout/dash_updates_item.xml
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -14,7 +14,9 @@
 				  android:layout_width="fill_parent"
 				  android:layout_height="wrap_content">
 		<LinearLayout android:orientation="vertical"
-					  android:layout_width="fill_parent"
+					  android:layout_gravity="center_vertical"
+					  android:layout_width="0dp"
+					  android:layout_weight="1"
 					  android:layout_height="50dp">
 			<TextView android:id="@+id/map_name"
 					  android:textColor="@color/dashboard_black"
@@ -25,6 +27,7 @@
 					  android:layout_height="wrap_content"/>
 		</LinearLayout>
 		<Button android:id="@+id/btn_download"
+				android:drawableStart="@drawable/ic_action_gup_light"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 	</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index c5e5202cd8..c028292e85 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -83,6 +83,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 				public void onClick(View view) {
 					List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
 					getDownloadActivity().getEntriesToDownload().put(item, download);
+					getDownloadActivity().startDownload();
 				}
 			});
 			updates.addView(view);
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index f1b7dad636..749c842236 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -81,6 +81,10 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 
 	}
 
+	public void startDownload(){
+		downloadFilesCheckFreeVersion();
+	}
+
 	public void downloadFilesPreCheckSpace() {
 		double sz = 0;
 		List<DownloadEntry> list = downloadListIndexThread.flattenDownloadEntries();

From 96dd45fa217ee5a7451dc231d4d3508e3af94ec1 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 26 Nov 2014 14:16:38 +0200
Subject: [PATCH 044/138] Updated functionality added in dashboard and it
 works. Sometimes...

---
 OsmAnd/res/layout/dash_updates_item.xml       | 15 ++++++----
 .../plus/dashboard/DashUpdatesFragment.java   |  6 ++--
 .../plus/dashboard/DashboardActivity.java     | 30 +++++++++++++++++++
 .../plus/download/BaseDownloadActivity.java   | 12 +++++++-
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
index f87f4ddf50..c3e257f1f0 100644
--- a/OsmAnd/res/layout/dash_updates_item.xml
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -11,13 +11,14 @@
 		  android:layout_height="1dp"/>
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_marginLeft="12dp"
+				  android:layout_marginRight="12dp"
 				  android:layout_width="fill_parent"
-				  android:layout_height="wrap_content">
+				  android:layout_height="fill_parent">
 		<LinearLayout android:orientation="vertical"
 					  android:layout_gravity="center_vertical"
 					  android:layout_width="0dp"
 					  android:layout_weight="1"
-					  android:layout_height="50dp">
+					  android:layout_height="wrap_content">
 			<TextView android:id="@+id/map_name"
 					  android:textColor="@color/dashboard_black"
 					  android:layout_width="wrap_content"
@@ -27,13 +28,17 @@
 					  android:layout_height="wrap_content"/>
 		</LinearLayout>
 		<Button android:id="@+id/btn_download"
-				android:drawableStart="@drawable/ic_action_gup_light"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:layout_gravity="center_vertical"
+				android:background="@drawable/ic_action_gup_light"
+				android:layout_width="40dp"
+				android:layout_height="40dp"/>
 	</LinearLayout>
 
 	<ProgressBar android:id="@+id/ProgressBar"
+				 android:layout_marginLeft="12dp"
+				 android:layout_marginRight="12dp"
 				 android:visibility="gone"
+				 style="?android:attr/progressBarStyleHorizontal"
 				 android:layout_width="fill_parent"
 				 android:layout_height="wrap_content"/>
 
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index c028292e85..78db2e16e9 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import net.osmand.plus.R;
 import net.osmand.plus.download.BaseDownloadActivity;
@@ -78,12 +79,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			String eName = name.replace("\n", " ");
 			((TextView) view.findViewById(R.id.map_name)).setText(eName);
 			((TextView) view.findViewById(R.id.map_descr)).setText(d);
+			final ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.ProgressBar);
 			(view.findViewById(R.id.btn_download)).setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
-					getDownloadActivity().getEntriesToDownload().put(item, download);
-					getDownloadActivity().startDownload();
+					getDownloadActivity().startDownload(progressBar, item);
 				}
 			});
 			updates.addView(view);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index e51536dcc3..775a6e5703 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.TypedValue;
@@ -22,6 +23,7 @@ import net.osmand.plus.activities.HelpActivity;
 import net.osmand.plus.activities.MainMenuActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TipsAndTricksActivity;
+import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.download.*;
 import net.osmand.util.MapUtils;
@@ -33,6 +35,8 @@ import java.util.*;
  * Created by Denis on 05.11.2014.
  */
 public class DashboardActivity extends BaseDownloadActivity {
+
+
 	public static final boolean TIPS_AND_TRICKS = false;
 
 	@Override
@@ -107,6 +111,32 @@ public class DashboardActivity extends BaseDownloadActivity {
 		}
 	}
 
+	@Override
+	public void updateProgress(boolean updateOnlyProgress) {
+		//needed when rotation is performed and progress can be null
+		if (progressBar == null){
+			return;
+		}
+		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask();
+
+		if(updateOnlyProgress){
+			if(!basicProgressAsyncTask.isIndeterminate()){
+				progressBar.setProgress(basicProgressAsyncTask.getProgressPercentage());
+			}
+		} else {
+			boolean visible = basicProgressAsyncTask != null && basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
+			if (!visible) {
+				return;
+			}
+
+			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
+			progressBar.setVisibility(intermediate ? View.GONE : View.VISIBLE);
+			if (!intermediate) {
+				progressBar.setProgress(basicProgressAsyncTask.getProgressPercentage());
+			}
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 749c842236..3847241aea 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -4,6 +4,8 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.widget.ProgressBar;
+import android.widget.Toast;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
@@ -25,6 +27,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 	protected OsmandSettings settings;
 	public static DownloadIndexesThread downloadListIndexThread;
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
+	protected ProgressBar progressBar;
 
 	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
 
@@ -81,7 +84,14 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 
 	}
 
-	public void startDownload(){
+	public void startDownload(ProgressBar progressBar, IndexItem item){
+		if (downloadListIndexThread.getCurrentRunningTask() != null){
+			Toast.makeText(this, "Please wait before previous download is finished", Toast.LENGTH_SHORT).show();
+			return;
+		}
+		List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
+		getEntriesToDownload().put(item, download);
+		this.progressBar = progressBar;
 		downloadFilesCheckFreeVersion();
 	}
 

From 284e6953c8ef5eb8890ae33af0a50f9007f8b557 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 26 Nov 2014 15:01:22 +0200
Subject: [PATCH 045/138] Made header clickable

---
 .../plus/dashboard/DashboardActivity.java     | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 775a6e5703..9aec4d0252 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -3,12 +3,16 @@ package net.osmand.plus.dashboard;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.text.SpannableString;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,10 +23,7 @@ import com.actionbarsherlock.view.MenuItem;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.*;
-import net.osmand.plus.activities.HelpActivity;
-import net.osmand.plus.activities.MainMenuActivity;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.TipsAndTricksActivity;
+import net.osmand.plus.activities.*;
 import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.download.*;
@@ -36,6 +37,7 @@ import java.util.*;
  */
 public class DashboardActivity extends BaseDownloadActivity {
 
+	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
 
 	public static final boolean TIPS_AND_TRICKS = false;
 
@@ -43,7 +45,21 @@ public class DashboardActivity extends BaseDownloadActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dashboard);
-		getSupportActionBar().setTitle(R.string.app_name_ver);
+
+		final String textVersion = getString(R.string.app_name_ver);
+		getSupportActionBar().setTitle(textVersion);
+		final int abTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
+		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
+		findViewById(abTitleId).setOnClickListener(new View.OnClickListener() {
+			int i=0;
+			@Override
+			public void onClick(View view) {
+				if(i++ > 8) {
+					prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
+					enableLink(DashboardActivity.this, textVersion, (TextView)view);
+				}
+			}
+		});
 		ColorDrawable color = new ColorDrawable(Color.parseColor("#ff8f00"));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
@@ -64,6 +80,20 @@ public class DashboardActivity extends BaseDownloadActivity {
 
 	}
 
+	private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
+		SpannableString content = new SpannableString(textVersion);
+		content.setSpan(new ClickableSpan() {
+
+			@Override
+			public void onClick(View widget) {
+				final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
+				activity.startActivityForResult(mapIntent, 0);
+			}
+		}, 0, content.length(), 0);
+		textVersionView.setText(content);
+		textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
+	}
+
 	@Override
 	public boolean onPrepareOptionsMenu(Menu menu) {
 		menu.add(0, 0, 0, R.string.close).setIcon(R.drawable.ic_ac_help)

From f3a95c842b84562f009467b5920574d085046861 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 26 Nov 2014 18:01:52 +0200
Subject: [PATCH 046/138] Update process now will be visible for Dashboard even
 if it was started at downloads activity

---
 .../plus/dashboard/DashUpdatesFragment.java   | 60 ++++++++++++-
 .../plus/dashboard/DashboardActivity.java     | 88 +++++++++++++++----
 .../plus/download/BaseDownloadActivity.java   | 11 ++-
 .../plus/download/DownloadActivity.java       |  6 ++
 .../plus/download/DownloadIndexFragment.java  |  1 -
 .../plus/download/DownloadIndexesThread.java  | 14 ++-
 6 files changed, 153 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index 78db2e16e9..ddedd551ef 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.dashboard;
 
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
@@ -10,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import net.osmand.plus.R;
+import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadEntry;
@@ -22,6 +24,11 @@ import java.util.List;
  * Created by Denis on 21.11.2014.
  */
 public class DashUpdatesFragment extends DashBaseFragment {
+	private ProgressBar currentProgress;
+	private List<ProgressBar> progressBars = new ArrayList<ProgressBar>();
+	private List<String> baseNames = new ArrayList<String>();
+	private List<View> downloadButtons = new ArrayList<View>();
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false);
@@ -55,6 +62,9 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		if (mainView == null) {
 			return;
 		}
+		progressBars.clear();
+		baseNames.clear();
+		downloadButtons.clear();
 		if (list.size() > 0) {
 			mainView.setVisibility(View.VISIBLE);
 		} else {
@@ -80,17 +90,63 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			((TextView) view.findViewById(R.id.map_name)).setText(eName);
 			((TextView) view.findViewById(R.id.map_descr)).setText(d);
 			final ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.ProgressBar);
-			(view.findViewById(R.id.btn_download)).setOnClickListener(new View.OnClickListener() {
+			View downloadButton = (view.findViewById(R.id.btn_download));
+			downloadButton.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					getDownloadActivity().startDownload(progressBar, item);
+					getDownloadActivity().startDownload(item);
+					currentProgress = progressBar;
 				}
 			});
+			downloadButtons.add(downloadButton);
+			baseNames.add(item.getBasename());
+			progressBars.add(progressBar);
 			updates.addView(view);
 		}
+		updateProgress(BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask(), true);
 	}
 
 	private BaseDownloadActivity getDownloadActivity(){
 		return (BaseDownloadActivity)getActivity();
 	}
+
+	public void updateProgress(BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask, boolean updateOnlyProgress) {
+		if (basicProgressAsyncTask == null){
+			return;
+		}
+		//needed when rotation is performed and progress can be null
+		if (currentProgress == null){
+			getProgressIfPossible(basicProgressAsyncTask.getDescription());
+			if (currentProgress == null){
+				return;
+			}
+		}
+
+		if(updateOnlyProgress){
+			if(!basicProgressAsyncTask.isIndeterminate()){
+				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
+			}
+		} else {
+			boolean visible = basicProgressAsyncTask != null && basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
+			if (!visible) {
+				return;
+			}
+
+			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
+			currentProgress.setVisibility(intermediate ? View.GONE : View.VISIBLE);
+			if (!intermediate) {
+				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
+			}
+		}
+	}
+
+	private void getProgressIfPossible(String message) {
+		for (int i =0; i<baseNames.size(); i++){
+			if (message.equals(getActivity().getString(R.string.downloading_file_new) + " " + baseNames.get(i))){
+				currentProgress = progressBars.get(i);
+				currentProgress.setVisibility(View.VISIBLE);
+				return;
+			}
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 9aec4d0252..5c888972b2 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -1,13 +1,19 @@
 package net.osmand.plus.dashboard;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.text.SpannableString;
@@ -20,6 +26,7 @@ import android.widget.*;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.*;
@@ -29,7 +36,9 @@ import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.download.*;
 import net.osmand.util.MapUtils;
 
+import java.io.File;
 import java.lang.ref.WeakReference;
+import java.text.MessageFormat;
 import java.util.*;
 
 /**
@@ -38,6 +47,7 @@ import java.util.*;
 public class DashboardActivity extends BaseDownloadActivity {
 
 	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
+	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
 
 	public static final boolean TIPS_AND_TRICKS = false;
 
@@ -141,28 +151,21 @@ public class DashboardActivity extends BaseDownloadActivity {
 		}
 	}
 
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		downloadListIndexThread.resetUiActivity(DashboardActivity.class);
+	}
+
 	@Override
 	public void updateProgress(boolean updateOnlyProgress) {
-		//needed when rotation is performed and progress can be null
-		if (progressBar == null){
-			return;
-		}
 		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask();
-
-		if(updateOnlyProgress){
-			if(!basicProgressAsyncTask.isIndeterminate()){
-				progressBar.setProgress(basicProgressAsyncTask.getProgressPercentage());
-			}
-		} else {
-			boolean visible = basicProgressAsyncTask != null && basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
-			if (!visible) {
-				return;
-			}
-
-			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
-			progressBar.setVisibility(intermediate ? View.GONE : View.VISIBLE);
-			if (!intermediate) {
-				progressBar.setProgress(basicProgressAsyncTask.getProgressPercentage());
+		for(WeakReference<Fragment> ref : fragList) {
+			Fragment f = ref.get();
+			if(f instanceof DashUpdatesFragment) {
+				if(!f.isDetached()) {
+					((DashUpdatesFragment) f).updateProgress(basicProgressAsyncTask, updateOnlyProgress);
+				}
 			}
 		}
 	}
@@ -171,4 +174,51 @@ public class DashboardActivity extends BaseDownloadActivity {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		return true;
 	}
+
+	public void checkPreviousRunsForExceptions(boolean firstTime) {
+		long size = getPreferences(MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0);
+		final OsmandApplication app = ((OsmandApplication) getApplication());
+		final File file = app.getAppPath(OsmandApplication.EXCEPTION_PATH);
+		if (file.exists() && file.length() > 0) {
+			if (size != file.length() && !firstTime) {
+				String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
+				AlertDialog.Builder builder = new AccessibleAlertBuilder(DashboardActivity.this);
+				builder.setMessage(msg).setNeutralButton(getString(R.string.close), null);
+				builder.setPositiveButton(R.string.send_report, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Intent intent = new Intent(Intent.ACTION_SEND);
+						intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "osmand.app+crash@gmail.com" }); //$NON-NLS-1$
+						intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
+						intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$
+						intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$
+						StringBuilder text = new StringBuilder();
+						text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$
+						text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$
+						text.append("\nModel : ").append(Build.MODEL); //$NON-NLS-1$
+						text.append("\nProduct : ").append(Build.PRODUCT); //$NON-NLS-1$
+						text.append("\nBuild : ").append(Build.DISPLAY); //$NON-NLS-1$
+						text.append("\nVersion : ").append(Build.VERSION.RELEASE); //$NON-NLS-1$
+						text.append("\nApp Version : ").append(Version.getAppName(app)); //$NON-NLS-1$
+						try {
+							PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
+							if (info != null) {
+								text.append("\nApk Version : ").append(info.versionName).append(" ").append(info.versionCode); //$NON-NLS-1$ //$NON-NLS-2$
+							}
+						} catch (PackageManager.NameNotFoundException e) {
+						}
+						intent.putExtra(Intent.EXTRA_TEXT, text.toString());
+						startActivity(Intent.createChooser(intent, getString(R.string.send_report)));
+					}
+
+				});
+				builder.show();
+			}
+			getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit();
+		} else {
+			if (size > 0) {
+				getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, 0).commit();
+			}
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 3847241aea..bf08db463e 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.download;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -27,7 +28,6 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 	protected OsmandSettings settings;
 	public static DownloadIndexesThread downloadListIndexThread;
 	protected List<WeakReference<Fragment>> fragList = new ArrayList<WeakReference<Fragment>>();
-	protected ProgressBar progressBar;
 
 	public static final int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 10;
 
@@ -42,6 +42,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 		} else {
 			downloadListIndexThread.runReloadIndexFiles();
 		}
+	}
+
+
+	@Override
+	protected void onResume() {
+		super.onResume();
 		downloadListIndexThread.setUiActivity(this);
 	}
 
@@ -84,14 +90,13 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 
 	}
 
-	public void startDownload(ProgressBar progressBar, IndexItem item){
+	public void startDownload(IndexItem item){
 		if (downloadListIndexThread.getCurrentRunningTask() != null){
 			Toast.makeText(this, "Please wait before previous download is finished", Toast.LENGTH_SHORT).show();
 			return;
 		}
 		List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
 		getEntriesToDownload().put(item, download);
-		this.progressBar = progressBar;
 		downloadFilesCheckFreeVersion();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 732fa7e9dc..e5af152690 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -58,6 +58,12 @@ public class DownloadActivity extends BaseDownloadActivity {
 	public static final String UPDATES_TAB = "updates";
 
 
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		BaseDownloadActivity.downloadListIndexThread.resetUiActivity(DownloadActivity.class);
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
index 63195d8e07..71d7cdcc3f 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
@@ -281,7 +281,6 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 	    	EditText filterText = (EditText) getView().findViewById(R.id.search_box);
 	    	filterText.removeTextChangedListener(textWatcher);
 	    }
-		DownloadActivity.downloadListIndexThread.setUiActivity(null);
 	}
 
 	public List<String> toString(List<DownloadActivityType> t) {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 548b8e9637..9746c23f0d 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -72,7 +72,7 @@ public class DownloadIndexesThread {
 	public void setUiActivity(BaseDownloadActivity uiActivity) {
 		this.uiActivity = uiActivity;
 	}
-	
+
 	public List<DownloadEntry> flattenDownloadEntries() {
 		List<DownloadEntry> res = new ArrayList<DownloadEntry>();
 		for(List<DownloadEntry> ens : getEntriesToDownload().values()) {
@@ -120,7 +120,17 @@ public class DownloadIndexesThread {
 	}
 
 	public List<IndexItem> getItemsToUpdate() { return itemsToUpdate;}
-	
+
+	public void resetUiActivity(Class<?> downloadActivityClass) {
+		if (uiActivity== null){
+			return;
+		}
+
+		if (uiActivity.getClass().equals(downloadActivityClass)){
+			uiActivity = null;
+		}
+	}
+
 	public class DownloadIndexesAsyncTask extends BasicProgressAsyncTask<IndexItem, Object, String> implements DownloadFileShowWarning {
 
 		private OsmandPreference<Integer> downloads;

From 6729b4b7d9a7e40bcc11f7f126c087f489395cae Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 27 Nov 2014 15:16:41 +0200
Subject: [PATCH 047/138] Added cancel downlod fucntionality for dashboard

---
 .../ic_download_cancel_normal.png             | Bin 0 -> 1207 bytes
 .../drawable-hdpi/ic_download_cancel_tap.png  | Bin 0 -> 1210 bytes
 .../res/drawable-hdpi/ic_download_normal.png  | Bin 0 -> 1242 bytes
 OsmAnd/res/drawable-hdpi/ic_download_tap.png  | Bin 0 -> 1241 bytes
 .../ic_download_cancel_normal.png             | Bin 0 -> 1204 bytes
 .../drawable-mdpi/ic_download_cancel_tap.png  | Bin 0 -> 1205 bytes
 .../res/drawable-mdpi/ic_download_normal.png  | Bin 0 -> 1172 bytes
 OsmAnd/res/drawable-mdpi/ic_download_tap.png  | Bin 0 -> 1171 bytes
 .../ic_download_cancel_normal.png             | Bin 0 -> 1308 bytes
 .../drawable-xhdpi/ic_download_cancel_tap.png | Bin 0 -> 1311 bytes
 .../res/drawable-xhdpi/ic_download_normal.png | Bin 0 -> 1344 bytes
 OsmAnd/res/drawable-xhdpi/ic_download_tap.png | Bin 0 -> 1342 bytes
 .../ic_download_cancel_normal.png             | Bin 0 -> 1455 bytes
 .../ic_download_cancel_tap.png                | Bin 0 -> 1457 bytes
 .../drawable-xxhdpi/ic_download_normal.png    | Bin 0 -> 1497 bytes
 .../res/drawable-xxhdpi/ic_download_tap.png   | Bin 0 -> 1498 bytes
 OsmAnd/res/drawable/cancel_button.xml         |   8 ++++++
 OsmAnd/res/drawable/dashboard_button.xml      |   4 +--
 OsmAnd/res/drawable/download_button.xml       |   8 ++++++
 OsmAnd/res/layout/dash_updates_item.xml       |  10 ++++----
 .../plus/dashboard/DashUpdatesFragment.java   |  22 +++++++++++++---
 .../plus/download/BaseDownloadActivity.java   |  24 ++++++++++++++++++
 .../plus/download/DownloadActivity.java       |  18 -------------
 23 files changed, 65 insertions(+), 29 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_download_normal.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_download_tap.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_download_normal.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_download_tap.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_download_normal.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_download_tap.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_download_normal.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_download_tap.png
 create mode 100644 OsmAnd/res/drawable/cancel_button.xml
 create mode 100644 OsmAnd/res/drawable/download_button.xml

diff --git a/OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-hdpi/ic_download_cancel_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..debf873368c04f3917f4dcef2a1692f03c67d2a0
GIT binary patch
literal 1207
zcmbVMZ)n_P7?0hUrMNn9FgCTsbjk+H|K#qH^|oD;yY8^5$L(b2HiqvdZ`!m?-ZaVe
z(yE{`H%0Id&iP>=V*}Y74v`7nM5ZE^ZGs>CGa2fn9~8&tW>x&6=$q?Z^+VYQ19{)~
zdGq|9KfmXB@?2?XU}e|3E`lId7PsqVy!Rw;=L)=T=1v{O+uA5!jdmbAYJdO|ISbVw
zS#-fLEJI*TO`L~)1hH(=sZ^t?F{qlzWk90C#IBFg1ktxO_JKJDBeDjE9WP7Wc<&rV
zI#!n2DI1*OYjDKbJ{`av(?b<=ddyTTYU>uVFIKSu7e;`L-El8e<1E#*tKxHV%~E7j
zB^t|83qe(l5~-m8k}{K`O^%nyw8HRmDy^h9kph-kF2f2O%_*uZs+>T!9twL4EL$z>
zg_bWYWvP)U@>P~?G#X4pWKb~7@`|FcoWKeKjWy_S%8Niudtq<ef(}D7aQw(Y9+_AK
zHB^tX6pnNu1=lx>MZ;d$A_`N+#=vKJhGShf$*ZXyMrHVK7)xr0l_?*xWf-D*VB&h%
zy=^e&?$(YHMI4R#P~hOAfN>p}br*V3QO{EN3u8H!ni3?@PJ<dP*_bw9NqDiLNXwiJ
zBqhbAgqqm4vlLz`<oKK>ifK8M;rYCz<OM}5WcqV?C9mZ&sW!Igg%R*f*!JyU-z}_g
zORTB|5JV`bAT-|Yg3<_zP&k5oQq!7MCpYYLJPS3#jY*jnveseXOhT&=AeU_NtU61?
zzzMPi#FRqIlC01*Ac?dhn><~UI1cbYv1?q0YT>Q_%O8t_Vv}b1PxG{|a7QM`#Zkb*
z;xIuEPf&nI<)E=`7?0VdqMob7m#-blb$?8D=1>0eNe`hu_Sv<;SKct!9e@1lVEP^Y
z^7nV`L)u&QsgLI7Uovi9*;IU9`O!V{#98%^Eq^|^F?DlxX5zOGoGaSzm&*4t-B0x|
z3uX`hdhxc`D0q6NG_!W}#Hjl1iz^Ns`D${m`=0%KAAWZ^+P&`?WN+yB`NR8;51gs~
z<aAzr_0!QkcXvH-zfiHrw=3_TT=TlO?U8uZ*Kb~*AP#0<o;_Sj_tkeDc=8Zfe|=)r
z>KDG5?>RQ-@4tQhmtQ>Fu~{#CK7Ygc;m*I7|9#=Rjys56W1zoh*TA{tS5nLm>8JW1
Gefl3NSCvEn

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-hdpi/ic_download_cancel_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..af65969b196ce095a371f9ab19413a8b8c518956
GIT binary patch
literal 1210
zcmbVMOKcle6rIwlimC<#q7`l-noPu}DD(f=GsLZ&u^o?u6XUuxDjS|>p5v)KA7)-^
z$5}KAN<%>`x`0J!q*8=hShOrCAU>i&psK2bKtdoYBnWgxkV?g(8&mPdu>*^!3r3pv
z-hFe={hWL6oGgrw_3zlTgCK~0BbP4XeIR=Kw&V3F?!sBT#ZYDv9rP-w0Rl**EUyen
z!vRyU2!S>8!c{mz5L=JgrAaiIe_As=hXIie({y}{CWw&(O&^#wh{!UWvfU(g^OMgh
z(zcS+VL8v`eH~WqTq}SFTjM3ORWntKI<TJ{X=>Pj0}&vbPTdW)W|HdI)$lpGW+}3x
zf@(=>J*dfifz-VKk}{*vCdW%;TxED!iL3EpQou6HC0K!@IaQNIjT6Z3Lt$@$Rndy+
zY}Xf-l2jETUt`%uqro&p#tWucUR70=6Iel@u?8K^xCk_9Hyr9&NW;(!Y#-U4OGXw!
z*_%d53P-x0g5&4&8;0GmOBAMzZ33U=8IE<FD6fuoh>GyvFgDc=OEW%Xi!k)20~6Py
zGSmZO?(Xg=QpC|{6M>D30_thcoOYm#jC7L1Ul_}_G)0iaN*t7Fse)+(mV}oI6ls~O
z07+FiMJS6sJDcI9Y>H3mVmvM<5<H)g)Qq6&*~Dlnqh|C}Lg`@*H$=cSVb8aXeRr|S
zU9p-TK!CiU<aza87Zj=<^1`a;le*riI{Cz5+qJw#xGyTxde&(e*vFui4LpbJ@T}RJ
z#J~x%1w=)qWl2`)GLS@Cl}(;5OB@GypjOIUg6iU}|H~hXgJPp*`A_rou5d?2$Bj|I
z!p1N`7f(=tN9BvP_r~y;T{qIHQuF#Bucsb(k=&VCSUo!M&f1r5vUuNE?TQ_H{8am;
zj|cZ|KmBJexBtZHzx>6oRv%mY<=U|E%5UvQs>|bFe|G%N#l`#EJo9kUKXSY9_odR}
zvVP{9xu0(R+D4b(&c$fvLHERwcbAmgZ><cTzqI_(J&SM79->#S?FOrF#9p4O`F+1X
z!#vyCGv9ht-221Qym4~pu2|pjp_?}r&TTF19@zH5(b+lyCvMy#zw4iP?fbzq@F8Qi
zzHMRX!%wfAPt;ep81k;Om+w9G?fdQHOLz32SEhb^Zf*<l>ecM1uRnP%`kNS;@$`k!
H=jZ<cM7Ng+

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_download_normal.png b/OsmAnd/res/drawable-hdpi/ic_download_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..75fb954a276c8d6af20cf780b88d2f9ec6af1aae
GIT binary patch
literal 1242
zcmbVMU2NM_6!w%6ww6K%Q%XUs7mrC)n&Y3?N$e$UvN&O3ODSnYqiPSmwr?7@wVl~+
zlT@o{1_LUPh7c=)harA6kS67265>bIic~-oZxfRc5<GNF(-0Ec%N`J-T&GFlq1pqM
zeD6Kyp6~phyF5DbOi$NiT?9e&WRJ;tydUuXJ$}3%VVWP}t=~---7%}=R-uiEq-H4y
zWDPil@(616Q&&-pAbj(Bq39NKCnVJ}g3yx*){F{96GUvdR)Ojaa)E-TbTdx=@zoU)
z=vtf{7jjIll0s$u*n*A57Dfu{!i*|v<nR!P)g-LIKrRF|W7c$}TAXa@mGIeP(<Eq#
zxHEBb%c){+6r?O00U;QsREFh2L=3V*I3h+40}j(P6QwzZVnj&@Nel<tABnBmT1m>w
znYJxV#mTbkRwSCPR;$5kC}`PJG%JcC&2TiwQCNa<>ZS{8l<6GoXpoVk+Iq#+EfaVe
zp<>OsaT0sF6@pR8<+c@@PCHRJWpoWzXg0{uhT+B4l6KrY`qzyerJX{(g6KSQtT|i7
z^(Y<efN}2bZO9YE-bl~cIxY&Fl`VD7K&G3O<0QTbYPu$cIX+a1K!xH<IBihl@lrw|
zN?=Nm7sE`LQ$ig*JK_0E^r##bgoqH0vTT|c)0~*XykuHTr;^cd2b(n=7n&;S*w(S_
zHkQ99R!Z3jx|UtAtl3T%jFv6ea>`Z(q*AS_gQv%JQ?shhpjW1?sAXj9^GM6smH}FM
zmh>HbU^qd8p|D5^ydY8v<U^Dws4S)M3<FsxmJ}vRw(;8k%^!`OqP=GMPxEwGxFfye
z_9$Rtdzg@kC&<R5qSW7f6_44USvgs#{iOW0xjF26V1Hj<sF&F6-{Z@iert7gb@IJs
zxU}}^Hy;JgO~j_z>xY|-!0VqgEb-1SR^s=@_ZtDwyx6!ux#B18Ja{_!vw!`3;j<qG
zUaRhV<hv&lCo_kRFE(lq4K81LyfBuZygd%?`ZpGT{rI;b5Pa%M`1M*JxVwA9_qO)Q
z-o(konVau_uyWvHX6VB1^)KY&-+QNT@0$*Qu|~A}+|2=eb?93r@bC@O-@EzJwKvKu
zU;6H3Cj#$YUW)cyy*04(<JtYk2L~_RB2IPnUO79l@XCer>oM@cu8qsS=Z`EtYF{V2
l`{VaLyX!`|`{gD9)`$}?ChGIo)|b84CYv6Sn@1<l`~yO_m-GMt

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_download_tap.png b/OsmAnd/res/drawable-hdpi/ic_download_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..01989dbc8dae717a86f1dfc3feebbedfc6fc241c
GIT binary patch
literal 1241
zcmbVMUufKP98d4Wc3lrQE0qo`F%?<a<<I4kyGz!1*IuscZM#};hpSj&za+oAhBkki
zq`h33a_iHI(}yY(AAA`&Tp68$gW?zyt;4a0u~9(;5sKi;U<`cFIjp~2@2U@F4+ir4
z{l33^KHvY}ERByHiF6+5#4s$9AC-$}?+f0Jr_p+tS-pU^UN1M{ov_MY6*v$Z(kuny
zc>`2n5dy6?dkYR?Sa@D9O?VT9<DzOA6bLYsZ`g>9VS{Pk2I@5Qa0OO$Qz9N*yFuW(
zCJ`t30#mTFa7rItaNvoBv68wltqK~Eegz-&MWn!h9>9HL#&ktrA{u%{bPld*0&hUP
zX^Gf&YN9ZXXDtWfJe43-CdT1Ofr{~oq>zl_ERty^MY9aa2qGUB85VCo1hVF6Ww9ua
zG;JYCBBngg7HPU#ty0xEWjPf(CI|w}ur$k(2tm3v(*r(fy8SH;GIUi(w>{l5@jxR`
ztT|62kf+-r7<Qqsqu6wti9#u(ePGiuilGf7h^v8iy(0YAja|`hsb)jE2wiK=QBgh0
z{Vg)e-IEOkK;(`1s-vT#fEn3R=L~3id08UR7fRDLF~M^2auO&cS4L?A8i$rLjFUW5
z2Aq&!608z$>Di6XjiiR<1TQ4{R4NwBaYBw2vgmFoC*-n2sYHvLH(d{yDs0)-k?kfo
z^+c|ibs+F8r({_(tu7d!vOLS3vTQt?ZB!jUcv3ettLhE}W!jEfhK@cDwGqcM@J60R
zeHR}Xme)W$A&@-B3#0<LI4SUIj8r&=0Wlzy6(&VA`P%=@AB~)%gJ$_p^R%u|M+V28
zQ9#1ZFhLVdkb_3$<K_BqXw3f1%R?pqC*|?hRyy3ZHXq*?+Uo5HkDOk<cI-v2`&;bH
zYwsQ*`>y&M%E}v)VX|iyC>VA9m->(4kG>-_lZEgzi_r+S`NAKIUq#Lyx-@esz3&0>
z^81JDYv+!he-wJySA6#Q&z7SXzrJ@Rb3d~F*Z27!-p)*p4u7+FhR)pIv)+F2)>wCa
zt^U;Qbe5Ekzju0Y&slfr^T*vA_xd-YnTw&>p1#}ZVNyDJ4n$wN`EwWkcl)QkccXLd
zn;(1`Wh-s72bS-ou`l)xoG%t%ztgt)9RAMUtG{<ihn8xY%c1p3`-S;O%&#lC9(JMg
j!_dvUJsoegW$JC%n*-_E$|w6*gP%=4HzuzRpIZC}QyY|N

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-mdpi/ic_download_cancel_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa58c6672c2732f081c7d402a02e0837c0f87253
GIT binary patch
literal 1204
zcmbVMO>Epm6gH}q(x4!ILPZfjuEU{)cs>5zwaKPz*4t()Hi<SXb%~(L*q+Tgi9OEP
z$!_+7Xd6ONfnJb6aG+|r^iT=GfvSR5P(`9DTxd%KLINd~+C$YAghb1Q@n$!0h<d=1
zXXcIH_kO<jo)3=<?dj@#qLX2muKb``q<eS#-rqsjw+}znMYnBHt{jcxN>qacF&PJ2
zh|PO&0u>Q-=4ZY|eGIc{&MlRra^WSz#$E!(I*Ga$P&C8z?WzaRo<b38p$XSdb2rbN
z<yhBAbNkc+C<Iwlbq5;+jW&i#c4Nxc9d1`Y+gCTJ0S`rxt$WjcXw=hO)2>0!@wLFQ
zO_gXW&8-DhE{w2QOc1LkG~NcH!Y1{EsA@?)*~>~)7C=gn01tFSl?@=Vt%sxDh*L3&
z=I)j+Dy6w<6a|JL)M~XvO-^7kA&9!J3qTSiiKiNTIPXWW&ii3c+k%Ngo47&bVxNsI
zLJQAEX^uv^mVy@)3hRdbutgN5OsK;^5EDS~yg09>b{G}WzhP{s9hT+;BotAIXNgVg
zQR!)eDR=jF6f4qbjA7!^qQGer+p`|>qr92s=$C}!I))}GawQ2ZUa3&pprg>Gf@EF=
z6{zSM&?HN4+t~=OW^_%|QhHKNr9?5Oq%<&)N$OeMlvOzcvTbbM4<qQ?sO{UOzFXMT
zJ+VfXAQ)j%!g#vf1tV1);joGWHk)l$o!zm|^&MObcgAH}%i2W5okPxUf<3m$v*B(K
z1CUe)%9_rrimLM#RAgRPZIQPW0H6r<iUm?!3-A12{sbD75I4(znx}n5J2F15j{+6e
zhY9&~f(RXzAC?B+q+@m|Z)QsMpH?s3*zz@asN+}Vi-9ZEnS*;@&1@FK^WPtP=i>uI
z?6PQ>jn^MI^!}L>M_=2z|8DMSa{B1f*z=S7i>0ql9{liDZtBa0pSO`i7eDy4lgxZ`
zM0{rQjh+*WeF3xh%k~#OVqX6JJ}EQS@n?DS9ZP-o+Jz?{Fa4H$_r}U6d39kReWkcO
zJo?Br`NiCWE9bhOBjxM;pP&C@61?)+mWdzX;^i^0)X{tS_-g-q3(H4t?>Ie-wr|zm
z%GtM;#=9F=&po>O-MDy{EN1^Ye&_6_xrfJ@-aUIC%l*x*#Q%|eZpb_}Fn-`4YFCjW

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-mdpi/ic_download_cancel_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c5e6cb7ce048a85a805f23f72123c061e293854
GIT binary patch
literal 1205
zcmbVMU1$_n6dtjr8k;tRL`*U5bkZLMXXnoE?hM)5%}%UqyK&hp7$St;nYo)Cl9@Zs
z+;umBVzJebf}qe!DfEZZqG%ENR*ALXORM06s3|QiDD_3q+Ey!6XziWNZrX?7LkH&G
zd+wa?{Cww}nJWyx+|mAIJHs#?xou{V?%nabx{a;}=lVM6)=P#)$p|i!8VnJWaj=Eh
zoChaR5kY5q_c=7cFe~@CrBO1Pf7P(Dmw>TOqV5G0%`gL7>H)MT5n(Mf;reOr_Waiz
z>pE#}r<w=(Ad4#QwwVx(%nX<8nMqrBxGgWT19gKM@DPD)-J9|wqn_p(b`5%tuLX{6
zsF2Atw;0rDzQAU2h*&kD@iq_@HmN5>RZHs0&8$Ra0i*;8@IW_I*#HvTd^qYYbjn82
z+}iX-r8HL|BrpV_R;wjyasr1Ff~f1d03<<@c&foi(>{T9-jDiQ7EBb`p&Jkv`)q6x
zTDVHm9F24_1uw|wmkj$+lPF4=P=|paCV=31ab6AWh!oMkVJxd1m8JtE6j6k$p-t;i
z?r(u9cMo?IE7E9;9idB$0;f!DS3TsDoSEk6mxSXwh9)U;ISDOZDO1{@qtK;{WL^bj
zsOTEdBuj4DSq`sebWPM!W>QV1L~%$-X<#su)U&!Nt8xZpTiBc*5$M~f<=dsco7n6_
zu|_sTkl?U{@l>k|3KdLnRKWq8%{HpeZrthm4z5L;;xa8}ZKBZKgPg4)_Sgo`hPzA*
zKvEqjYdWtgs?J+bk$GLUMcz^XfFjh(7D#bTyz_tg6KGIE+${fTp4JuZ$oRN43RGAc
zCgjrz3hAgY-M>9b$LvbZ%#`XsT)%v4%~{adc2)UuaG|n$<!8pe$3IE!|2R6<U&_4D
zd2@XqcV_?Ex89ro^w8dQ<M)T23Qrw6KXzjK_*l=Gx8IZ>pw~;$kHg=t>+P~T!pyy&
zGGCqQ{qXRr@aT%Jg=b!QpV{?$+l|9xFZC_3Pai+9>Kkd-3ia*<cp`AE{I$aDl@0eU
zy|eoMuZ4HdJ_`;U?>;jB1b=6s_wIL}AN^jv4CS83zBsbIx^aF-^?9wZ;ruTnAI$xE
zu<K&y={4(T$Da#kPd~ER{OIRvS05bv`}P}uwFBnPAGw|jC)e(ce<Zn~Ve{nRYy18I
DqqvX+

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_download_normal.png b/OsmAnd/res/drawable-mdpi/ic_download_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae587c1baddae2d238cf32d8e3ff354b1cff97f
GIT binary patch
literal 1172
zcmbVMPiP!f7@xQ?#Fk*tmXKiSV<KuKv-9TP?#_^Hy4gwERX1)o3(2YU&CJ_mNM_z-
z<|VtE9@<o@7WLps&{K<G1t|*JOAkFLmfqSP3oTSzEmF|!rBF(@Z#KKpL+HVQdGCF1
zzTfxf_kG`-Da{@l*fp|?<G6vsVYAHkJ@MP$$JWoz>>FU)Fr8kYbEHaZD8yXOAr=M&
z4=v&{Mowe(DxToD#JXEqpbN$K44ZgK6ze4GUck^CH!)cckiCp4u<)YmXZgP`UFL!7
zWchim2#Y};FS&;|LOi!ITd_BmZQbD~4}gif!3=nqB2f2M{K%+h`L<nyo#Shf2W=I)
zoaMKIS}2x4o`e`^$&_G2Nd;*=DQT&+o*oA>lSP;jWhg-1&=dp8p!4v|Tj*4cvN_Z7
z#iT61L}_4%Vy#w7)|4a(7ez_ebrH&<EDKCSh#Edcb-|BDyB16w*`XUym-ryIh%B;3
zvpkD*D+Mno7Pk%iQHLl-nOH}GC?%ojd2wEC?TD7~zhUgC9aS0u7RxvyYoX2RQ624q
z8F$Zj6f3f5jQ2yA6$P!B#9s5TPYY(2XJ3+z>li6nRjO%Z32K$mh8&eGRjddatRhuU
z!IW$%T{}DBwVXDUR?J*l%VZ>JTFs>3R4%RObyLxl9L#sI1wW$5w{h3E%Y1jR`g5^H
zKE#NUutLa6w+l*3gpz291R$SpR~@`H@A?j@MPqT9wz4*H=&oaDCL|tc^K7^~!~kW@
zK}t#&G*#0D3#p2rYqlg<DuhTvdewp%zJquEFMlEnN{pN3Kh4v<VjUSDw?}~q+rxx?
zHbEg9m9OVU4zMx%v0&yZ^_$j{R%<fRzh`JjIo8t}4iYnT^Y-ndeQ)%={lSsMp)WW0
zUZWp<+U%h}?Y-Z(&aI{fTcg*Hw9Y;@zHc-}2Cwuq_wxgZZ$CNx*U!TrzPp*}{rJQy
z@WGpvTV;#Kql3p2&7s#Gg4O-!jdONG9K7^G^SIi4RBC4LzW&v#2OsqRBA$KnMd|5F
z@7%aE4KBX;TmIn6%lCfo9XEgd!#j_9dv<?*dhCajtN;9oPjU%P8XKSg?%bnq;{QZp
Lde*!!b?nqLy7YPd

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_download_tap.png b/OsmAnd/res/drawable-mdpi/ic_download_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d9386906dd0182c87935ea254f9d128e5ffd0cf
GIT binary patch
literal 1171
zcmbVMU1$_n6rN;djk>8R6(vI9GAYy&XJ>YPc6WxXVKbBHLN+ezLh{t+&dl9pnw`1h
z%-!rJZ<bQ)Lsd`^=|iic_*5!=P!tg%Dhh%=6hx3h+J_bjLW+t|Oz&)VQy+p44$Qsx
z+&SO*`OZ0WtTeH|ckAx048!ym4j5&+?}*->I9<Ox_Hi%W`pM`NIfSdE0RzP3ZEPY?
zaN!IpBWN!izK@0&CN}R>rpQ!rT(hv7gpp3N>G~ASFhj#lA6j#W029qPUXFc!;}#1X
zJI78cMWN{HXx2Hf7@$Lo6BTQ5&Qfi5cpn&QYSe&>2n0>H=7m}_$F}Th^c-FDENH2a
zxg5I|)KswqbQ~a{B-5NFq-2m$lPM*gQ8RmiNM&Bg@}j^As-{SqAcFS8Qg4A>)yl?L
z+ZUB`>?|R^#`BFvBiWFWIGEv6s;csW$crLJHMnrWBe2PN;XucNfkG>AeBxjaL>8fm
z>m<k0NY_$u{bF(5uot$8qLlGX=<}(hz`JggS4%r2W%Pd-8)}D@1t0Nc6ykbd(Rx$|
zI$+A(yB$S}G#c$-;LxJLnt`pli#$>=axDFlv>jVZi?USBK$DZJls0I~bg3eVQ-ms%
z)wGZnO{rsNBfOGVMlzByno+XZRBBYtriGDwM%7hAQlz|~cd!L7B+#=^$G1a$x3R`M
zv6>zrNN`ZWxYp@{(kv!8oW(xS^;Xrvo=L~EaU=XJD$`ol1`3>cWRC^d1udR6XM-37
zQL&+vRyjphRL+F5#Hosv;!If(U<#^LQ^>Myy#2oX@iZttYL>T}r*lO+GCHo00u|PW
z33+sa0y-+Ew%m-S^_PN?uQZ>U|E{hM$9k^KOVhE{em^!wjy$`VNQ@^c@eA?ea%}L&
zzdq>yJ@)69gO7UuW|nK<&HnQj-smst)Bmi<;CO6#*w`H}@7nh3Q7Lhz`*2U+>L=4r
z4qm=~amjcv242RO`RpJ0<$a~Pac|}G(%G)1=Z}|u)9<`Gd8#(STp8%Q_4UdZBd<T*
zQ#iWo$djGlZtuF1JALA#pZog1zk2SQ4>#>Kc3xWQzI*$JGhN*YX7k+O<oH9CkA4${
M(Fx<Hk?F7g1L!|`Jpcdz

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-xhdpi/ic_download_cancel_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..7478fc4366e3e8424d60a6d91db5de5298368bde
GIT binary patch
literal 1308
zcmbVMYiJx*6rNDpm~CE$*w|9+bW+Vmot?+d%<c@k)?_v@8@rpQO~8P;GjlgPCiBS5
zB)f@do0MRrr4RH^TZ6P<@KGZ10kI-Rt<Z`Olqw}DTD5|eN<j-nTE)9bHu@v<hXZr(
zJ$KG`&Uaq(Tx;@?65kddhG8Y~rdT`L{kiv!4QM^^_nd*Y&0a&d*I}i+3~(S;r&$Wb
z;|A!1?GR`qgXdrb!`2P!o!wq{Vwa>^MgZh=0$IaGXbg+&%-TThhaRrLKHZEG*WUYp
zz;!K3bnyu~VaqVBH;p>5V>H>Rj`pjfM(lhDk7Olez<?gWv&MkwO4%r}WLHAx+%-ku
zODbM}lvpO!ooK~n%Yir_5J;6~I6Nc<7+wg8p$Bmm$rK%?Sem3oi4RINi?2Kc^5$qM
zsXf-X;tNSpBJFv$L{XVcCXfjRET@lRL{X$@mSR~FX^`%S>47Y1y486LG3cs}ZhN|A
z;yH^zv4*@TftW6bVAzSos$tVzNfb&Ml?67%1Zc`Ia&awbyIwo|m&TgfZs&*%sdngE
zLyn5-k*dyvQSNT<D5r?nNG*<ziUI~=mO5lW(~HNV1o{%tbWIXiE|>}dh2&BwZ9wDD
zl7c~!r&E9v1zKR0VBXGJc#h`<nU;egJ{)G42Cj~dabiQgzzK~EUmxc4*tqF>z*J%0
zw~l<TVA<PZCE0<%vz$)L8pwA+YufTGH*MLtEH70Z_jl>0W@X&kT$z@mjzLEshFYUz
z8TeA3C4CJJG|OusD2OD_@gk`JE=Y>J%8&|2(|`eDN}<EV3SRra`J)giD%ULkX`cKQ
z>d4%2brg`WI!w?+6Xc*#5r&^QgJA`cc&x57yKwbF!ncnuU*B8u$<4<ecssBlXG_aK
z)$a1&{yIHdy(^@gJQ~^KD~j~^&($2$nl9XU+P*wJzAsdEeg6H$c&7TxKYplaYi^dW
z%&RpoZ2Y<I&&mc+sP!bo4&~F5$*uNXhwdEwe%oTpE$w32O~qePWxw?D<!u9v*2KdH
z2MZ2;)wGwqcO5Yl{^^ZiXn)(;?(xS@e>O*`&wRV3@2%42BgydM#KNX42cEyW<IyAK
zFM6*Zmp`%tPt6t;ef;jGjna<dXJ1K8AEvjycJbGV8$v-cF*(RrUR!_u^WEvO6Z3P$
zJ-w5A@9Wt=GhTUjA@$99U)b-|(z9niJpAPLnTktz(>v@Jn_m^?#qEjt%E{yMbj78q
z-#7f|ojur6b!tp5?E0>yZH{?Un7Y51yk2wao?piHl-}~uSnb!x3a0$b(cJ$k-jIyV
I)c216146jCTmS$7

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-xhdpi/ic_download_cancel_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb72c6ccdb3b69139be8b33cf15791b7da8f0ef5
GIT binary patch
literal 1311
zcmbVMZ%i9y7{9UAA<8m0!LgxUZ+u|t^{(w*+dC<L`VUGhkkSOq679A3wmsnfcz3jg
zEM%J<(K!>Ce9>fP8{3S;OsB?F=A!YFTlQgz*(42S%t98DB@i_sI^BF*TJ!_i2QRtz
zeV_N9-}C&QfA@AzS9^8U-YNt^s{I|FAlw@ZZ{=ffJ@Ftb!mUpC_UpZJOiyttK-zdY
z0#Lum#X%5o{Ky+uK@);(O$woYy+7~@8<j;9SI{w~MFpY}q^TvXaM3}aqY)4nBqz3V
z`CAMXcqi6J2grcp1__~KR0X}GU7_gcV3gspmS(gm%|Zhr&^a_M4oMoDc49@lEIb#k
z2@EZ&=z~sdom79I2X)ITKxvZ=kCJ8zwKFC&ZL>4>mrx6o3DQAWNStI?+RBm^wDe%m
zo65)7pvPD81tlkz&~=3+h*T<NN?A>^8Yj#Q!w{r}uvl=Yfomg@&ZTil+h4Ze0a{cQ
z6kU)dv|y2o$iuo5gG|>$5S2h+!?2{45(QI6q&bB!n@B<w3vm^-H9ZLarLn2D78+3i
z5d@k%tVUryV*ATrn7c<iDkwrWY_}@FqHseVIXWx?N%wo482n=51)jB8C~M5lMQ|zx
z)5h@>Tw=hA(`1aJ7#nG`M66{yo8c*%wz)~S-A+3kX0w-SBRv%3b=fGJ&rG`<bQ$ZH
zG@X;8pzK?KzDro!BeASo1)MIcAz2<OcR^1=)@3arE2!IDtUB7*CrG@U(hd~Lv>vqw
zs6rC(K2;XcVxC!H6Aq+><~gg4!D)(S@CZj)afXhX@d!ndoS9={5z>K`@cjSH9|1`b
zg=YCr^OUb(M;4A7qX31CVFD7IAQg^E_{OJ;2(qQc?`aFAbNA)~JC2e&4dKL-_TP}R
z4cA=VcMdceOjDV|+gD>l3Youf>HMkYzx=tyV}^5oSAKbldUo9S$I^w9&&yBkIdWTi
z;>UNFmPf8O)|@}1FI@U*s(Pt)d8NG@%@15VezG^&y7<=R)jf4<Ki?nw#hQO@?nU=x
zHgo@zhKJ$lD>W4#=XX6fJ&7FbeBASaa_jZ@K<)Iz*W2#SUe93K*sXnczu3_^+2*)?
zEcZ;^iTCa`T<oaqn!On?a@mP1bK{viu6GQ(ca6J4)|CmeerA4eX05s6klpzEK;y&O
z8`QxwhVhDgr*gztkyG&5s$jVOn^3QH;dDpeLT>kV_Y3Xw-otOAH?L>I=l(=YmBQBA
z*7>JDpFq~8_U(+jl80s&s_S2#`*rO2_sc)zk~8F2)Q6w>!rLA&tH$q;nvdS!;(K)_
QTli)9y<MJ*uJF-+0HaIA^#A|>

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_normal.png b/OsmAnd/res/drawable-xhdpi/ic_download_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..432cdfc5c78768bbda86a3387ac6ccc4be36ff4f
GIT binary patch
literal 1344
zcmbVMeN5bB7%wq8B%6r}=#0*;n86l%?e*G&c6TE{4>;jYIGC^y=H6@H<0`a0+QJ<d
zMZ%_xjhGCS!Ipg)&1N>gvKhZNohBLy22mF=vXHSkIX@za`o|X8;(Kt1{z3MKP5Zp>
z^S;mT`F`48<F8ng^*|PeVQajVVgRiL$uIK`L<erZr=n%8<!Q9)^pF(=2E<BaJqU5H
z3R++Q0=cVw47xDvwoawK(Q5Qn3zDwdKvKpQQzHnCVXop>1W2vW!h^6y(cHxRhaVHT
zBD;wO&PV$qWiYH%#tm2(_t#7DR*9F1;w`u<CLjeWv;ZDc+cZ;%xrs%+0@^2!DFR;<
zv0B~4l2eVo8oW$5AkNvGq(s|UypXrqIcFhX_$baGo}!B=h9+rV;2Z+Y;Hif|)(kl$
z1jO=`EyTHruw_LAii$>~wy49V8!eQb=Xr`|D25@C1Zj3@7Ko9WnU~feLQ^u7h^6Qn
zp413}dWYpEkf%!_s1cuUS+QoO5`|Jm#Xy9z+h|HvlW{Fdn^pk+>&A-GW_?!#QUPe{
z9fpMJ5z0%0QSNSSC@F}%5gs=bR20xA>QaXaHOniy33OwV6<KgHtRqwif+QP4X#+Bg
zNC-Mejt&8qchXKK=t%2X3D0tjXs4a!g<MgQ-R@yaXp!YTrB2paZs$sixHQ(QnHJC_
zn6|AT+bOK)mRO<8fWXp?dR=czcR@{9w{$bCNAR+;#j4{44T>h~QFCLmOiNLV&`>&|
zTyE$pzL;l0S-}UI;bh=&@+8M{JQ)P6gXB5MP6k<;26n)Qf^-p)!pr|Re-v_xN;b=X
znkRjPIx@Lk9tFfK4-?eT1Q}>le*X5Cdoe6yhgU4AkNxo5{;w)-ug&ghIehc&?h^(3
z&QvNxuWV(Moc_+y%9Fd#^jGfPEsDgxf~RW7FI>(!m-xEQ_vC}#_)ilDH#?&3cRl>)
zl^Ms8QAE14Ju~x}z2_YRUsSF8XzVDx`q>w%4qrLeyXi#g{r%1f@9}#o^1xtpi$9W^
zn-vFpY3Yyt<6vXU`*7s3z|Nt!28S+gs$OUiULA?A?R#h7>UZGO_U8So_r$ZE%;5B{
zyRTKB{_^SbblbM!>F3vv9f?1*;Ab*75C7N+uo=~MflKtAd(rrNGXMIi`A0Z!_vF!w
z>;L++X}GC5Cw{45_N<f`zCJqt+19S_`)9A!C3>e^2cNqyvFr3m``l#4OT-7Gdt3`I
zPu!>q_stR0ujhw%o-Cev^H|Qh=ESOTqAPFiU1NLaYv7rl+-<!FW@pO3*)Tpmb?7XA
rBfs_&mb;(7boJN#CrTPFSM_9IpRa0&GfmzN$$y&H;}_p3-O>9GB?;f~

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_download_tap.png b/OsmAnd/res/drawable-xhdpi/ic_download_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..165e2305388e5a45a1f7405fed7e11f3fed22304
GIT binary patch
literal 1342
zcmbVMeM}o=7_UxXSpbubZGbv2H)@#M^{&^uws%qq^yuh95xP$5M;hPu-ogoYSMHAW
zs1e;JTinc+;Rho~$XqldOXi#yH<?4{Cn^xP_>l=w5|bH2BpUw^lA&**MgJiC!^_?K
z`TU;e_k7*+4fQ(<)|IZaSS$tpS|Nz$^7OYh7mY70UXamLV$_6<-D=!O0u5TKL^TRA
zzYLmT5CXBYeGFDuENk{kp|BAS)bTM@wt=*a&6E=eZLw5Tnh6kVg$5Rd&6485=SD_x
zOcFhK6C0oc2`_AsYEv5AovIJTQmrvg#48`fDoh?Jkf8xEQ*Kjq-t^#0dU>=?ACow?
zBx1CB@MTirKm+DgHHfh`ClRCU4Cdl&cGl_QTstrt?Mcc_(iA~)JnP^o8p}L5vZje~
zJ}CGyw$RRlw-`o(C&^?oX-hh6s@6=}IgTSKnxtt0Nf3IcVgQp+^sQM90@P!glrSV!
z!O|K*RP8W4IAXf&f}98hRun6GCQvA3qzMwF-A0kJoc3!;S~r65UmB}Q>!HpBB!f^_
zJG2<eM|^7*jAD0dLuo<8hJQ$tP*OmfpvF36s2G01gQFXpD2cq2W*l)Bh!RX3g$;-d
z8sgAFuv8o{oRf0WQAbwKYIugF1v}+(xLCK_Zm(ggD1qT>s-29}XJ@P3Y!>TRbOR_c
zn6)h-+Zil<ODylzATU%dq^fP%Drjg?4OMSZ6PVY#ly$7UNm4{Lsc%cCY1wN5YSLaP
z`ZQI>mg3Ayt8k!bRs;?wN3aab5mCT62#$@}i6}!+zz(>0lyc)4y!e0PM<P;Wx>){G
zJlP{uk?G}1E1=CvGeHG)kcL{NY}1xTi{-Y6U#JS1*Jpbtcjhz}J=^U2J3M+y_+!&H
zxo3D+=uGYKQx#Y5$7TE~j$85LwMFlohEM)}IP&K&LvN6UR*!yTe4uZ{edySH`&{4T
zSM75pmHFPe<nU(CwYBg6HPfGeeQ=R0toY2Ev!@~RPH%X%x88c#ccpBu`lX-lF49xL
zdV-z**m3T}TT|=nJ{kJZAD*aHa_(E)K7hRz`4q75B3pc>>AQVZjmNH}c4>D}w-5SX
z>ASP|VBkybF{*5S!<z?w^yh*fdZr5VKNuPBelIuY`#|}-c{h6|7wUsA{+w6v#XZ&c
zUV8oFH+xQQJ{p~P;NX_N!G*}<FCQ8xK3dtWnB(UkG56WrM~ah$0}W%R`iDOMi2QYG
z^tnQF;_d0we&>Y+{buQ-GhcUio!iml(z>?afW4*P=CvHRo-X-KE|bq+dU|@S|JpO_
pH`WCYoLm#R+!ftuSTEmEY?+;XI5pFDHj@6M`D^Nhv(-=R{|7TZ(<J}^

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png b/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..b63b4024d6c3fe2d1c33df293cf5793263a16204
GIT binary patch
literal 1455
zcmbVMZA=qq94}UZ0gXT=XnD!y2nh(+yT12s7KN57ftIdz(CA3G_OA4#z3Z-5T38$c
z4p4M1gz2&fqr|->3j>LB8`~V<G-eVqhY_~1X|jxELHEIhWCWKz1<Lk;_+gja^ZcLZ
z{=eV<{Z3ge2PH|;B#}rYsW@b`fqh@}O^gRCu{zI#ZI4jy5Ds&0Aw=@DsFdQIG*sau
z8)zF%Qq3>jq5(qO#Mm8z!(2tUIG>D+>d3-AKR^Sr{b4`pYNQ3oNjEU89{ywe8VoU%
z9<EiJF|*%5dzeElJbk#uVt2JPx^N2KUjpq56M(=+3nUcwdD#FF*28PO1dyZGC=9Ks
z2#tDp-6@CJ3K=+_hSV|*;=<%ANQ=wlYK<1x7DEbfMll_#zz_^4)Jg(VKpPJXtnrka
zuo+Dow!ldbdj!ExplB!*l7*Bqj&DHaIF6&30#zswpn(LMS%C~AY#=YjV59>sp79F|
z$3js?(#Zt{Jq$cu55ea*n>UHsz(%4#%Fr<BN98gM_4%T4t!W1Y8~v{vTWSaF&3+oS
z(E%>VyFfkMc`-1^-O~+46@fQIHP3*ekX|F_3i@bPs4(hb@I^*36roY5lx{8QL{x5&
zHj+|-#Z4;_HRdK&xCYZGoXQx_R(NF@$UUx5YSlWOTwboym1;Fcd0DARUanQ+N>dD5
z!3G49b<r`~46wa{RXi0-7<if#INr{2-dGn{J)FP=Je(gg7}lx|71S~;#f1We(K4+^
zZKQdoiKa|E=Y!VrOfXycfGN}zsnp<zTBXJjC#g~*xY{L0oGJ_><s|NQVmf#OPyOHg
zp};9L+ARNRp4b)W$f&qE3gECgOf(B7hzFzc*GILpB2nB-g|XBg{(k9)x?@vVis-)m
zO!mlp{rpr@_r<(W!ONcby!j`ecirBj={t}<fA?G@z1t=|(i%Kg**WlQ^KfqAV9N+L
z(kAiNi?co%3{So|8(et!-HpYunVoN2m>;jq^vuYAY5ntfb;(rn^6!uDE~b_^#N%fo
zl5>)KNX}?lbIpN!MO6Rk&MNOaCw`jDkBr{Gkkhw)CGmx>;HxRCj~+KH1}!Rg{Cgwa
zy=`@l_b+|x@b)aoZ5apyTB+e^Z`oLVpa@}AS<3@=dXuM5e{uEvyQVQ$;adsCD=jB7
zCTzjV-NIN$#+2>jt~7oAQ2FTWlaXZc)X>+XzrCUp>rejtDEG788+?DbzTrsrH_g{O
zN_$-R#HXH`Vy$l1^lNX3ZoYYHxG?u3zj_DSdwFQ$R)RO(Q;=BH9-qI|_k3r@GnT^4
zqY_mCS!a4!_pI(}TI#_LxMqiB`&`>#TB<=Dw_IhHogR#&ez;qjGzkQ(_&I6P^~*yM
z>ylJ&0|8g>SVC4LZC_g3uO0t;?|?l!vM`a^o06-w!Z#HOp4&OEU-6uMaJGM2Q}TtA
z)AQ%ymCCqr)6Ng(@-54mB5~H-SMeH9g5q7R+fqba+XHFQrSzrfFSMfEVjM23Z~q5;
C6#(-9

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png b/OsmAnd/res/drawable-xxhdpi/ic_download_cancel_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..265c75b89b4ab08b0f4c1e0290e4de7dedaa15fa
GIT binary patch
literal 1457
zcmbVMeM}Q)7;nX)<HH#T;!4ot%o0GZch|dq+)2gK4=Jv|Y7@&gGVXd;dXe_d>p=_2
z3=VZ;h;i9sLWWsKWM;|c%HSU*M%e}n`x10!s6d$6WLwx=BFg5+vbRXx{viIbOYVK&
z=e_6meEgp0x%TSH9hqsGG?hw~=`6Ro!CsPhSEquNzJEmq+cS#YtLzf}N`#Slm4y>o
z9&!emdfv@5T=U*h9w1Vh1dmtox}KwbVo=K@bhOc+1kk`(X;fl-dw2z6`FbH_hHnm@
zgCT)4!@Kn^%q3a*fKc8d^SfFqJ-(JbK8k}&w?QRQ8W;%j3Ij!h4WTd{HN%T`X>d+l
zqcF6nqU<rl4}<c$sv)Z=^N?O^KztZZLPko9>kUTASPbcajAABKhanh6>j@guK}!z|
zyvdxOcH10FzJO$g1BxQiC>n`Gv=Krp%JnEtQ51^lP@N6|8c4V~q%ct=6yBV)VB^C+
zS&$S#3_%Ht3@bJ&W*9{JFomGxay>E}3NH}_C_|%+gyLEZ4F(f=Eoz4qH~()K%W8)`
z%@U8g`LNh1`#?SXo0DL`-Qyi46hSm}l`MdwFby`**BInOiqmF>!51wjaI`^35`H7Y
zBBUSC#&9H9{5*l^F+W362F##iiKLz7@I)Elp3)hOdXovq?WD<KG}!PmivzbC^%UVq
zVx6I|!i0Q$(zgJ7FJTRj#nM)pXB1KPh+;#s3#tR6B8CH^1X-<%Rfh_83n5O7gbNd8
zdYHA1mxU&tbI4*4TI87)mWct=={bflP>7z?QwYnD1VZV3IKq+`#^4O)XE77Jgy;S*
ze<%nFO*G4YnkRV$Ix=y5Gzvg?G)#O5Oppvl<>Mz$&Z|`Fai`7ViC&$%R$KAe_O+@R
z<>=(s>15i-D)YgUf2<pR&2jYelxY9${1BI-Dc21iFa0?qqn8}G*LZ2F>)^(by&s+`
zjGg&Jinry>)vek(Q9W6wJ@d+gg@N|woLiK?S`*2;mDOMMSMJN`JW;}2z&Ei?zqIM&
zmo{9TpOB_55>1Yc*<-g?)Xet0xAw)t*!NORp!m;yDbMbowq6!$^HWNP?@vaLKi%0i
zl#ldqGe_4K3FP`~Y~*maeW%8C1i5nT#8~mf#fpyHZw{S3G4NwqKZ}0U`@#5}_l+Cs
zj%_z%_PA$iUFuXrY&ib*Z$BK~s2lI`{<_a}Vm~u}-K&(o)cX5HF_K>E^qsCOi4(|?
zpGvL|#fJO3XWZnLW4YZO{x2$8XE(H;!k_w<+9#~d?h>Rs>UUOZG8p?<>_A@Hm(_30
zbjy90x3{e`WPLaN{`ua{R+A>HuP6YWZ(7;ex<Ru#zN1Heer2X3&IYgp*_JlEc&jFZ
ztr@S&8ni8VK)x>Zy_^THZ-2L7XcK-eyQ=8U7&Dtbn!2#1;7wmw9(iL;!3zU-=SM8+
z!9!ntdaPk5ako}IXp5YlC|vV*jtbB|w5ADEpg6m9MTTm6bVhSF<H8e(pQzJbX**R`
G_v$}E#|WbU

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_normal.png b/OsmAnd/res/drawable-xxhdpi/ic_download_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..e726fdf777cb9992c8793c4a3660eefa11f629f9
GIT binary patch
literal 1497
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ-L~|%Q8bEN+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut(
zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC(
zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh*i`vVozAg1M!hp{bd<
zrMZrR5s<HMV4-hhple`hWom3?V59&AN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo<>h+i
z#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8<(HP&
zDgj*z@j`BauP@x-ykclT0fS7xBC$Z<P|rX=Hy7kDu<GKHpj3o2u&OQ&sVqp<4@xc0
zFD*(2#z&emOfxX-@LL2@2y~5=e^DkdQWA4q@{>z*Q}aqZU2K(rGI}YQDOP4iCdO&z
ziAlO9X~1AhOfdlxX{pA#rUq$=CYELfW=2WIFmtf!H+C{Hb#XK@H#fDgFf?>Ev2Zju
zb1`&sbTf1{H?=f&gX#6mD=taQOHPH^oe8uXs@Dv!UMuIK)WnkfqLBRj99Sv{$jC3r
zFV4s>P;hnz$GU<>cxGNoetEGbD4HO?c1bPDEK5ysE6UGR0Ee?xCKfjs7@4Ld8k<?_
znwpqe>Lw+c80%V^CL8J|nHU%(8YWt%B^g*KLG`DQ8-DsgN9ltS3sT~N2?0|ihzZXM
zKn^@JrRD*1P!TYz=xv%6$iTq()6>N<q~g|_nbzLSjv}q<kMf0U8oR`@5*4E|7E0*q
zm~@DV>2-)jbu5~o#=^}S$im9WHR->Sps7UUwd#*~kByD3H}_ZQ%}FXtdpD>5?iuZ!
z3LIC;C!T*kHIe01-4h?H%6Z?PM$Z0~&X~Z!EOCH=&7gsi2Z{M$8k^pVes0UyogBjQ
ztg#P7FJ-yKKbiI8`oAU9Jzq;Ur|$O-tUKJjq_^il)g$vyOSU@P^0CzUJ$t*Q_xXw2
zg1C0;{#&ExZS(o;q_QBk-QKe@%UUnQwp+e5$<$Zf@Fv+S-O}V{MZqV}OLd1fus?Fn
zertX=v-Ltd=fO`qgw>?yYD9a_H}TUt#uGiI@UP0ZOExbgR*DGccpm%gD}2Mk=EDQ!
zC7Y6OZ0dRJ?wRy@i-?oFb<@*5ivtsL<@xV>99|-Pdc*Qb+b16TY%p6&X>R1H<CSc=
z2Y2maNGN7r^0}i@PsRW6GRtstx%ElkE^V;?{(8EN7WV;}(jfVlUYqZ4{jz$u!P8%U
zuUoHp@5<a{yZ!aVI<4*liY4MJKe=14dtb&WEpBjp^MO160_xSj`mgIfQtA6!BmdXG
z%f))-UVF1t6Z)i9Hit|t3O%)T2aigjpuCg(QQp%R=Uu4$=ICd;k^Ns5BPg^Vm>kbP
o9dv=I#<J!TIQ-`<tq@OO$XHo5KTbGM5>(iFy85}Sb4q9e04^dJ9RL6T

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_download_tap.png b/OsmAnd/res/drawable-xxhdpi/ic_download_tap.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e5bd278ca80fff9d5e0d743c0bc56ad22bc1971
GIT binary patch
literal 1498
zcmbVMeM}Q)7_TykV{?q)7tW2#>4a@w@A}=lQAp_rtx~`Wvl!jH_TIvUwpZ`2w1sID
zm&MIR4DpLGMrLq2$rPP#foV{uGQ{|SCOV9`$b`f(!F8EmnC)$$&OeBM?2>!G?)m+m
z=lwm;bDtCy<V{POlO&NyrdcgUJDjtk@6<#%Qlr1{a7q(R4sj{x7K1boBzlH(0>tX2
z%YYrwOn7w{fQW=jw%8#$Z26Rn^GfNcjWp!-Lo_7I3HfPP1rQM@C}Vv(boj>(6k!=1
zx=dvwY<>eMXDwAcSXxz3?5e78kqnxXjbw!=NZ<t`jfA`&pFo9lXpEPF>*z6#A~6%O
zLWhn8<**eY295`aN~*?OgiMKONU2Pv){vToh#c;5LW|1@j36nMf+FO|_=7@kJmaS9
zM)SBYxYMEKqUfh^JQxg0g9<6fm*Fy!BymEH%jFofz=W_*q(hibm=|X-0>Q<zev##T
zNR*Lwasg3?!br!i;Pu;VPl<iPxKL0sJVg6(nUui2-srtz)`DmU|AjH3wNM=P1KbV-
zF2K8BKHT%-V5r^m9YqacG*lta!lck1Bj*Zuflss=btwEIWmtw%%asbZhIV2~H<XQL
zlyGnZ1*Rh0w31X4YPnMp=a~qv$W^M0dU>u!rPa!0CZ$%dQ5$8sdb7-=QIQIB9BcIn
zBJFd5xNjEv9>?mRi=_-aphb=^<~UEh3W~}(krT=}KVmS%vW{dfV|@%46yA!aY3$ZU
zz_XQrG4q@kiRnzS6U0EsRSd0AlbA}WA~7eeRA8jaCBvLbf}mwI>2?xYbR5t8U;S_x
z6do;>XNo6&1S>MSeA)_d^R$_O4|Wg_Tjh_o!bXW?(j%);UmWTks=x4#Nk6@Fu&cxT
zuw>(unKPXyYEGT3+2P3C>S%p+2^Xm<EkaG!t$qLO$~c;JW52-PJ##@LlnwMf{;+V(
zto!HB)erBfzS&qG;py4?hIfIIdh_0)yz|V((?eIQZFicctef=mDoMiZ<B~+;+2w0<
zv<I@2_;x;JLH3{R$2T?a{w(`vaPPpAMfjHY<cZyD2m41q9<)@XtzS8-<6zG66+L|x
za^d5KgAccTxxoAN^vcDfr7O2T=+>Be3(|&OVGs4q$PK<e(45+QW9#ulwW}L%Uu61E
zbah&)U;OFrrsQvr+!XiB(5KITp*ynqbB}n-gC+D#{pQ!S?~zENb!d0Ehqhlz^(+~9
zDL?g^Hf!X!4b63~Yjx*RPg$M6AD*sHCu?pWHLRw+>B%=O3C*tV){MFzwx5X*4R<mc
zm!ItnKk}Ste_PVp_I^+4xvasuJ?_h2w0zpxvhx@*_d<Ww{MxgViM(xBZ0%R(2H))8
zC(Uo$&mP;-Zn+xxdvI-|ya1$VYkV0uMlaP~e|N>nN0SFaGk0E3?;UP_(sd-I3H0WL
zd+s;gjRYDFx0ojn?A@~53fiRIfzvzI&riCS^4C|KWAngA=f6wl@7#OiLCchw+Lz~c
pV2kO5k=rASV*2~H-&(nDlH`Lm;ii%ed706_t<_Xu+@HIu=3iXJF(Uu~

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable/cancel_button.xml b/OsmAnd/res/drawable/cancel_button.xml
new file mode 100644
index 0000000000..3211e6e6cd
--- /dev/null
+++ b/OsmAnd/res/drawable/cancel_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_download_cancel_tap" android:state_selected="true"/>
+	<item android:drawable="@drawable/ic_download_cancel_tap" android:state_pressed="true"/>
+	<item android:drawable="@drawable/ic_download_cancel_normal" android:state_selected="false"/>
+	<item android:drawable="@drawable/ic_download_cancel_normal" android:state_pressed="false"/>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/dashboard_button.xml b/OsmAnd/res/drawable/dashboard_button.xml
index 8095342d73..37f1673e16 100644
--- a/OsmAnd/res/drawable/dashboard_button.xml
+++ b/OsmAnd/res/drawable/dashboard_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@color/dashboard_divider" android:state_selected="true"></item>
-	<item android:drawable="@color/dashboard_divider" android:state_pressed="true"></item>
+	<item android:drawable="@color/dashboard_divider" android:state_selected="true"/>
+	<item android:drawable="@color/dashboard_divider" android:state_pressed="true"/>
 </selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/download_button.xml b/OsmAnd/res/drawable/download_button.xml
new file mode 100644
index 0000000000..45ac3cb02a
--- /dev/null
+++ b/OsmAnd/res/drawable/download_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_download_tap" android:state_selected="true"/>
+	<item android:drawable="@drawable/ic_download_tap" android:state_pressed="true"/>
+	<item android:drawable="@drawable/ic_download_normal" android:state_selected="false"/>
+	<item android:drawable="@drawable/ic_download_normal" android:state_pressed="false"/>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_updates_item.xml b/OsmAnd/res/layout/dash_updates_item.xml
index c3e257f1f0..0cb19884e8 100644
--- a/OsmAnd/res/layout/dash_updates_item.xml
+++ b/OsmAnd/res/layout/dash_updates_item.xml
@@ -11,7 +11,6 @@
 		  android:layout_height="1dp"/>
 	<LinearLayout android:orientation="horizontal"
 				  android:layout_marginLeft="12dp"
-				  android:layout_marginRight="12dp"
 				  android:layout_width="fill_parent"
 				  android:layout_height="fill_parent">
 		<LinearLayout android:orientation="vertical"
@@ -27,11 +26,12 @@
 					  android:layout_width="wrap_content"
 					  android:layout_height="wrap_content"/>
 		</LinearLayout>
-		<Button android:id="@+id/btn_download"
+		<ImageButton android:id="@+id/btn_download"
 				android:layout_gravity="center_vertical"
-				android:background="@drawable/ic_action_gup_light"
-				android:layout_width="40dp"
-				android:layout_height="40dp"/>
+				android:src="@drawable/download_button"
+				android:background="@drawable/dashboard_button"
+				android:layout_width="50dp"
+				android:layout_height="50dp"/>
 	</LinearLayout>
 
 	<ProgressBar android:id="@+id/ProgressBar"
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index ddedd551ef..76d22a3d71 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -1,12 +1,14 @@
 package net.osmand.plus.dashboard;
 
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -27,7 +29,8 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	private ProgressBar currentProgress;
 	private List<ProgressBar> progressBars = new ArrayList<ProgressBar>();
 	private List<String> baseNames = new ArrayList<String>();
-	private List<View> downloadButtons = new ArrayList<View>();
+	private List<ImageButton> downloadButtons = new ArrayList<ImageButton>();
+	private ImageButton cancelButton;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -52,6 +55,8 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	public void onResume() {
 		super.onResume();
 		if (BaseDownloadActivity.downloadListIndexThread != null){
+			currentProgress = null;
+			cancelButton = null;
 			updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate());
 		}
 	}
@@ -96,14 +101,15 @@ public class DashUpdatesFragment extends DashBaseFragment {
 				public void onClick(View view) {
 					getDownloadActivity().startDownload(item);
 					currentProgress = progressBar;
+					cancelButton = (ImageButton)view;
 				}
 			});
-			downloadButtons.add(downloadButton);
+			downloadButtons.add((ImageButton)downloadButton);
 			baseNames.add(item.getBasename());
 			progressBars.add(progressBar);
 			updates.addView(view);
 		}
-		updateProgress(BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask(), true);
+		updateProgress(BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask(), false);
 	}
 
 	private BaseDownloadActivity getDownloadActivity(){
@@ -127,11 +133,18 @@ public class DashUpdatesFragment extends DashBaseFragment {
 				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}
 		} else {
-			boolean visible = basicProgressAsyncTask != null && basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
+			boolean visible = basicProgressAsyncTask.getStatus() != AsyncTask.Status.FINISHED;
 			if (!visible) {
 				return;
 			}
 
+			cancelButton.setImageResource(R.drawable.cancel_button);
+			cancelButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					getDownloadActivity().makeSureUserCancelDownload();
+				}
+			});
 			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
 			currentProgress.setVisibility(intermediate ? View.GONE : View.VISIBLE);
 			if (!intermediate) {
@@ -144,6 +157,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		for (int i =0; i<baseNames.size(); i++){
 			if (message.equals(getActivity().getString(R.string.downloading_file_new) + " " + baseNames.get(i))){
 				currentProgress = progressBars.get(i);
+				cancelButton = downloadButtons.get(i);
 				currentProgress.setVisibility(View.VISIBLE);
 				return;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index bf08db463e..ef2bfc7ba5 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -12,6 +12,8 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
+import net.osmand.plus.base.BasicProgressAsyncTask;
+import net.osmand.plus.dashboard.DashboardActivity;
 
 import java.lang.ref.WeakReference;
 import java.text.MessageFormat;
@@ -51,6 +53,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 		downloadListIndexThread.setUiActivity(this);
 	}
 
+
 	public void updateDownloadList(List<IndexItem> list){
 
 	}
@@ -173,5 +176,26 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 		fragList.add(new WeakReference<Fragment>(fragment));
 	}
 
+	public void makeSureUserCancelDownload() {
+		AlertDialog.Builder bld = new AlertDialog.Builder(this);
+		bld.setTitle(getString(R.string.default_buttons_cancel));
+		bld.setMessage(R.string.confirm_interrupt_download);
+		bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.dismiss();
+				BasicProgressAsyncTask<?, ?, ?> t = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
+				if (t != null) {
+					t.setInterrupted(true);
+				}
+				//list of items to download need to be cleared in case of dashboard activity
+				if (BaseDownloadActivity.this instanceof DashboardActivity){
+					getEntriesToDownload().clear();
+				}
+			}
+		});
+		bld.setNegativeButton(R.string.default_buttons_no, null);
+		bld.show();
+	}
 }
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index e5af152690..4858e370e8 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -308,24 +308,6 @@ public class DownloadActivity extends BaseDownloadActivity {
 		}
 	}
 
-	private void makeSureUserCancelDownload() {
-		AlertDialog.Builder bld = new AlertDialog.Builder(this);
-		bld.setTitle(getString(R.string.default_buttons_cancel));
-		bld.setMessage(R.string.confirm_interrupt_download);
-		bld.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				dialog.dismiss();
-				BasicProgressAsyncTask<?, ?, ?> t = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
-				if(t != null) {
-					t.setInterrupted(true);
-				}
-			}
-		});
-		bld.setNegativeButton(R.string.default_buttons_no, null);
-		bld.show();
-	}
-
 	@Override
 	public void updateDownloadList(List<IndexItem> list){
 		for(WeakReference<Fragment> ref : fragList) {

From 3912aebec140600ddf2a70170b3f08b710af2723 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 27 Nov 2014 15:40:45 +0200
Subject: [PATCH 048/138] Fixed bug when after rotation fragments were
 multiplied

---
 .../plus/dashboard/DashFavoritesFragment.java |  1 +
 .../plus/dashboard/DashMapFragment.java       |  2 +
 .../plus/dashboard/DashPluginsFragment.java   |  3 ++
 .../plus/dashboard/DashSearchFragment.java    |  2 +
 .../plus/dashboard/DashUpdatesFragment.java   |  3 ++
 .../plus/dashboard/DashboardActivity.java     | 37 ++++++++++++++-----
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index a1e306fefe..94370a6e5d 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -32,6 +32,7 @@ import java.util.List;
  * Created by Denis on 24.11.2014.
  */
 public class DashFavoritesFragment extends DashBaseFragment {
+	public static final String TAG = "DASH_FAVORITES_FRAGMENT";
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_favorites_fragment, container, false);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
index d31c9e877f..ab5bcc6652 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
@@ -22,6 +22,8 @@ import net.osmand.plus.views.OsmandMapTileView;
  */
 public class DashMapFragment extends DashBaseFragment {
 
+	public static final String TAG = "DASH_MAP_FRAGMENT";
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_map_fragment, container, false);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index a853e357a1..cb2d801a3c 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -21,6 +21,9 @@ import java.util.List;
  * Created by Denis on 21.11.2014.
  */
 public class DashPluginsFragment extends DashBaseFragment {
+
+	public static final String TAG = "DASH_PLUGINS_FRAGMENT";
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_plugins_fragment, container, false);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
index 98b4da7c00..8de9cfefe7 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
@@ -19,6 +19,8 @@ import net.osmand.plus.activities.search.SearchActivity;
  */
 public class DashSearchFragment extends DashBaseFragment {
 
+	public static final String TAG = "DASH_SEARCH_FRAGMENT";
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_search_fragment, container, false);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index 76d22a3d71..dcb34cf862 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -26,6 +26,9 @@ import java.util.List;
  * Created by Denis on 21.11.2014.
  */
 public class DashUpdatesFragment extends DashBaseFragment {
+
+	public static final String TAG = "DASH_UPDATES_FRAGMENT";
+
 	private ProgressBar currentProgress;
 	private List<ProgressBar> progressBars = new ArrayList<ProgressBar>();
 	private List<String> baseNames = new ArrayList<String>();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 5c888972b2..4d8ef2a394 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -46,6 +46,8 @@ import java.util.*;
  */
 public class DashboardActivity extends BaseDownloadActivity {
 
+
+
 	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
 	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
 
@@ -76,17 +78,32 @@ public class DashboardActivity extends BaseDownloadActivity {
 
 		android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
 		android.support.v4.app.FragmentTransaction fragmentTransaction = manager.beginTransaction();
+		//after rotation list of fragments in fragment transaction is not cleared
+		//so we need to check whether some fragments are already existing
+		if (manager.findFragmentByTag(DashSearchFragment.TAG) == null){
+			DashSearchFragment searchFragment = new DashSearchFragment();
+			fragmentTransaction.add(R.id.content, searchFragment, DashSearchFragment.TAG);
+		}
+		if (manager.findFragmentByTag(DashMapFragment.TAG) == null){
+			DashMapFragment mapFragment = new DashMapFragment();
+			fragmentTransaction.add(R.id.content, mapFragment, DashMapFragment.TAG);
+		}
+
+		if (manager.findFragmentByTag(DashFavoritesFragment.TAG) == null){
+			DashFavoritesFragment favoritesFragment = new DashFavoritesFragment();
+			fragmentTransaction.add(R.id.content, favoritesFragment, DashFavoritesFragment.TAG);
+		}
+
+		if (manager.findFragmentByTag(DashUpdatesFragment.TAG) == null){
+			DashUpdatesFragment updatesFragment = new DashUpdatesFragment();
+			fragmentTransaction.add(R.id.content, updatesFragment, DashUpdatesFragment.TAG);
+		}
+
+		if (manager.findFragmentByTag(DashPluginsFragment.TAG) == null){
+			DashPluginsFragment pluginsFragment = new DashPluginsFragment();
+			fragmentTransaction.add(R.id.content, pluginsFragment, DashPluginsFragment.TAG).commit();
+		}
 
-		DashSearchFragment searchFragment = new DashSearchFragment();
-		fragmentTransaction.add(R.id.content, searchFragment);
-		DashMapFragment mapFragment = new DashMapFragment();
-		fragmentTransaction.add(R.id.content, mapFragment);
-		DashFavoritesFragment favoritesFragment = new DashFavoritesFragment();
-		fragmentTransaction.add(R.id.content, favoritesFragment);
-		DashUpdatesFragment updatesFragment = new DashUpdatesFragment();
-		fragmentTransaction.add(R.id.content, updatesFragment);
-		DashPluginsFragment pluginsFragment = new DashPluginsFragment();
-		fragmentTransaction.add(R.id.content, pluginsFragment).commit();
 
 	}
 

From aea57a8f5a1db1bd56c2dbf8e7d2f33f896f3b98 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 27 Nov 2014 16:40:42 +0200
Subject: [PATCH 049/138] Fixed merge bug and fixed layout for parking

---
 OsmAnd/res/layout/parking_set_type.xml | 4 ++--
 OsmAnd/res/values/strings.xml          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/parking_set_type.xml b/OsmAnd/res/layout/parking_set_type.xml
index fedc4ffc49..89b5c6489b 100644
--- a/OsmAnd/res/layout/parking_set_type.xml
+++ b/OsmAnd/res/layout/parking_set_type.xml
@@ -14,7 +14,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="32dp"
             android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_no_limit_menu"
+            android:src="@drawable/poi_parking_pos_no_limit_menu"
             android:contentDescription="@string/osmand_parking_time_no_limit" />
 
         <ImageButton
@@ -23,7 +23,7 @@
             android:layout_marginRight="16dp"
             android:layout_marginLeft="32dp"
             android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_limit_menu"
+            android:src="@drawable/poi_parking_pos_limit_menu"
             android:contentDescription="@string/osmand_parking_time_limit" />
 
     </TableRow>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d0643cbb8f..cc8bc246da 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,7 +9,6 @@
          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
     -->
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
     <string name="osmo_use_https_descr">Use secure connection with server</string>
     <string name="osmo_use_https">Use https</string>
 	<string name="advanced_settings">Advanced</string>

From fef49fdee35545795cb4c05f32b457885eb1651c Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Thu, 27 Nov 2014 11:10:12 +0100
Subject: [PATCH 050/138] Translated using Weblate (Russian)

Currently translated at 93.3% (536 of 574 strings)
---
 OsmAnd/res/values-ru/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 56dbae8e37..7a2f2e5767 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -607,4 +607,6 @@
 	<string name="poi_isolated_dwelling">Хутор</string>
 	<string name="poi_locality">Урочище</string>
 
+	<string name="poi_palaeontological_site">Палеонтологический сайт</string>
+
 	</resources>

From 12d330fa3b2e3c53bf3546d5fba0439d267722b5 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 27 Nov 2014 17:11:53 +0200
Subject: [PATCH 051/138] Fixed bug with parking layout

---
 OsmAnd/res/layout/parking_set_type.xml | 93 +++++++++++++-------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/OsmAnd/res/layout/parking_set_type.xml b/OsmAnd/res/layout/parking_set_type.xml
index fedc4ffc49..9768580ca4 100644
--- a/OsmAnd/res/layout/parking_set_type.xml
+++ b/OsmAnd/res/layout/parking_set_type.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:paddingBottom="10dp"
+			  android:paddingTop="10dp"
+			  android:orientation="horizontal">
 
-    <TableRow
-        android:id="@+id/tableRow1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+	<LinearLayout
+			android:id="@+id/tableRow1"
+			android:orientation="vertical"
+			android:layout_width="0dp"
+			android:layout_weight="1"
+			android:layout_height="wrap_content">
 
-        <ImageButton
-            android:id="@+id/parking_no_lim_button"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="32dp"
-            android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_no_limit_menu"
-            android:contentDescription="@string/osmand_parking_time_no_limit" />
+		<ImageButton android:layout_height="wrap_content"
+					 android:layout_width="wrap_content"
+					 android:layout_gravity="center_horizontal"
+					 android:id="@+id/parking_no_lim_button"
+					 android:gravity="center_horizontal"
+					 android:background="@drawable/poi_parking_pos_no_limit_menu"
+					 android:contentDescription="@string/osmand_parking_time_no_limit"/>
 
-        <ImageButton
-            android:id="@+id/parking_lim_button"
-            android:layout_column="1"
-            android:layout_marginRight="16dp"
-            android:layout_marginLeft="32dp"
-            android:gravity="center_horizontal"
-            android:background="@drawable/poi_parking_pos_limit_menu"
-            android:contentDescription="@string/osmand_parking_time_limit" />
+		<TextView android:layout_height="wrap_content"
+				  android:layout_width="wrap_content"
+				  android:layout_gravity="center_horizontal"
+				  android:id="@+id/parking_lim_text"
+				  android:gravity="center_horizontal"
+				  android:text="@string/osmand_parking_no_lim_text"/>
+	</LinearLayout>
 
-    </TableRow>
+	<LinearLayout android:id="@+id/tableRow2"
+				  android:orientation="vertical"
+				  android:layout_weight="1"
+				  android:layout_width="0dp"
+				  android:layout_height="wrap_content">
 
-    <TableRow
-        android:id="@+id/tableRow2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+		<ImageButton android:layout_height="wrap_content"
+					 android:layout_width="wrap_content"
+					 android:id="@+id/parking_lim_button"
+					 android:layout_gravity="center_horizontal"
+					 android:gravity="center_horizontal"
+					 android:background="@drawable/poi_parking_pos_limit_menu"
+					 android:contentDescription="@string/osmand_parking_time_limit"/>
 
-        <TextView
-            android:id="@+id/parking_lim_text"
-            android:layout_column="0"
-            android:layout_marginRight="4dp"
-            android:layout_marginLeft="4dp"
-            android:gravity="center_horizontal"
-            android:maxWidth="10dp"
-            android:text="@string/osmand_parking_no_lim_text" />
+		<TextView android:layout_height="wrap_content"
+				  android:layout_width="wrap_content"
+				  android:id="@+id/parking_no_lim_text"
+				  android:layout_gravity="center_horizontal"
+				  android:gravity="center_horizontal"
+				  android:text="@string/osmand_parking_lim_text"/>
+	</LinearLayout>
+
+</LinearLayout>
 
-        <TextView
-            android:id="@+id/parking_no_lim_text"
-            android:layout_column="1"
-            android:layout_marginRight="4dp"
-            android:layout_marginLeft="4dp"
-            android:gravity="center_horizontal"
-            android:maxWidth="10dp"
-            android:text="@string/osmand_parking_lim_text" />
-    </TableRow>
 
-</TableLayout>
\ No newline at end of file

From 1ee3c2d12777f6ff065946e01abe2376bb5f4458 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Thu, 27 Nov 2014 18:03:52 +0200
Subject: [PATCH 052/138] Repalced mainMenuActivity with Dashboard activity

---
 OsmAnd/AndroidManifest.xml                    |   8 +-
 .../osmand/plus/OsmAndAppCustomization.java   |   5 +-
 .../plus/dashboard/DashboardActivity.java     | 169 +++++++++++++++++-
 .../plus/download/DownloadIndexesThread.java  |   4 +-
 4 files changed, 175 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 18ed41dee3..e380b6b463 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -57,7 +57,10 @@
 		<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value="" />
 
 
-		<activity android:name="net.osmand.plus.activities.MainMenuActivity" android:label="@string/app_name">
+		<activity android:name="net.osmand.plus.activities.MainMenuActivity" android:label="@string/app_name"/>
+
+		<activity android:name="net.osmand.plus.activities.HelpActivity" />
+		<activity android:name=".dashboard.DashboardActivity" >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -65,9 +68,6 @@
 			</intent-filter>
 		</activity>
 
-		<activity android:name="net.osmand.plus.activities.HelpActivity" />
-		<activity android:name=".dashboard.DashboardActivity" />
-
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
 			android:screenOrientation="unspecified" android:launchMode="singleTop">
 			<intent-filter>
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index fcfef74bf8..f87df2f83b 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -15,6 +15,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.PluginsActivity;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.dashboard.DashboardActivity;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.helpers.WaypointHelper;
@@ -68,8 +69,8 @@ public class OsmAndAppCustomization {
 		return FavouritesActivity.class;
 	}
 
-	public Class<MainMenuActivity> getMainMenuActivity() {
-		return MainMenuActivity.class;
+	public Class<DashboardActivity> getMainMenuActivity() {
+		return DashboardActivity.class;
 	}
 	
 	public Class<? extends Activity> getDownloadIndexActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
index 4d8ef2a394..41dfdda8ab 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardActivity.java
@@ -3,9 +3,11 @@ package net.osmand.plus.dashboard;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -20,6 +22,7 @@ import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.util.TypedValue;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.*;
@@ -31,9 +34,11 @@ import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.*;
 import net.osmand.plus.activities.*;
+import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.download.*;
+import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.util.MapUtils;
 
 import java.io.File;
@@ -46,13 +51,17 @@ import java.util.*;
  */
 public class DashboardActivity extends BaseDownloadActivity {
 
-
-
+	private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
+	private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
 	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
 	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
+	private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
+	private static final String TIPS_SHOW = "TIPS_SHOW"; //$NON-NLS-1$
 
 	public static final boolean TIPS_AND_TRICKS = false;
 
+	private ProgressDialog startProgressDialog;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -76,6 +85,77 @@ public class DashboardActivity extends BaseDownloadActivity {
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);
 
+		addFragments();
+
+		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		final Activity activity = this;
+		OsmandApplication app = getMyApplication();
+		// restore follow route mode
+		if(app.getSettings().FOLLOW_THE_ROUTE.get() && !app.getRoutingHelper().isRouteCalculated()){
+			final Intent mapIndent = new Intent(this, appCustomization.getMapActivity());
+			startActivityForResult(mapIndent, 0);
+			return;
+		}
+		startProgressDialog = new ProgressDialog(this);
+		getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog);
+		boolean dialogShown = false;
+		boolean firstTime = false;
+		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
+		boolean appVersionChanged = false;
+		if (!pref.contains(FIRST_TIME_APP_RUN)) {
+			firstTime = true;
+			pref.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
+			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
+		} else if (!Version.getFullVersion(app).equals(pref.getString(VERSION_INSTALLED, ""))) {
+			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
+			appVersionChanged = true;
+		}
+		if (appCustomization.showFirstTimeRunAndTips(firstTime, appVersionChanged)) {
+			if (firstTime) {
+				applicationInstalledFirstTime();
+				dialogShown = true;
+			} else {
+				int i = pref.getInt(TIPS_SHOW, 0);
+				if (i < 7) {
+					pref.edit().putInt(TIPS_SHOW, ++i).commit();
+				}
+				if (i == 1 || i == 5 || appVersionChanged) {
+					if(TIPS_AND_TRICKS) {
+						TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this);
+						Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false);
+						dlg.show();
+						dialogShown = true;
+					} else {
+						if(appVersionChanged) {
+							final Intent helpIntent = new Intent(activity, HelpActivity.class);
+							helpIntent.putExtra(HelpActivity.TITLE, Version.getAppVersion(getMyApplication()));
+							helpIntent.putExtra(HelpActivity.URL, "changes-1.9.html");
+							activity.startActivity(helpIntent);
+							dialogShown = true;
+						}
+					}
+				}
+			}
+		}
+		if(!dialogShown && appCustomization.checkBasemapDownloadedOnStart()) {
+			if (startProgressDialog.isShowing()) {
+				startProgressDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+					@Override
+					public void onDismiss(DialogInterface dialog) {
+						checkVectorIndexesDownloaded();
+					}
+				});
+			} else {
+				checkVectorIndexesDownloaded();
+			}
+		}
+		if(appCustomization.checkExceptionsOnStart() && !dialogShown){
+			checkPreviousRunsForExceptions(firstTime);
+		}
+
+	}
+
+	private void addFragments() {
 		android.support.v4.app.FragmentManager manager = getSupportFragmentManager();
 		android.support.v4.app.FragmentTransaction fragmentTransaction = manager.beginTransaction();
 		//after rotation list of fragments in fragment transaction is not cleared
@@ -103,8 +183,6 @@ public class DashboardActivity extends BaseDownloadActivity {
 			DashPluginsFragment pluginsFragment = new DashPluginsFragment();
 			fragmentTransaction.add(R.id.content, pluginsFragment, DashPluginsFragment.TAG).commit();
 		}
-
-
 	}
 
 	private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
@@ -238,4 +316,87 @@ public class DashboardActivity extends BaseDownloadActivity {
 			}
 		}
 	}
+
+	private void applicationInstalledFirstTime() {
+		boolean netOsmandWasInstalled = false;
+		try {
+			ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo("net.osmand", PackageManager.GET_META_DATA);
+			netOsmandWasInstalled = applicationInfo != null && !Version.isFreeVersion(getMyApplication());
+		} catch (PackageManager.NameNotFoundException e) {
+			netOsmandWasInstalled = false;
+		}
+
+		if(netOsmandWasInstalled){
+//			Builder builder = new AccessibleAlertBuilder(this);
+//			builder.setMessage(R.string.osmand_net_previously_installed);
+//			builder.setPositiveButton(R.string.default_buttons_ok, null);
+//			builder.show();
+		} else {
+			AlertDialog.Builder builder = new AccessibleAlertBuilder(this);
+			builder.setMessage(R.string.first_time_msg);
+			builder.setPositiveButton(R.string.first_time_download, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					startActivity(new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getDownloadIndexActivity()));
+				}
+
+			});
+			builder.setNegativeButton(R.string.first_time_continue, null);
+			builder.show();
+		}
+	}
+
+	protected void checkVectorIndexesDownloaded() {
+		MapRenderRepositories maps = getMyApplication().getResourceManager().getRenderer();
+		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
+		boolean check = pref.getBoolean(VECTOR_INDEXES_CHECK, true);
+		// do not show each time
+		if (check && new Random().nextInt() % 5 == 1) {
+			AlertDialog.Builder builder = new AccessibleAlertBuilder(this);
+			if(maps.isEmpty()){
+				builder.setMessage(R.string.vector_data_missing);
+			} else if(!maps.basemapExists()){
+				builder.setMessage(R.string.basemap_missing);
+			} else {
+				return;
+			}
+			builder.setPositiveButton(R.string.download_files, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					startActivity(new Intent(DashboardActivity.this, DownloadActivity.class));
+				}
+
+			});
+			builder.setNeutralButton(R.string.vector_map_not_needed, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					getPreferences(MODE_WORLD_WRITEABLE).edit().putBoolean(VECTOR_INDEXES_CHECK, false).commit();
+				}
+			});
+			builder.setNegativeButton(R.string.first_time_continue, null);
+			builder.show();
+		}
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		if(id == OsmandApplication.PROGRESS_DIALOG){
+			return startProgressDialog;
+		}
+		return super.onCreateDialog(id);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_SEARCH
+				&& event.getRepeatCount() == 0) {
+			final Intent search = new Intent(DashboardActivity.this, SearchActivity.class);
+			search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+			startActivity(search);
+			return true;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 9746c23f0d..08b4419952 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -405,7 +405,9 @@ public class DownloadIndexesThread {
 							uiActivity.getEntriesToDownload().put(basemap, downloadEntry);
 							AccessibleToast.makeText(uiActivity, R.string.basemap_was_selected_to_download,
 									Toast.LENGTH_LONG).show();
-							uiActivity.findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+							if (uiActivity instanceof DownloadActivity){
+								uiActivity.findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+							}
 						}
 					}
 					if (indexFiles.isIncreasedMapVersion()) {

From b0ff0053520b1d7b48438dd4deff81b322e6cbbd Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 27 Nov 2014 17:30:55 +0100
Subject: [PATCH 053/138] Update master branch with new home screen

---
 OsmAnd/AndroidManifest.xml                    |  13 +-
 OsmAnd/assets/fonts/Roboto-Medium.ttf         | Bin 0 -> 127488 bytes
 OsmAnd/res/drawable-hdpi/bg_cardui.9.png      | Bin 0 -> 1429 bytes
 OsmAnd/res/drawable-hdpi/ic_ac_close.png      | Bin 0 -> 1726 bytes
 OsmAnd/res/drawable-hdpi/ic_ac_help.png       | Bin 0 -> 1832 bytes
 OsmAnd/res/drawable-hdpi/ic_ac_settings.png   | Bin 0 -> 1762 bytes
 OsmAnd/res/drawable-hdpi/ic_action_bus2.png   | Bin 0 -> 1523 bytes
 OsmAnd/res/drawable-hdpi/ic_action_fav2.png   | Bin 0 -> 1633 bytes
 .../res/drawable-hdpi/ic_action_history2.png  | Bin 0 -> 2118 bytes
 OsmAnd/res/drawable-hdpi/ic_action_home2.png  | Bin 0 -> 1373 bytes
 OsmAnd/res/drawable-hdpi/ic_action_info2.png  | Bin 0 -> 1644 bytes
 .../res/drawable-hdpi/ic_action_marker2.png   | Bin 0 -> 1706 bytes
 OsmAnd/res/drawable-mdpi/bg_cardui.9.png      | Bin 0 -> 1385 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_close.png      | Bin 0 -> 1489 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_help.png       | Bin 0 -> 1555 bytes
 OsmAnd/res/drawable-mdpi/ic_ac_settings.png   | Bin 0 -> 1499 bytes
 OsmAnd/res/drawable-mdpi/ic_action_bus2.png   | Bin 0 -> 1354 bytes
 OsmAnd/res/drawable-mdpi/ic_action_fav2.png   | Bin 0 -> 1428 bytes
 .../res/drawable-mdpi/ic_action_history2.png  | Bin 0 -> 1729 bytes
 OsmAnd/res/drawable-mdpi/ic_action_home2.png  | Bin 0 -> 1255 bytes
 OsmAnd/res/drawable-mdpi/ic_action_info2.png  | Bin 0 -> 1408 bytes
 .../res/drawable-mdpi/ic_action_marker2.png   | Bin 0 -> 1492 bytes
 OsmAnd/res/drawable-xhdpi/bg_cardui.9.png     | Bin 0 -> 1469 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_close.png     | Bin 0 -> 1994 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_help.png      | Bin 0 -> 2155 bytes
 OsmAnd/res/drawable-xhdpi/ic_ac_settings.png  | Bin 0 -> 2000 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_bus2.png  | Bin 0 -> 1718 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_fav2.png  | Bin 0 -> 1916 bytes
 .../res/drawable-xhdpi/ic_action_history2.png | Bin 0 -> 2500 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_home2.png | Bin 0 -> 1421 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_info2.png | Bin 0 -> 1873 bytes
 .../res/drawable-xhdpi/ic_action_marker2.png  | Bin 0 -> 1968 bytes
 OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png    | Bin 0 -> 1494 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_close.png    | Bin 0 -> 2501 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_help.png     | Bin 0 -> 2758 bytes
 OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png | Bin 0 -> 2605 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png | Bin 0 -> 1997 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png | Bin 0 -> 2439 bytes
 .../drawable-xxhdpi/ic_action_history2.png    | Bin 0 -> 3353 bytes
 .../res/drawable-xxhdpi/ic_action_home2.png   | Bin 0 -> 1784 bytes
 .../res/drawable-xxhdpi/ic_action_info2.png   | Bin 0 -> 2345 bytes
 .../res/drawable-xxhdpi/ic_action_marker2.png | Bin 0 -> 2527 bytes
 OsmAnd/res/drawable/dashboard_button.xml      |   6 +
 OsmAnd/res/layout-land/dashboard_search.xml   |  89 +++
 OsmAnd/res/layout/dash_fav_list.xml           |  39 ++
 OsmAnd/res/layout/dashboard.xml               | 129 ++++
 OsmAnd/res/layout/dashboard_search.xml        |  97 +++
 OsmAnd/res/values/colors.xml                  |   5 +
 OsmAnd/res/values/no_translate.xml            |   1 +
 OsmAnd/res/values/strings.xml                 |   5 +
 OsmAnd/res/values/styles.xml                  |  38 +-
 .../osmand/plus/OsmAndAppCustomization.java   |   8 +-
 .../plus/activities/DashboardActivity.java    | 626 ++++++++++++++++++
 .../plus/activities/MainMenuActivity.java     | 506 +-------------
 .../osmand/plus/activities/MapActivity.java   |   3 +-
 .../plus/activities/MapActivityActions.java   |  32 +-
 .../plus/activities/SettingsActivity.java     |  63 +-
 .../activities/search/SearchActivity.java     |   5 +-
 .../plus/sherpafy/SherpafyCustomization.java  |  27 +-
 59 files changed, 1064 insertions(+), 628 deletions(-)
 create mode 100644 OsmAnd/assets/fonts/Roboto-Medium.ttf
 create mode 100644 OsmAnd/res/drawable-hdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_close.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_help.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png
 create mode 100644 OsmAnd/res/drawable/dashboard_button.xml
 create mode 100644 OsmAnd/res/layout-land/dashboard_search.xml
 create mode 100644 OsmAnd/res/layout/dash_fav_list.xml
 create mode 100644 OsmAnd/res/layout/dashboard.xml
 create mode 100644 OsmAnd/res/layout/dashboard_search.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 4f5dcf9ba1..5fba6101ab 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:installLocation="auto" 
 	android:versionName="@string/app_version" 
-	android:versionCode="191"
+	android:versionCode="201"
 	package="net.osmand.plus">
 
 	<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
@@ -58,14 +58,17 @@
 
 
 		<activity android:name="net.osmand.plus.activities.MainMenuActivity" android:label="@string/app_name">
-			<intent-filter>
+			
+		</activity>
+
+		<activity android:name="net.osmand.plus.activities.HelpActivity" />
+		<activity android:name="net.osmand.plus.activities.DashboardActivity"  android:label="@string/app_name">
+		    <intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 				<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
 			</intent-filter>
-		</activity>
-
-		<activity android:name="net.osmand.plus.activities.HelpActivity" />
+		  </activity>
 
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
 			android:screenOrientation="unspecified" android:launchMode="singleTop">
diff --git a/OsmAnd/assets/fonts/Roboto-Medium.ttf b/OsmAnd/assets/fonts/Roboto-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a3c1a1f1702ebf8f5771ae96197539ddc507f04a
GIT binary patch
literal 127488
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
H=d=F@iuu`M

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/bg_cardui.9.png b/OsmAnd/res/drawable-hdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..035983f72eb122d6a521694d54e358903e66c5ec
GIT binary patch
literal 1429
zcmbVMeM}o=7{ARq3CKPq(J)zd97D$Bde`e0Jt+)&-CAS$C>_*g*|_$u?Md&hy*p@O
z2___LNZb$z^9yBBCz~P5rfk76!e^qxF=G}nvKdTVHX}0JU}}agz6FZ@LH37la_{>-
z@B93o=l4Dz_gZn`p2YYq@el+h+N_iVtXrdB+<GvVwfQ!JC0Vh!lv2^FglUO|@)^<1
z!Zx1vu@07IYC@OU90+=>nsd4om;EKuBl0Rbs-ueVL4by!oV-Yo_EfS8>}GwOU_xg5
z1`wEIOh~!Tj@yG~*3VgMCAPG-(CMkI^cWc=FBi^<kiY=XDl{D71A<IOOvs{L66~YL
z7y>V<D3vB;iImG;44XxXg>@=D>cQ1o*kDwtb$Wx*kOdP!#_(*6z){>t>NF%yz{>*x
z-Xz9LI;h>tzJO#x{E8AJF)SPotHK(UDETn8(P+eQ0wV|%XrOY9pwJOikkeuoC|34J
zTu|Xe0ghUv-C~tuLIBgHC-6bLeZ{aKF9!;Q42#e~Os&E(o{zq3QCn6V?7uWt)s~$#
zK^AkcvREZ~Kt8-_F))bTqa8&R0UNSN;y_a903~{=cvetslnDVhDu!c7J)zZj4YV88
zdO_G|Mhhk{t3h?Rm)08fxSnupVs=);8wjI;$hH*d3$&D4ZPDgaI7Lyofw1Vz8nsy$
z!`cK{p#={c^UVR@%h>!!Vo9^a(uycKMKKVof?~g@h_YV{!e;Yg*5MuHoWO`-IWwB3
zrB_p|#8tD*Zb{_f#W<7PDjYm|T1V*J4C?l}wW!vpHK4|9y$985bb1XKI*r$hEaRE~
z8$S$?!lK3UpW=xffr^Z7S6TrGE6v0Tpo1jPD(EY}q(RV{^EN8q8JWCNHeNV_KPlYE
zH>BG4XWxZ#%$@C>&l(Oi`uuxSv(@jcd!lu$iofu2`{9#C;}fF?J9-}mnsVltz%7+N
zd3L<T{@4AflCH_N=6-zQeIzse1k|t}k?-2nh(4Z1GB1npyVki=Bh*_~^!n(oOPi6$
z>sxmr$K!Zv^Q+Ii9-+pX<)qNim)92RjXmoQh7N3-N}dstzIi&-(0gY3!3F+$M&-<r
zyrJPscwTqH^oO1Ne8R6U9$rW&nb~w`)P7C7F?ZyRKh@pMb=5a}>a0gMaf9g}48J$9
zcChZw7qcCQu&?fIIMUf@&bgKQ!wYd?a(l@J`fP8ZJ-4{YJa!|!?9<u4A3xex;&QiQ
zZPtFrj*8Sw|H&kRsyKIQFr~_szdmEn;J3r*cDZS7V#~eZnes;0-Yqkct(lXbdmH>2
zVX`ElJ4<}|_Jh8w#Ob+x$kCgpr!T&l;^^-GnhJFs-`4YcnUg*H^OPs?PNDN{)fL~)
z(onm);JL1+dYwh3EnVU1-p0Ayu8f~Lt`5cj?MOZU{QSavR@?1)>oLn80~d!ryWj7d
i{_VS+4?md|*Q|%WKj8{APn=7M{wQshLh4LGMg2byl?1#1

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_close.png b/OsmAnd/res/drawable-hdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..f664f8ef8f7a235ca1d04aae001b56da61e36b7b
GIT binary patch
literal 1726
zcmbVNeNYr-7(eh-WJHok!Ah3}1(dtp`~HvvJnjx|^bp}tY|Pl*+k*r4_PkxV191Y1
zqQm6GJSe$zD9ewsqzoCII2ly5M$C^v6on8)Cj&wy$g=i8tUnz8XlM3)-{;-u_dLJn
zYxcd=l%xRv1^z4+D?pp9N@I4|`})mb)^)z)?=o8`t<I#=Nh57TtT=0hfkbgYOCZ^J
z8jcu>Hl4v^S*&S=CVeKIsaqw-NP>%ab+~rI!k}5K*m%1I!SZk#K=EvoSpg0mYXJe1
zK>@B4>0q5D5zjFt7hCc4;uJkroQKH_V0;`9YnL+y2%JU$JCSdu<aPx(VOP$az1I*3
zOsLR#3UHECrY;poB&|3g;)*#K%o73<8J8y#OJtH5fX~PfEQR<m2bRf20y)eFo;)Dq
z&1x{p(^Q%#z8FaX=Fqf74na1XjcXHdNozL5lgVTd%!l}V4x_=Lip(@(=a{MRDGMr`
z!mK6>Z6eKp*CK+F1+)TWm`;X3SaiClhRxKIL@_CY?1%;8abbucym3uvQ*;{sFO6qv
zQ~Dwc4yEA~SzyJOdKkl}z)bF*@5rmju#vB}nwX*>`6?1CAaFCSRVhH`3)f&W$i;l2
zz$igbj?l=Y4KWCr#fS?yBG`xsWnx&&M+H-Mo`si41xm4m4~vyT5s#;4AWDHopq8pN
zYJpO~OPs=L%@mE8F?`CmiSa#&<!PRal_y$pgeI+elFXm#g47(6CaE0K0wg9*R2_&~
zXEGZ|8x`#>(`3{t+-fSs4H_#+026tZo1VczC@~5#T#9lKjA!H^0-=b5ig`kg0Ymvh
zQ~+Zln2CQ9Z}`9YgBVhfw^{zvJX2RpM|zJ>M}ZNZ4ij!>CdkT+N`Ezy&SLrA(5hDG
z?N{%uSL6k+33g}jGSVU*E*%sv2&>Q;wA~T=GIJJRN&bkgQK{c79h=5J`NA>bT`>Ac
zWsNHQWuhYF;H*KHqhfzB9a~#phP&Or%f4X`v?5(a_Xic(x3AlJHm5rpqNG0-Mo9bD
z`bDw-9P-^(KotFb{!(XjZ;-`DI<21lN7r|OB|e2^O`c_09qo_CXTIb6pr^N>mz%n>
znXHt~?Cw7@V>l#p`r`+v-{rDukE6Uqa`5n1V|DH635$k<udvP)hn(ue+;NW@=fUk+
zRKgjI>$*d^dHlI>`{x^fu%zwhopO>sr^{+R$#VpswAoM8-C)Q1YN+}fNud|3N~=8i
zfw`Aru;sIyqmhoc37_<YoP?A?x1s0THrJJ;*V)P27p!&e&g#?UI{dn_ceI$mh|z%g
zK9pnhuK0p3$Y0dnboKG-WoUQfOF-U-n=0-v-cvuUQ3j0oJmN;9TQ|A!m|lnG@BvHI
zJ{29_qFr<Vv~_7bbw=d@)lp|P(XH`(ed3FnC9OM4Jhz%N=CBv4j@Hayj)d>&X&BQ>
z_qtxZnt!G$puc%<Oz6gr{ME<FpP^OJDZ01NPE&k7Tc~hCw%L(xG`nrF&J!8fFA1_X
z;9+Q|#^ahflF^#c=6b(W1Xv>$?W(G*+^}`}J=5`u(14Mpa|Mo&p$q4n`ipnU8@4nP
z8><J#bI<<e2A4kAZtU3Lx_HoG*rx3aaOh(iK2B}kQDZx)F0HS-zNWuiSMg=8v$n3O
ztmn|?zD^GsINDaV_19bazJ<eKNh3kOeBXiXe8Y3OxAzr6-j0yY(%o^>E4SQy?X&G+
z<1?_5hllG{HV(xq*PoBFE}8e!KrqH$Kg(|{cVPU}!dPcd*l$JGk(+t(!%L*n(;rZ~
zh^oie?k#VPzI=8=%lTxtJtg_o%6Ojpwu|0FD4^YSaa2*Gu^Ae()#^+3L+oH*e;>t>
b7T?*d$ZJhG55aWG`$y5LQ&fkPS>^u#a^sT#

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_help.png b/OsmAnd/res/drawable-hdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..746232e70f25d57636dcc300820da9573f52a913
GIT binary patch
literal 1832
zcmbVNc~BE~6po;X5kbK!D#tdI5rkzo*@R>x5dt9y8jOg7ipVCr36UfllEp+FEk{*Q
zsT3<Js2o~lJOW5XMXfTP%&7H1K&zEXv3P5>2#Tc}1lvCx|LE@Q?|k2T-@9h><grns
zm=l={24ht8bV(dN!?w@SfgTg=de+j@1S&F-nnS86GiD?hVw_YEK(r216LAEFFH3JE
zLKqDDrJDFeDp595s3dhkm`x_gqBGEF1|uZYV!)JX1O+GvwMH*uJwJYm1!!;)D}g72
zWrheMRWp6Lk(jeQHeR_rO^M>H&}l%3MMx{q5flbkbXvVhXc4jc^$O{=?HFPK{UTJF
zi1mR~qD&4%kVXRF1qFjjn9T+FXb_th%t!fw0EgZ~umIw~AdCumh!Exg0}qR~X2ey(
zIEi$?7QGX(QYp$Hgdnro9Arj<NTV8JqbLf&9EigKX$jD@Oiy7JP;c@X)F2^DN~6X=
zX-GX_(}*d^3`)eJnSO9VXOPK0D%P6@0!4=mvS0>?9Rx!<oz1U)X%iJk{7d7L(x&)j
z1_FvBOk{>pN#{f5GYF<*_jyA$L7I(lmQh0|1=C7MWrmK>Q_&I;i@piMHMlUC!$nkl
zOaXFLbl5PQOAjgn0eP?r<D$WEFh_w5>iHC&4GSb(sel_C&SkUNkz8?vI8qwULnC>7
z2_lXZ3}U18CJNIli9y>M+V%hz`7Bl#VI(k$G{%#pcCZTMsU$_3Qb_|45z(J@z%N0g
z$4Rrv-<GBiUP}n0W+{P7jie6fkF!wo2@VKOz+6<J0ue63262R|02L_C1K9+w;9&^C
zXRFw(0X+VH;|I~CAX~Bgr+5aB=!&#0KehtB`PfW^p6(zc-71&Uc6~{A;PhyTINoym
z$u?Q4n|SO6w*cukU1gP(DYM1C3g_&m=6PvX{c<O-&s~>2y!?lC-s4aDC5ODtx_<xI
z+Hs+=*$b}i)3KYC;{D~t#W~$WBEiH*3B4}8<BN{o+EG<M_D#b^?NarxCypSm9$eO*
zNDMr`=g`dcvh+NUT#xR1o?DZ<8gJC@t1rrQYGusJULrrIUfi(oh3o4qeL=$YpPp@~
zu>VtZ)Xl^G@U)Hx1-ulO=S0IWgIlk&(or`wr)@#z%Z}Ye8LPiN|MkN#yCesfhAAV@
zBzAU|Upb3Ug-h}eXCFOx%zf__uR08K?E_5>D+>z!-c7vYP<7g=+DY49RoYae=I6``
z_8cv}Qwaa<BVg8tU26xQJB)7#@%Hqu^R2jLUKr6CQaQp8aca(vb!k_gXldk}8B)Kb
zb<buLsIT=cyCi6JX1cy*22S;oTUYBQp}@|?g<Gpx*}o_C{gLDRVm0+*rw`gZqPVr<
zDbsCuaai2_gLTKP>a67IjREOjRITW_v_BRdqkGOtFPmF2hMgXj)aR1f;ni{W<a=wM
zPvLia=JT0(clIP#WR<qbqpNzr1^S-TFP=>P>qp<JM`2Q9%>qYjjI`G5g%)07ZSike
zb8qyL>g_$NRPGu0utZ?~5wY6&D{x|8en8C%>vnl%X;XUH?ZTG|-rXS%NpI>hbC|+$
zj|Fl~L$`Mdw22$lY;uv8m+j>o06Y8*yYRq!HLs0!p6*D~j`o;G&gEuazW0svvXsuS
z@hy%~S2iCwJ0<RFdfTyb`=66qkcN5oiy+FQlTWp+Y*cK4uio6dDTYGUw%ir&9J<ST
zu+r){>Dfa;fg0+xUX&Ht$xhvy5GQv(={j=pZP|6rm@{j`xvO&3QMa9Q-D-V^uA}0@
z`@MNHcH)-&mDjqU8=@LPjArC-Pmk2-0`|IIm{C~MSTy98c5YYF#YR8x%$v;F7g1!<
z?v!5Om*VP&VH@7HNWFwNqrVS5`0_#N)$ZAo8n<t8Jf~TcP*TcY-?VKWJDI;@+@clk
z+Cv2piY62bC&verJQ?nVgsd}_9FV>be9ZLRNae%t!+o0b9^?K;)^SR=O7ySJpKo0s
lwfK?Ga2EZBZw|F{Vys$GzDs-A*WUK;ijItxSi@7Y{{i=n#hCyA

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_ac_settings.png b/OsmAnd/res/drawable-hdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbeb62be371f3c97a9782ca9c33dabdfef91b53a
GIT binary patch
literal 1762
zcmbVNc~BE)6c15Aw4eeWfW@5%D%xasa}ctVfFTJIY(O~#wOBUU4XluCNLC1<OekY*
z=^#a@9mNg`r4><%U_~l&DIns3M^R}Nyao>h+oEU{?S{kl563^cGy8qt`}Y0b@q6#h
zez`Jqx#Lv#sSF0gQ5h@`r+3KuPO+ocXy%J;^yWq>VyFmGOQoVloFT<XH4Z3sXgnT{
zqgYyUJ1%B0CZ!OOF;tA|V?;yhIH*;JW7ZjHG=m`yFdI-!B2EEnJf6@?ScAtKSO9@Z
zSkVF%q%z3x1R{8o5s%mu8mZZos1aeT0DnMiMrZ>%oI(M!E=g}f%o5h9U4%YcuR#_t
zszN17SYtuOs8#|p(ue~BjxSpS!F)g{;=lr5p-A`<z@=pn@&maL8xkP`9s+TJ@rOlw
zGh$jKTpl#;i<Ts;1d1{sAefq(%1PyMNMk$*i$o$2;(}Z*o7P~P()1K+X6sE0CM?Kt
zlg3CGD1y`jR*R^b+(=1SbfjY`=nN{=Tf=(OI8iiZpcyrQFb4v4I%{5|+9oO-|2K?x
zYMUa{3^*8$o5+nu4P6iIf(bCq-TNI`73pY@Fe5=11x=EZnvFVKPbuXR7X5{T5g6jj
z<@2;cRL$mVY1&YXPcK@W#}+_ZlrQpye7S1ggq?TcVaQL;5AuV21NkrvEBI2GR1p*?
z5Ge#gIZvwao4_jdCJNPS@Cn}p?RyL>40<mXkr{E6B8`zGnKaP_D-%eHG$oJ*Kqecl
zI<PpJ&|_q($;Vozv8?5|kx0R@AS0;*MtMevcf`QMaELEbYuP+L4zn>HU(HsFFaaCJ
zF|`2Y;X+sov&Qk*|K$&)g95G1@}K6JxS~7KdVD(ywD5MAa6LUiMtW2Zp2@1FCy=R>
zOC!zQ{kuN>;_NEdw)p-HHQoiKUS90L;ICE{Zu$CjQTXe+(^*jw`ww~l`C}!ku2-?M
z<z#`kn79`eoH*iEcJ3&+w768UVW!8O^xZtS-90DzZuZ<58Clp6QM7wkIx?IwIQaU!
zWH?lu-+n6l`sb&ze`nd`S>D7hD~n&Tu0&O*iK|ho>n$z4WyyC>HA&N$<$QQs=5;hS
z(0gx4uTXN3x$v_p^=#n7Ye#^|1z8BxR`Q)TqZaCNg`!~3?CP68TU>fsX1jqbRaysb
zd!PBVIYuV6Z!15$E@Rs=;W5XG%(cqOWAX6tqMY;02TY%uIbxfR%?B;R^U{gT_V3#d
z*aeLIaPhL|OGW90ru>|HbGNp_bG$}4`vh@Hi^pRWI<uN_;@F}|6|VPvgxymU82Pf5
z14)y3y2<@V`k&Y*FsDgvWknZ^g{l)fkIbx`Kje|pHEBcR>Q1M6_^~+O;Te3`Db%Z#
zc|Q5x^N?$+0vd*LUHyq?d7)<=XW!5jZtZRq8&-6#;h7gdSy1$s`}{K_=}mT>eW{CH
zGgfD{xi@s!brdTuXV}fN?_TOc_((H@5;kA5V^Z}c_Qme(tKWD#Mf444&gd*Bgd*a>
z=AK&DWxV6dSB3N?RcBfd)ytI1maUdsy~zBo6_c|<g17fEZHDS&8HeKb9I`A4ElG4t
zIa?T)*BtNvvS6yFV)BJ1#KVSt!2Q(8R?G1^hfCYVJIZeLcvj{T(yK`sV1dLf>gE2}
z9ZuEZ`R82r=G;|HIdHM2cYluMr^Eg1b)84UqC)Rib<Q$?jZG2G$`{I#$iRL^gKO^9
z7Uw@69$z0lUFpkRa+`B+%ix_2Mw_|Qeb-)jjuoX@TpB+xWKV0`Q_3%`eZJQFThClW
zW4Ub?X4~_q-`UB(WqDWbn^)^w`)q%4L7qgvxSf26H48Yb>@DrA**QF|*0K5N--+ix
zaehSoTDHPws5sT(m48c>(74ZK*|X-nusG(x;&A=I!QUQMoiq=HZSew}XE;o`k}(Zp
XtU(K<T^+)D>t9Ey2$fd^#(nk=gHNe_

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bus2.png b/OsmAnd/res/drawable-hdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9192a0f0e535c115fd43e4afec72e5f0f3261e80
GIT binary patch
literal 1523
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$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!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy
z7U!21B?IFlO&O*c7<TwA0x1N##>&4a6BsFpIWGChrManjC7v#}N<bOCl*|+>Gb0n@
zH1otHU6V9muqCFL0Ex6zV_j2&v_un2GXpcDBx9I4*z_A1SU4G28XA~685tQGx|%o{
zI=WdJyP7(gnY*|cnOeZ~dgc|EB<3Zj!tBlj+6~cb;D%SPm2**QVo82cNPd0}EENP~
z<d@_ZXXF<sI6H%5T|px}GcP5-yjT+yO%PwZq!wkCrKY$Q<>xAZ!`UhmiyO?1O_D4v
zOiXoC42(^6lT1ufbS;vTQ+16EQ&W=7Et1nL&C`^i`cudaKYgI1^g)RQDe=IBfGHBh
zgl7dH2cDTy^ME<12$)sOnb&qRFfa*wx;TbZ+<G(9-s7-?Nc;NG!i~-{cU%_!NMHF#
zk8i2fv?$ptYn{TU^Ti%<)G1lnym)o9_sX@4o4dQaGX$@^da`O!2dlXEU)jBiygOqq
z$-M3S{y^FH#NO|!s?&FSFSwZ_RJ<l{>-*?M@@JYX4LFY-;E-TrlSq0lIju}SCpvxq
z{e#>UZ2b?ULJsn;FZif%K~1sCZUV#W1kRR@?*=}%1J7B;Kj4vRHp=)giIw%}qXlmI
zB5O)C-k3S9ahrIxr(9_+yQqNL-F}1BbH6LiWsJP^`-GAB!Y>vl1WT2U&yiVrIUzvt
zrQ@?F8nVi-Tzynz!vd^yCYgy$F<X;wVa}hv;PfP4_2mjbn-?zKx@Fq6OHonY*_qpg
zqjzs?*moJo`R*}m-LEqZjN8_Ftf<dA897bUce3h1-ORPyFTORh_^#-4TTRDua^8`<
zUhi*|RF~L4cD6cva;L8Mu49(}9yrgs{>^jR7m?>bw(w`h-R6wEwA;+MXjl9P#n=Z=
z?!0#Sb^Dn_ZGxA=p}4<--wwFcdbmgO6`vDY{q#kO`L`WRpJhI_Jkc}vlexCgw@`W4
z<=<TU{P|ojebKiL^qBGOxw}&4t?*?BmNFgsp3obyZ~up?e*X<C8on@9e7*Gas_2Be
z&&I_Yxg)h#&P#XwpJk(4eD21FC})+k(i)+vUiT|ydpehxd%nKC_2;^n2Hws~nP$_r
h#d&mHe-Pfl$nf!8{9(?0EgwO}u&1k^%Q~loCIJ6!G;II?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fav2.png b/OsmAnd/res/drawable-hdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e3f139715a7ef57d530feb98d4e973b5095fdd
GIT binary patch
literal 1633
zcmbVMeNfY87_T~XqPWu=_yrn+sJk<5nxr3z6h<jXg(5<QItL?7(-NRfZ38X!1H`Fg
zLq!}qosM}<Cpw%|Hxxl`b2oJ|R8YpDB8bSUyF&)&U^ls?2yTCP`(wGw`@YYc=l6X4
zp65wXLi}<+-#NYlfxu54qe|p=$osxNkza{94-W9#Y%WU2C9y`%LE30Rgn`x5fZ9x&
z=tP<{<gL3(hYAD}av80T(`n)eiZu&Kua3}Zw(@9!AT-=*C8;c$1N5|su_(aa3-utt
z7!+WNL<4KAk#q(V<Fe67u6Qlw%A#-s7#;?MItku@ndV5qY0kFT38w-au}ko0@3ja7
zMpU>g1^6N;ohAW@WNkDc5lSHn7Gr=67m6iP87^B2AiOMs<st-zV4RSk1dITq56FA7
z8H_}tDtgoxFDbwbj<XUXk;CB-I#3~NGl|4Fj*DPKgdh;F0on5`9O;BC_TVuKD%wuj
z7%RuH7Qkzf)U!F90^}ook%HN((Y!Qlv5ykPQzmkfR*_f;i_B(kUL)FeE|LBxj8|&g
zwRu)rlt|mz92>>g!x%gU=DGWCM_xrf8e*l5;fq3Mt5_<>Oj|g$N&)g;ga*byND&M*
z%1Awg8F|`B1I8~#8igdVk;HH*EJgI_n4MSQVHlN5RhUewL=dq!3R8+BqH#1zqLj*1
zDnue5!>TQIj<itpm~V#nJ&Kk7Czgn`(Im&(v@DxF)&&U}EXUe2SSt`2IZ}0CNeW{z
zunzlM-ZH(&T1DHKT-p$AW6i(_&jj;|7-T4>$K{v=GQg+=(qotbl2a57p<>!V$>fv~
zml?rPyy5@yC*p$=d7I^5%`<kzccl0Dauj&s<uK6}eu8ZLsL*8}^D{esvsx9Qb++Bw
zUl$t~5xA`mt&&goJAM-Zm4)-Giawh;z7#CmI%fvl`oV`qeM?IVhTq8C9XS_*zH!Go
ze!iEJoO!rz=yc5CjLv&Q(`vtWuj^{S!yUOD<TJ|hXq_?lVsY8E?i0tiPGXz&P0Z6&
zu<Kljb(zi>INP)9g#Ya2N@Cn1XXS&oB{BH|zuM$J-J4&SHvUnbx^I(@Ys2-Lp}T85
zYcBO1j;${2EN}#G=sh?v)j10*>Z?m?lB7T0izUVN6c3z^?yq)#Di2ne@I&V~Q4Dh|
zDE-eHN5dz7S>Jc^+4fl(;EvCIu>Rqyo|>ZPXB$s9sGrUY+!Fp!HrRcBcyfGb@3l>y
zJow?Bih#7szwDm2<80LZ`PD~iE>D#Eq<*!UA)6C4UkhE9B_0&^MRxYOk%7>U)*pD=
zyz62?Ddi4v9rX-d|Fvp-`)2#{_pf`-*zS~6`=#|i@k0;Zpw>DLHf~ucpQ;`#>F&`i
z-WS}MetvyGW7XXwD@;E;S=3guxDz^bssi2do^|5dfPgeTKJ(j_d6}(4KWQ>=y0drR
zsbXs`ReA~;|3KZ|_6b>~Cu?0#8{FLDe*Zo3zQ1*JHKfE5Ap_H=sa6poA(bud8<kDZ
z$IUHW7JITTRT)E&Zb$JHNoUC5cdf4ay(PkenH_#zg^zmEwk@b^nbI6rea&>Cw!B66
z_*iyq^=hATprXPN6iUB~Y{(DN4zJ8!G3j=pTGM`OhX3u{qfPneO{nM0a9Fu9?8oPA
z+INBuWV<WSZAZ4`b62fFXFPauRdVyLPlm!~z19^v&OLqS{`)|GN;lS8lDvK4ln(rg
quSU4$QT>(Qhv({7{dIq^OfW&v3>7XgJgc;LfBNdEc-1Lodg0$77<D87

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_history2.png b/OsmAnd/res/drawable-hdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..02a96c2de4257ae349939841dbc73798fdb6adc7
GIT binary patch
literal 2118
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
TZv1S7_0KL8MDuIIw&wl^!{${O

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_home2.png b/OsmAnd/res/drawable-hdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdbbd32c3da20e21dd236fd97463c294cf5baf69
GIT binary patch
literal 1373
zcmbVMeN5bB7_Wl>*)lTYM+7(06^FQaZSQ(_y>=Yqpm*aI4%rO^w=n6o??HiUkG60J
z%Ce1pp=Jp&GDR1VOv8*{#1AqY1NMi&n87eJ62L^zg%Cf$Oheq3>3hJTe~|rQ)4re2
z?|FXDSDOp+_io;pyb(c=&F);z3ui;*ONfIbn>^bFrzG83q90KFdWcs6;t&-dK-~ep
z9C!gQ*4K=H3<Qa(lL|}p5>Fm0C;^<0$l&2X5TX$zV^2893spczeV|;D?byOs{TM2V
zcC6UqAw9tyP$A_usNg_DexcA%B`_kkClk#Gvrs_*=sX$@RLdG0wqwhBS-6fI6BxQI
zqF33m6;dUh0yIZa0cydm27xr1QJTSx7Awur&!Q%{CrBG%A`K+NS}2w@p{oxDt*N4)
z^>VINTX1K`Ds(-_5=1Bz!b23UsO5x_VHkom5hjxXN*J_yS?9wBSxb#-;D9EmQc#x^
z8I5S<eM+rv#~{-c7Xm?#XHBuJtp*B)j0p2V!ibYZAQ16uSz6P*;9nZ+N^6DnK|pwc
zrqrqe%!fZU3Wl+Ju%U<`WWzqEN-!yWHKz!*0U+yc&W^zwT$DuCYBE!Pn)eyZei$}h
zG{eCUD1(Lc^Jd0MT1`GGs%JgC%jL4=kPgP0Z892-PII==;bJJKCEH4KoXKK~V%@T)
z^RfV<wk2qL6>EDSmd#NCuPbVyqEtt#prAt06|F)EqB%LsSx3{0C0SHL+B1<ft$57=
zRjLD`OH~5sa-3Od9S$^Q_AxfI#UPTD#o#lWMT1QcfPpdsQJ`&tpP~KODqj4*@gpE9
zB2p~>DW2#NtjNf6trg&At(kxfJ4l7C(lUSaTLgKi(akvu!;`<f_07Hw{G+GNJ6uz5
z_U>xA32s@_x!)7TErYeYleopS*yfJX(T=W7XF5xr-)AjReOIUa!>(WNK52_j0bei7
zInJJ@+7E9Xy7b}6_R+F4pI;n4-O~C_X6(cdTVDn<Z_7<|@aoc+KaV#q#$LOO-|k)b
z;EyM!k7dsuIkq%}yI(3x#P64k&CO|Ndv<O+dWd|X=H7`PV-Af^U7r|iyB*hjnNBN>
z`K05snR|(I6M1fW;Az|a^2%*B=TFJ=k5?(B`?q&#eXaQXmW-xXW+xBN^uAj;pD^9j
z`F>sJ@SmxVjlbH)#+-|5+tq&e`grA~c5jn1@Lli``qq`f-tira38z|n$F?sKAMNZL
zO`iN>+8Ubgem$)b$;`UZa-@Ic;FbQoJFi)^vF`XcPLA!idG;+0Z0cg~oG5zl#f7~M
zu_@-8Wkuc2vHdAT@lQRU)~C;oJbXM?QGesH_@cjEPuaPH7o5@e221@l^!$Z$Lp?|g
YLL|}Gc5Jwq75U-0o%!6y*=5K70pxV@p#T5?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_info2.png b/OsmAnd/res/drawable-hdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3cbd96b90c6e67a2ea29c11f864e3589f05b7c8
GIT binary patch
literal 1644
zcmbVMc~BE)6pt6BsCb}7@n9RQQX$#RO;%IQDJeNPqQJCbH@h2HLU!Y3B?0YF(ouoR
zl!{gXtxhXmodWidDM-CWDOLf|X&sA<D5XVl01p%#OE*Yt|8V@HJG0;Sy>H*|z2CdG
zFy6FkYEW1Zhr^kwkJTiyJJ0t92Cyp}cB`D-<}%t8CW*2!ZiL1;N{q7NfZl<m<B2$e
z<*aYQmvcB1vI$EHlVUW$DCOWIJ{`Wt;bhSq&hix=CxY5>2C(Ak1gYTm)t}@71g797
zON@}wsm3#i*jyS<$~9TgTstbqxGUZPmV02<fCFa`z~jgwU9d;N9kmOyXWuo*1x8gE
zyMp_iREjYkP*XGxNcd773JJu3OwJcbq%yfI8W6HF2*rRxhzH4Gi3o;-z}UlOz0sHr
zPSohee6f;(o53(n7zEvJH{UJdQ*=5gkjv#DBm{**9;?A~<&X^G;gPNgzXc8MLTSRu
z5EKdcEFxBF1Eb)wOrM9~a2ky-43n<0M6oFYJ%|$&@FCFQ@WnN%?P3z~e`&l_+hxgd
z;$R}~qBhVdTMt`=AI#?N)sB3MEF0KN6KqkCEDeQjaNs1P*C@E`7d}Q{uv91(*<^^7
zC$_O^LohMB*l-a~0@)C;Tnb5rR*~P%%kVm#E=CP0B~q18AP{K9DuGfb7ilFbsZ660
zN@Dz2J?UZ)62<+#3D)-*R{TmVtfp~<p=b+5W%;`xK7(Q?R|e$-)aucy1ChxDiBWFX
z+rBbAk6MG%L^h7;XvzVM<{2hl!a*hyTjeog2@iur5}s8o#&|I(it|JQ97AO>s7)@j
zamVo3|IHuBk^+6r@}K7MU$GtOJH8kNR(LT?ILS^B&5lau_>vk9XZ$w3MrrX}zgpH1
zH(xnt>z~0ctM|*w;_yXEQ``^Js|SK6-}}BKHrfE}#luc&kF}1hoH<K7y=fIXJ-S&J
z1v<PF<t=$D3k!0KhBpo<*0$Vec((iZik!}Tl*;Z#vTf<v9r1mw#r<;=TE~?SxfggQ
zEj^Xz3<y5Gu76(E1F9wA*1%6;P+-6*dj&n)Ajy~z{$zMuN<iGrpB=Z6U4Ph5hxSi1
zbk8_GxsEEjJ9NRks_x-r=**{&A_@ZKGdep)Cg}G5dRJ4ou-7{`esNHUrB7U&)RzpO
zFFmw+VhFE2ZEJE5zh=@=O^x!N!%Nn-t?&QtqqA?W+u;rG?TjtA-Io=XUTRtNj2yJR
zUNP%^@JvZf(Yu3%*YtUxLp`d+PYTxz3U?lCgrcu*n{oT=)<{J_+R~+K&qw_gLR^nK
z5t`Y!Y;aS_Ld#7@C+2$G6sZ7?-G46x)8?&#@1V7BFs<0OE#ItJusLF3x3S1{S=BbR
zTrb<v|69Suz*K`NH6c#1wkp-U%O3UN(Xxj}j<*q)4qRE(P+j)$9sLqXscAc-67@{f
zUpaC)fAN{ET@^RVt1`F^neArK8+C4T^=WUyaO}q&X=uxm@Z-!WPu1c6NpoaR!_4`q
z+RF56eP!Zv^RFfK&iiarcX23PDcV16Ph{KKCB3D`N}GdAJKDY4f+-sh&?7bQoyyhU
z9x4cVuzj;J*<P=Hv~GXM{MVul_b%uEy=8U&rk+n0tlt+tB{OMf*I?FTwP~hSeDL~^
zBK2@5-TbKW;`y4;p56oddy~HEdTXTUuKm_9xVODaI;5|UzVNhR_TwgVb-lWd8h@g5
zIFTfS^%sg8&!Oa=<^<Yxn;6(V&m6e#$AM+z0ywpX{K~YFU%v4D|Mgmvrb_jJ_aEym
BcS`^O

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker2.png b/OsmAnd/res/drawable-hdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ec00b2b0288c6dc907f9fb68988ea8ec79938f
GIT binary patch
literal 1706
zcmbVNYfuwc6i&-X5v0;uK(Xp}bx;PA-DLA1DUU)DFq$BbSm=Q0W_JS%BpZ^&1PIE=
zLm4Us#Ss)=Em9SWRz`(Z5gip}7(mh%OGO2WNOb^}8L1EG2Eq1+<B#sl-h0p8^PTgZ
z*KA=#c$llRmotmSa#gI7MKL?u{yI4_tHi5sFS9M6<*{@$rKQcNkzfVml!gElIy8}p
zB2YXd?FQk`VmWLg)v<J}N-4o89S61Ra4b3lgJ!Y(gDeIVOCe}LLnM;=0C42ziy%Pa
z0bq<k1*;5FB8gm;X(XaE!_`=33MR(Epg_RiB4G^Z2pR<}x>UVMVhI4J>`Iuk{Tc#+
zDHS>;0DMg<RuutADI)<0I6^iCbNPTs%;5@zBC%*Cz++?x_JepZ8x~6hhy>;V(+|ja
zGvZoFlq_`G7b69LNi=PcK#<vN=9m!<WlV&)VzC&4c@U4sW;EEQ3_Xon*m~2_84EJP
zgc(T#O;UQmZV}Z`>2v_dFnt|@&Y)7gF|0RDCyGfKWI+uOmjgpOojtB8Z4(_u{7d7l
z+9q{|fq<e26P0enn0jcJ&VZTRz1xvpkzpfQYb2SXps6wnOV<&4S|JMnnJ*li#3e!=
zAJK|X4V$lJ(uU%EX3-J|TL5cOzE}tgc^YKK&fD-XjQ9y<d_)++<8irieh4=>RE)?4
zAwrQ%#uNC>U=?~3jp{LC#y83Mp2qUtiIqr=1WHpzHASV)bU{QCMN_6E$^b~EQ&k66
z#E^QNGMjwtWqKX8j4+a$2t3qC>42#`OUSoy5Fvbx*pDw@<1iv%YxsPe?T29m8{rZ-
zCi26yVv!b{#^e7te-J|ovNy|rnrG&U=}7zW%_uO!n_(jK%mf*kQ9%&gmBo6$MIj4T
zTe@2-RIA)0KWQGxl4<U>1-ixOle#&FfjG~q4)2e^JP-Gq-{vpNF6;%Rt@8XLp6#lO
zs5iU_h#9z+IseS{4tZ%wL5*dub-Qh{Bg1WO;{Dqv$%#?vo!iLZ%Y%sN{+$=RV7H@i
zdc5nBng}Gxp*eWoEr;YL>Xc(+j(MY_wQQO7F+5LlR$Aff(zbQ6@WTG&@>hoz%{evn
z89e)}(q-S#S*^M8dA&z#cJ@Dw+sVtG-CE&sV!Y2(*<LdgI67bLBRbw^&2Cg~aD3JB
z&2#a^Xj|ANhk=-~$?d+jU(f?N`wyt1Cn6PLyUK@o58SGg?`Qs2eexLoE0(f%ctGkk
zYfqCrqJ972199CuLyL3cyKas7?9kZm!4~JuIUi3h8tAuqHFT#c&p8*Z%ngrlS^$lX
zpN8*p7ur;p!DnA^y{oUMb;ez}HKs>PyNdghb;>mxx`Oi4YP?RGG26q-;ETMpto*cx
z!s@O(dAL)5xO4yJ-^&x+JR08HboENdcskm6e#cM-TI!fksNVK<%u`D)d^c;Mjp8Rb
zegAh$<p=536U9N$XuY~F4XIy|?O1duGWHQ`{<+F5>#T#R%asjz%a!fxTc3D0X+sK*
zwIQC>WGAw_WXPv>5N{Ba<)GaQyy%9|Dvz<wx}l2tiPY0xBkKx254k+~WYLm1r;HoB
zbT_$y<J~8Q+*|jhulw_S%buZ;d$pLYY-HbBTNS!_%}*WRV05F3%5nK{aSOYxt~8JA
zj2pe)Ip#DNsi^SoiP~ZwSIGu@`0UCv*1y^xPZSidwkGs$Dd#*J{=-p+P|^H{haBdl
ztn^qh+^7rotafO;?aNK`{nWGS5}gtB9nv?!c|3l+NK>oa^&srvaLJGQ#W5tZe)t0B
z-h6GmesvAmxqHi(wz`*J9qHlsTuf~8?La%4vE7Bwb^bp*U)sdNt;O3)&?ArRe-DK`
KTvi*haqB;ox}ARj

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/bg_cardui.9.png b/OsmAnd/res/drawable-mdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3232a33d7c5b270fb7e5c700d5a92d9e39929582
GIT binary patch
literal 1385
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2HX|&5Rt4O`Ob}Ok4~NT}><;
zjhvkg%}tz4jGYb4oDE=lJ@bl767!N%VRmN%?S|@g#H-iJxhOTUB)=#mKR*YS3Ia0n
zOY(~|@(UE4ox!oLpb?&#my%yztO<%Hh_78zi!#enQ{0O3a}~hhY?X<{4asJSrbcE-
zDY{8%NhZ1`mL}%9mKJ8ox+cb^X2w8ZYMhp)1l6BHZusc~9i<OSEJ%q5CIn28ASOI3
z06Fl?l$r<3K}Eo<(&gH`m4Sh=)6>N<q~g|*X_0<M40zgRvl{Z-C>~MWAyocgRp?HZ
z<{b=+Iz3HJo=C3SKA9y`C-UW@ADcJdFbke9P;It$vhQR2;-$*b_to|%&gf5L_c_J!
zP>x}B;OTq31#Znny&P{CH>?uvlDXh8k<qhh>(f%!Co{Zuw1fpDWS!!eF77)0|J|vA
zjg}!y*O%C*t~p>oF+8D7W|Eys?VRU7O<O*=@@`u9+I`;i=i=7wN!zWw-5g}QKiElD
zl%KQRe(&&`72p4<+SYCEaE=w^=DSp>U)^vy^U>rRle&u&rfLTtRDLw2xxDSv>HJ3L
zwM~3;Cr(^cZN=4Ee!FQ(tB^zgiZZvwFXNhKJMenkTQYU&v02=2Z_GVnt0Z`1Ps5~1
z-tG$pLnU=D&D!Ix(vb1c@zH@PPKVRQ-<s%ie0Vl5?8Ppf)6qr+IV^IYZ6-ePoMsZ@
zf7kxnWrc6k_gHvLv<&1fka!`ph$ZVS*G92s{c`_)k&Cupy=HqPy>#2{xMO*B?fWYX
qci%SWUwSxO`_pre%;rzp2N<#}|MTy%UoQ+Q{5)O#T-G@yGywp?P3pP;

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_close.png b/OsmAnd/res/drawable-mdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd30cd0c92d49e78c08dd59748964125750ec78e
GIT binary patch
literal 1489
zcmbVMeM}Q)7;mdEz@alDOpJ0K3hKPxwY`2q(b5Acp@5|WwvdhM^)1}!_0GEk3d~K}
z<~Egm#i#*8qDvg}0~eLB35yV?qGn^VKQt}`mQ9I9hit~daAR+Qy8S`?W0&0fzR!El
z?|FXD*S%kuzd1H0F-D<K#5!^)7u=E18x;vxslNUp+?L5%rE(GPlWS=aC~RKd0}uyC
zR{$5Fy>(kJgLH*rUJdIml}nv@7KZ24bVx@X<OGOTDAG3u1)8Y>GU5RhY`}_+cAY~J
z)@wye^iIMl*g++mQ!j#|`g}K2U&WZc=*A2rJ!pXjI3UwVkn;y5OVEl=+qJ-R=o&|n
zX%)H3iq4QKbrvFaUId6<ZNL~pLn21ATBA1@&BhIg7Roqb!nFiOm@Rsph0r3i4+_1B
zUZ2H9WzYJ8k`=9#Wx;~uwY9bCTAi8~D{zh3Y{m&KuGL~t1C#0kG9APMQgYY=1tdmf
z1)1doNXR1X;j3jU3YpG?zzI(06T<;%Hc>ETc#sxwjhetYE)>_awj{g2zcl95mfUp$
zz+FJ%t3?LZ!<QTe!`waHQAiQ8u@s0bEDG(Xc&3^I0og%WQTRpeWxW=Imel!-v<D-7
zFm1G#go_X8Fg@X;Nwa}4Xg#{How@KPElE(OETbWl)N3?Zq&d@OG7&aHW724~MjI8z
zIs%eR2N)3c%|hR^Si@7X7P|;&nHSwW?+<rDVI?o~QY9}ScKdYIk+mgkz{}T4>q2Fk
ziJAf;TLZk=BF`bydA6`~a3GC7k^v?UMl%{8M(apD<}qkU%*%MRq(?_EdIH8jgZKX5
z{Na!k9%`2VG*9>nc4X-IWE7zAWSBqzPLK#krI=pduTUt*9F)x+ym@cGwIEXyw{vu9
zNxAEpYe~bG0_g4o&-e5?drfzHZXZv%NbS)*j(l8BE=~pL)`Y=`)WPzU@#3MDj|Lt+
zQboVj`imov>#rNV!!`(AgYCNf7U80QN|iF1-P)h``-m-mb&u-6Pvfb<h=Son^32NO
z{B85wxP@gzFlTJ)rBlk^;<nCj{`5v88B{hj51)F+)cIY9J-Tm4+H)()8<NXfmb-gW
z*1r5k$GYWNf5xmvB6IDLqf56OE~rxO-*u*QVvXMZMdBY{V@;dy{E)ld^jg}kF|Lr_
z-n?pj-pG}Ghxk{O%f1~;SJL0B);Zoz=)PdS)O@1vW>ik)K-ZO%3v?G+qs(9SxypWK
z2B%WwgKN&OY(QOBwCw8eLcU<=*}MsN$HC|yhjWL{r)Rf6>`Xg){lV3WrtXnf=p)-c
zXdCFv-DKVLAh*A!E&p9VZ%`doHeQPT%nm*@sJ<z>xn<8tY((mAQ_1m!4BkJVbT6Sh
z5w@+SfciuNOEQKg*MD{Lg}?8==eZ}K$#=V{;`lcc<33LwSaE)lpvb;<dO_0U*<btQ
zMSFV>9a-r=VNbecOFOK(;TenQh`%1c^M3T`M8@6?r&rxB+X32RZ|pmE;&OJ8e738+
tDNB!a+<GyRFC7}0Iu|?Dy`5J^DjGk2{jZM2smDS;Sw~hr)t*`2_zyVB86^M!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_help.png b/OsmAnd/res/drawable-mdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..8341644395e52ac4347b5f956241ac0f41daada7
GIT binary patch
literal 1555
zcmbVMeQXnD7(Zyrpiri06bO>rtutGoy}N$j(K7lq+F<84IyRGS?Ap7oM|-_;cU`*;
z3hpC{L6(f@5YbIY00DIxnS-fpOy&n46A36E4xAw(0k*k8{J`LKtmq$vKfL7L_kG@b
ze$VrJzHU=N{&Kl&z6<~WxyxxU5_d59PM;>Od~NNxxXlwBrNT<qFT@Cr0xTr!r9c-$
zR8d6~LDsDOnlb@^q?-1W3Z?Gna39O4h@_4x&O}5s0GM*)5yBUw1kg)W(P1+*+<gQB
zY0?ap=-h}qVxt1IvzDV)*5-SBwLu?7Lb*#pQydo!FqA-maV8Yz@wge9u#1c5<TVU|
z6DmT`4BaPH>Mj6nEJuMlm0syXP%UV{RH#mGzzmB)wJ5`g5mqBg1jBV298rUl4<vfy
zNIza=&ztlmN@ge^2oW5HW3iYjrctq66^vpS1|w=%tyYQ}O1>s65OHOg&rDgcQ@oF(
zBLdBa!K6jP%SHt=Br?4p0uyn&9~chvlZg^j2FHmAjH(crVUlr8X!Al5^)HQwYV)3&
z2n82WJR9YFVm<tsDX^HkM>|R?ifr)bIa(|V5wf$sC_{w>m)#7BUsNPb;(E1K<2Mjq
zrPeQ|jUct+;-@r99pWdnm>$uqy_%Grhv89+&8jsRje4sVMNx;=Vo_W2Ftx*?(>V~k
z&6vWv!n{C)eN@UfE&86s8Xk$oZ5%}iEazd_P^t?G0<6ID0X72KY!g)nvrFhO$;SAc
zWSQ<qZKpW8nj-T!mH{X7jMER{pdl$li+TM@jg~@{q(<vidNER`L@Cm%BQ%r&^`p=v
zp8UW0gGEwsvRVGqJgF<OBa_DmqaX?ohKUM`6U2$5Qn7t(7yzbfTy~2me&I%|+vzEM
z^2^J-kY#KqTUOT{4E(B>He66Zn=@29t*`3eTcba{b3|fqf{0Z^#)d7{`W0`Mf86$A
zvGnA%XPLsA-l0E^jHFi##D<r&&WpU0mN;=Wv4g+0<d?y^{@bPjY{k3$sZ!N~y}4({
zMw{rw({m+~_Ovqpy;w*3V8g6zS~s5C90AMl-bM49n>K&4HDjbDUtu})R7RIvR$1mV
zWuvE*98)~oG<A5HiM+AM*%0k)`0k5?XR5K0d#75h)qg)>0<e+cIcs~TJEc2{gRQ-W
zj^LOS@9J(Jm32w=>-(SS<QMF3Y*e`4@}~K<ZRI(C_S{hzr@d79%K9}SC0V`$cg)_q
z>-BGqoyRT*ugC*aN_v8Ka?YPSP>gqH%~s4hpGZHj(b50o=+&NRXR~}yW`^tN6q|SO
z^!UBerrqCnBpy4FxBkVY$1je<bERz-Nj$XeV&;tAteHPA?E9z>`SkYH`pnbiH+|al
zRkX=bwJ#xWZVaBSY4g=t19zQ6%L=b;Je=6jVP0G|=Hg_(UD>_th0J*1jjp;mY3g-F
zyDC1f9-N`yleK7uB`4&SD~>OB39`5AS3fSBc_PuuY`r^eAhd9oWa*)Ud(XeN<*&on
zzw)GqHtIVnv-?)9W6CeJ6|_bzLmk_GKe}&E4s!0s5-G9M8ZRk%`G-r5-6lVM%h_`C
zo1gX<_A~p2)H6>iV$p^VDuV5c2hPM@+reAMHuUksJ(~atKquJip9MmB$=|fgk#B$B
HT3P=O3=urA

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_ac_settings.png b/OsmAnd/res/drawable-mdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2c85b7345a6b23df901596e0c6a978ef67a6bf
GIT binary patch
literal 1499
zcmbVMeM}Q)7%xSXp=g-MsLXj3BcNQbcfGdUNp+<MYmov1n<YyI*WOz=<$Cq*pe@7b
z*i8I@xP?vGrdbn~shFX#=*A?BxyhzxZt60{EgNypF=HHwOPGU&y+z9Q2l0<xa_{>-
z?>)cg`8{8^r>x|e#DwJuDwQhHVQ0$Wjzr%0`EZq+n*M;BMk#P96{1%Ouo6&NInfOe
zhrrf?a=>z-ZRbIrN)_A4SGp9JvzYdXf{u;o=z@YDqE)KA4M9Ka*$NcI4QhFxMf>}i
zPqYZnS+tvtPQBA_19iN;Ndgs3C6%70tsaWgZdi}x1!-tN01Ar)g?gV%2QAuZyEHsU
zt}!h#t)gtTXdjYtIm-~6C;`N%Goc<mP9kPXhZ{|1%AA7`P{#DR7@<e?6m2xndIFhw
zw9uQxdFgVdaK;yuEZRCn@zWR<2n2KigHDucF`S|(Oiy40fkF*b4*3)|i2CG=s09Yd
z9*OrWyy!zB7FoC0pjfn!>BA5NztcHu*eA~<3Z@JTvVIKL=`lfw#5JugE9Kx{8gpvP
zl_5XC%7H94NFG=ZZ$=ahbN6UR5k<&`E|qv#6t<obJq-fzDGtV>g<o_W&(S7=G<eOd
z8zsFkZ7fH^#S09mQSW6*%A_|DZbQ`0TzK4S%O}mbq$!`oalC-ES_x|*MHE<##sWQK
z%Z*|kK3QRX9uW1-L*Fx4!y~b@O#-YUN|mBmAMJv&I#ChjI?<2VY|~XovNrQRP7KJ|
zkup7ungJ5u2)IH?6p-mW)BGG93>?stl-r9MNPwf9fpnv8iZh}(;M_*m0L-`-*UsR%
z|C>JylENa*@}K63Ucrux9A`%X3bVrmd~kv!I4W`3e}Ab`#Y{LDYi01p-Gk07W>fMP
zKiRT-UfsXz4YqSt5xKh;S({e<z~0+lkA9ol?z(>cH6|W7E+>P|=A2u{Kh1KpRxVrf
z^%Pl)fAz!okK6MM3*|c>cHF<$H$HXG@@xOPuJ`z&9Mrm}=Um*Xg5csjFCH3s^4(V+
z?6)5KZEwl=i9pzXGPf$--a3?&Jo;z5wfnGIdb+2k`Auu_uA1g$_ET$ip1!iMWH5a+
z?$pR4QWNh|UkuOtXb`;~yR<203zLzsnqAq^ix0;h3LhaH9WjMMx9P@Z$8bifH>ojg
z1-q|x=W~0`kJhiNs#`s(9)EmWBB9=r`=B)?(DLk9!V7~5SqlR5x9tm87Y-&KyxM<>
zd3mI2WQW>D<FVld{TC0UCmy;Qx@`<z6jn@~EnU9pt+vOGRxJy+6b&;8J@nyoZ@(WO
zKHWF;OBQiwOO<+uDfL=NL$@?M<ylj+vGN4_&d=MwS$w50dEH==KlO8?^t`!mN!Eq9
zqbBNVv(9$>bovLex^Cf2ThTQ%V`s|v<V&gx$IQcPI&OC&FV6E!Y6cFtc7M#KrN%6|
z+j)sz8^~OABeV48$k5Vw>NCy2%H6G9N79<d#J{?}lP4Ct1ZMq7O^W?&<05yXEhTf}
z<`ZMzhcf$#V56pO<FV@3i|^jAI$Yc~Wu6>Y55%RadTYHEnHjfwBEMTlK?&2HU(@mr
DutF4!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bus2.png b/OsmAnd/res/drawable-mdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..04e7e890709a6b282008083d7a5e96d4c020a42c
GIT binary patch
literal 1354
zcmbVMZ%i9y7{3k%4P&-Qq8m%_a$BNkulJ|dKX+1SX+f$MSRvBwQ?GY#=>d0F?haa*
zo7<uRGh&v-B?OX<xn$uJnK4;RHg#KC!DZ;w%@F*sS(TXhmoJ773-}f&`ho0&m)!fl
z&wJ1Bd4A8od$*(QmAw@;6$pat4YdX%aIY=A<}$dxOwN7)xBW(Q)aX<bMw-_E;uqC8
zKtnR$10sMIhX=j@^$1cjBy~lNX!vzbP-Qz`(6MLa6htFPePbrY3w^*q<Df@Uyx5=D
zKf_Q-^kUu4Fd0q-KvHTQ(Lm=&TbD4>C$J*c*nrk&IA}ly29IXsensapUTniI2hW9T
z0z)@cj6N^6Nh%udKm)1<P^aC63nay$Zq`mYU2fKGLun`zq=%qMoMbttgCl8l>%pKm
zO-yi+V9S;-D0#7@VWc>MNT<{Gw8O4yJp{$FEJ4x)P2*4l*M}8@&)|xFuxKF&bU~9+
zhNLQJ!6F}52MsR<nQn$4r^4ZF!-~F@D3~%L!>0(!P7<<Qh-*VzHzMF)8arz1UBf9r
zM1ZaiY67fB;$RUBbN6IN1x3h)Yu6-L6uv*G3WG9Gj8M>v!7p}E5;+&mI1+9?jx!0E
zHeO`lk^m0eNhWxPb&)PQ?kL*X2~P$B0l$N0Tun4hQO%6s6L2*<-5#flCH+loQxO|d
zbc0s}Q1mT9-&<J66R})C1H7SXU8>q&?1GM@YN&crO`(CnM%B?5x+O(a(|TQ@Oq)>$
zfhG+Bu|-p5bR*B4v;zmXgNd^q#)*rh!->ZkM#MdW0B{EdM8WM560AFcZQ;fLn?C}Q
zA_~p&pXMoE!Hz5(w?_dA+rtDDI6)d5m9-;pEg*=gHx%@DWtQTP*Vh|M%y0kXPac{s
z&9?daE3+^9Y`e3!eRs>Ur<1)8OI8T<#GdR|Cs*y(i>CZ>-<y^rKTL+kW0UWgsy({~
zs;%FXR!i)us`5CF4w>@C%p!%(mgl|mH52zLXUg)Q96I`{Ici$5qhHPeYW_U#yF2eY
zj?nrp>#_JpAD=z-_cSt<yJB2jES<{THm*j^pT}-hJ-q*3&-jfyS<)A~pFezN^kUAI
zUB3SH^p*2D%c(`v(h}mVyl^hI+&NSG#?1cq(1)JdG0UzM6>UI%uHN(XrI9t?LMxif
zUoKr;y*a?FQ4!lU?B-m#&HUHO(HqE^eCfeu@B8hx3Cn|$Z~8`GBeaGSyR-3*Ynb&p
z%yH|E@5g-yGNTJ~Fa2`%%y*A^f6IM)FVYbpo}J3ApUhNUSgxzvcVNQ&yIlF{xnIjo
z4b&rd&HD4yGij{uaYc4PjE?u0js4NmjaXwyoyB)7cX+b!w?snCZNb^5*y(=&n+VWe

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fav2.png b/OsmAnd/res/drawable-mdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f6253bf37c67d41a5f41e35590dac62429b8b5
GIT binary patch
literal 1428
zcmbVMZBP_t9A7l$rSU_isbsphIB28$a(8<#yLSiOaR*#_2OJ2Ly|}mg9NfU}p1X^;
zGG&Q6!I(&IU=}m#P|grBF&L3%@Bt|rXT-3?$ef&Vrb2L<F>EZS=a92LIDTkn_IaNF
zv%lZ}{l87c!Gc8@nHdOzEb<q6LvUY}c+(cb)j@S1h1&|vSE-fC5iQOs0C5X)7@&TU
zs{$dw2|Kop04IXX-ySWi)G7m;SY8$hE`cF*F$UQP;>^`!9A5)8Gz_Yuk_($YIe?*2
z!G%>=0#qQD2dblm^$IAh50>%uH9R9=xjCp)XQ2WSXdJ4GwUWx}E^JmW3(tvb5<_Pp
zT8#_4<5Xp!7|oLvfLaJE&QnGjwK0UzVzn{04X6pqBxNT}6izX$#mrJBbnd~RHART9
zA#eViEhxFLYE6r=BpHv#iMW}Nl`7K6FbqkVNRtVN2wdGEX`GHrYF1K%7pS}vjcHL?
zLK7Ofuw19PFzD%>5X4v@a96RU&Ls+_jMTXpX(T986ccgHqE#&f{&nM?Xtiud43Ht9
z%5@44>k-LHl40)dZzutT-mpbV6c&Z6^~!vm2qew#bz$%eAw&h%YNE{%8yCju2uvF%
z&~S+WGj5?G9L-oMt0`<w>bV!6%Cq`tizVOcF`0};AMLio3yaNeu`-m~!+4ThzocrM
z#Dk>mD6~Dt_1%}t<|%;FWTi}&Ym;42TrF#|S}n)Wyu8_}qw6Z7k|4*`#}j3`6SWs8
z(d|IUS7Z^L%`+RlhYvP09cJvb1s5o@1rO7-fZKT<;ASHbc$=M%Ft!Lb#~1!@{z&K)
znP`^(G*9vhc4XpscNCy-cbI?#CrE*#V(81gfFLQy{a$yO{@wZ3Q{)5g<*!`x?YX^j
zZ`!d^gW)OST>9Rz#&tz>zxRV99`&W&XIrPb8N9t=xMIZD@J4Yg-M|b~>};zgdgCX1
zSBGC;J2N$P#%Xhyr@KmswnuLtrGsS6zSLbQ!H<Vl-PR5bJbk6{eL5pjNN?JfalGZz
zkA}XEoKsF69y`#iuN=ZJEH2t(2(F*P7vRn6Q0FJ34|j}9Iax0}(%An)Mt7H1k>2r*
z$I)n%vKGhBU+n#Ta^d&8tFC+35Df*x1C9F9u3K+5IQ$=COnu<F8w(GnUN*eD=y^>n
zzpAHhYM4RZleNimvfH`*=Vxv{yJ~#qwM(5j^RxT^D5*c4bM`m!*p?P#ZBF5Vix=9*
zUi@p`@ZgcuUs7)Ab?-cpGq_=<eIg`G6kR&A*}q2G_-a#u17tft`}H9*JhofEd3k?j
z@X+U(e{NqrX)J$h=V(_}>-5#^(|>P_99eR}-$X9C(Q&P%xxc>o$*p^{da{=_rQYoN
zN!xE<TID9cyuPQTon7(m2>W)GqsQITabnHEc?(h>>>NDd@3UNN<F_pvzmle8u4ljK
hn>f5>^N$5Dry!%dLXQc-uL6nxq~90xc6+uq`~!#)|Cj&(

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_history2.png b/OsmAnd/res/drawable-mdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c856a653d76c1c3c0c84bd935aacdc4fd4c7c54
GIT binary patch
literal 1729
zcmbVNX;2eq7!Id`AjK0c>KaBw$+5W)i5Lh+s=)w3h!loRvVm2SU6O?a&{{dF4ppoc
zQ2|j3URcBt@S*}<hzE=n6#<Ldf{s)Hhlygfc7tI1!|_LVX20)yzkQzferLDH!$Mr0
zXFHQfBv)yuB!bxITHlF|#JU8mDkHX8cu));iE42ZWPnLx4XT0xsSZknBVb6Ap3(yQ
zkw|uFh$04$k*yG_Q5_AkVrXU^MzBdFKYud@sn^0dpn?+-y@)(;u7M078WA~~BLihv
zAe@ARW*Feej4*{dW35`CA^R@{{LDf^feywYz^qHw8-->Oc~q~EI9spjWMCA6uN9F$
zI29w41A(Xk1~@b>RSh!O08c<;aJW1Hj{-0WnGW*lOppo+gdCO-WCCLknXqQiXoV4y
z;4xc-BqAr_I3}diO(qk~#G;{wL^?wt5YRy;oynvU2&yq%k3(jv-sm;1K>{1q1_Z+q
zR1a7+LMk*B7m*21KZKyeWU`Nn^~SM85h<gaA&kzTfpneD8rLY=h)2Nxy75W0QIU?p
z^a$99rW({lJ+xlqWFmK;H)I78-UwG35TYnhvIJG9>R>%Cm59j17n%mq2)Rr)OUr{)
zRJN8#8>C?qixy^4IiMC|3%DScsbY=m`4k@v<OZ=hToyNg$z(8s*kV3$!Qt^aTmdK!
z5Cn{KrFtU{>DBPKZG^Br#$|q%D-1Ni5RMuYD4IOp1@a^mM~z7+1_TC<Rvqw(M)Vrg
zWL#t|(}$=fumMSfHNgf{2aM)fh<w5a9*eCK@Yx)y24r!lDmGg~<*U^&mBoNHY93#$
z74Wp=F}~*i=8sM|MYlG~f0}3fis(q|@#82E!pC8P^~3}jh*23D*t~^AvVA0#h!y6}
zONE(9TT?umpL-O=DsNXKCk{L<*BzACsEpBp+F;47YvkN1;R|&YZ!cP!cP;OWxEAMr
z>wb5g!MCt?SFan=-m<`}YiRwm%$LI%=#%yNmi9xhUY&okenU@B?}(_)xTEY=((!%O
ze=LZq%8hJH1}9C+^4vc8{Km<Ho;gj*!7Je%xetMA2SxbRB)b+L(5?O3{sgzviFc4j
zF-|i(Sype}tDNFvV_If60bbnQRhIqyA=BgFzS@l?39~%{+?BOoS9=!QG_;fMX3f~H
z^ImsBvW|DSuUR$FF=VcG>vk+1iJfVl6t=M<fx<uXW(T^rY2r`VEdJ3;g((|U-X~iV
zoArJt<|wfJ{;yYP*EtOHUJN<E2=P7~#VV-qb#QlE80>gfPJL%D{LR0$cDA1_Qon(;
zDywJdwtm;@_y?%HgEqdTseh%swX!5Aj`H3e3zy-A4^q~oPPKnrJ!gNBPWd;*7ZT8#
z#ijO64J6r`yA^3RlKPj$7D;KExHhktT$s~XnSj~mphwd{<(!iDy3RzVozt_LtCyGb
zq&^<<?Y`VkJ$TWx$TZ=wCA#6l&c^k13oeKp=I4F?V`b;Ox6aGUi>^_Iorcwx9SY&E
zgD<At`DTWE(XqIovX+$1*Z<no<RNcfHnjI05?kK+=-W51Yu-Rbo9>5r<iR7pt_N_>
z-7R%4f7Zu8%ibUP{GLnx_4nI<_$qd*bK5-)r)Dq{3w<z;<&EaoIa1`lUow|ZnP1CO
zx)_nAlDsnmjGbA(SM9-arb{X5Gr`mO7GQM~-ck7Kc%$~*;*+_}Uc0Vjb)Wi~Hubyq
zn8IaVp}i;bkHs|b3r=mN*bAd{zm#@iq#HIDm4{p%(h~~IzGmCL%Jb!46t{X=PC3Tc
zAL-H$r{B0P&d;QT;MvNXebdg&&EAp_S3F(1ds~z~%IECJB(H6&+MX(Ic*cbuZ%bfw
lG^rZ)w3OXEa@*h5g=E-Ql>QVdu(AGBq(Nbls(^&7e*hMfoyh<I

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_home2.png b/OsmAnd/res/drawable-mdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..04f357959fc7ffa275cae6db833e02bc78f715a7
GIT binary patch
literal 1255
zcmbVMTWs4@7<Q9TN<|?;K(#5OXO1*FZH_Oolh{q#=GG>3DOnb20U?Ah$Bo<iQrlh9
z3IUrYv<V(61ggqYxAL&P6qv-*q%mnL8k70}DjGsugb+N8hbhk>jpH;aJXCwYlFvE+
z@&En*_uqW6JUuzkf3P3Juz_MBS3&y=-rLuU))8v+GTIKf`I>vmRNaPXLoBVB5(GtE
zoPiZ6DoYDr!z70J&uG<}TPvLqWK)lbo=&8xTL_I|$+4y-%5%^K5}eVD6#n4)mpIUr
z6n>g3Q6(!2>sn#ihNqUNtMc-k%q#fVC`dL1WI%_m2%7r5;RwwX-nJ{Cvv*D6psnK0
zrSM%+wNe>mO&bC(5+h`aW<i{f&|ECe$BzRB$t0B^8H%8Ifr|<h13C|myxEE>RB{s?
zUr0*fb=S27l58{@kw!FP+A}20^E^p0B*PF$gK(A%S8Ni76Yg5bK}WVV%hgN+cos#;
zTy#@7V!9iGZk0-Vh7G5aD3mg?DOw~Qp-5f#;%aL<ZUz2JV_$8jx@1AJ0v&VFmQg*_
za2Jen_h?6+B4Q)FY-^|};(X4O7j<a3#as$UUm}X82r-6@s&P>wSQVvBR9LjAFiLQg
zDzbcxiZN2OYiB<^m1Ss(&g5emhN0;^n@(h7c`lydVmy`3@R=^QXgIED$gt~ML%uuM
z+#|6<)`p^M+Evq>?{-1CZn~yZH!YCOwyO??Piux^Hk_kgnRcVjL0dZml?mI_K|9Za
zwhxDRl$H1d%Ml6{<p_yo6(S+akciSyk>d$j<>M;e!7Kkae<UJBdd>2m=ILIcj`WUu
zqkx3HVS)ylARCR!r{_cOV_47Q#az1D{6YHr;lr_8<JggRdwhPCo+|wOwteVFKU~FH
zV;>MlZdIni>;1RSmT&lilm1rY)!r`>!J+YMANJfG#Xj1&xb^Y)o1qKapWRtY|IS|3
zKlcZR9+UFP*=H}!hOWScQ1C%OO5;2IneV<jDbeBJJ%7sw)bQb#zF%Lye@R_Y=o5~A
zbUP3l_;zGybz{v6+<Qto_g-J{X>Mv|WotcP2QD1CS}X9G?dokvAD^m!vwl9Xw)7-_
zj5++A@2?^eC<LA<kNCvr2Ys!B;E&7MpRj8(7aV-&?)|rhCwg}_KRGb@=Wl1{`pV%O
scZ!1>3(48mm93p)*~!;_c>>(TR=MF{GgB|V;{AGx`RUwd=8bdz09+iC@&Et;

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_info2.png b/OsmAnd/res/drawable-mdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb2e641a74781ca04c23319a50775b814bbf6344
GIT binary patch
literal 1408
zcmbVMeM}o=7{9_s5Jk4gGPh;R*=@2-u6J#(A9u84r7fex)&doXal-ZPZMnhSmAmU&
znA<YuG)5zvZYoohfN@4<4F)9{5io*mI+nQ@-H2gGkeN(3&HM_Q&9^|&Kgj;@l6&9x
zdGGl>&+qxVXZ^mN*;#9|5CqBgl(@>_z9IQ$X27+8NOZz&jq0veE2NMbV`P9hI4KBF
zkHCaMIbgV^#<ReNAnAMfK($)!eVAq?LB}L@ba5d9(FkHIj7J!@9;j##gn7}fz0p6Y
zMS0GytulEDZ^Q}e_>yKBR5benY;!$JaoWP|s4Y%I0|HPPG%hrV3LUp==j_t(oV>=h
z=$wjLZ`aO~s`mO(rz8W^q%&hIp(jxbrPG_t7Rr*38la35R@^{f1Vx*SG+{s&9xe1H
zb0NCiRlMK}N_K6XszzuWkHuoTm{BLmVO&p96iyg$g8_pYn9?MwOdJ!HjVTK*ps+F@
zQF%#3lNOnv6jkk7$aFpgA>#Ee8Wxp>M8TBdaVCQ6bp$R5$++gU6}24vOJhlGCD0TB
zcsWp{sLaB8gf^zYFn4!$lvIRl=tpE87KLeWNo-UAqUv$kweX9M<2l-FAdMjl6U4|6
zOdG?Ia0vk;W+FliNtp?=A!tn5Sqe`$4SGUf<S-W*40^qrbXc8cx5;8PnJL0iL=~m5
z9#K&lkp(H=JoLSQrS6EOoibolNe)O-L#hk>b&@J6by5U%I_Ij6ZmHr$PKqg8lVzHZ
z+682O58#SrNkHfFO!G@{uo%f8WhG4*M;J|5kR&<G%CZ16>H)`EtZay~gtQBI?*HZw
zhotaiv;3!dQdh7elgGtTfWqQ10TE7+3`gbFiT+*$(R6rRjzD~T_?1se)5>z69_<!i
zYRT$zVBeNHa*q6De5(2IS8wNK?*3BOHM8ci!1f)#XB@uPIrLu8f4TD1t@PVxHl2@0
ze?6ab<@188%FIODUNOIBwugLi8TG-vl|yL<{z9^UUbg$Kf_H0!!#9+UdrE81hR+!;
zPhT=ehBp83=c-E0MO$2RQge|x+LJfgX6hYj^lM_M;C+Lv4^$id`RR#+f)_W}e|Bj2
zYDcZNaQW98woQCDb-~ksv>*FeN!Yr-=?T60(COK!PmkQqzrH-&Keg#fMFq7Y+)~pu
zqQ`G#Kk)J&wv$`T?ZV3N#uef3%ii}!nEdIkn&SmNcVu)caObY-jgArPR}L1V`|oSC
zr#0^Cc~sxNx9V@vzb$bh$j;oK`&{?60pIEluw%Tldl1`ys8iE;G;v^k$?<g`UcWx=
z?z`)q+20=DIT^}`HGeTaF!n^wkNr1^k&)if@q_!Kt+&P1q%-riQ)O$9y+C`;Jjo5|
zTQ{HPZ=QHQ<{Pya?EA$kKe#LXQrbFO@0fBfFGpydbPSZz&wNy<$w2yQ{TEzq)A8g#
N(c|{H5=FHw{{Rgi^z#4!

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker2.png b/OsmAnd/res/drawable-mdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6789c727ce32d8238f16d8647060d41062b532ce
GIT binary patch
literal 1492
zcmbVMZA=qq96tt@m&{BTO`JMCPnn=x?|OaXI;!>sv`UdT2LY$O-aT#4(q6ecXu%j)
zh%PfD&LFzEjaixUrlNCOHk=X0gqbbibY#9P&J2^`+x!3-I+JZrk-B{_e%K}VJkS5R
z-|zqazqj)9R!>ivn}Q(7blVzhA>0>4-y{WGUnP$pg4;`ScBxz>xa1%s0>s1#PJr5c
zj2jdJhO4PO53&#>zM3yCl}qip23GJXnJ7jX@&zCpL9$kc0u1W~GU^0w-fzV2pFWGB
zJZHp8w06=SumBIgrd9++wRy#Ct(T=aY~>0xD`bEQd_ZQ<kgvio8A3*EQm+A?qt^t6
zPC{g_5qs=ZsXZUH2qHkWN*&IUDh;Zql`5@HPwO*K3d#hTNl+wC(gv;CKvL+`gF$N|
z=Q0#pbEa%T$%uJmIba}&U@)i*s+EH1CR8*{6C_1Y6b=!%RO6SK5bl>2$23@h#EN`C
z<^?|*)yO!7D%prZPalWi3)t;X6#J#AM8T91AtpemlqBKvMdO-8OL8Ij*Nvy5rQ(_Z
zAPRvbREaFChih?+40HEvLs1~~#;{)GVNsY0tH4(IfM2#*jTro*<ao}Yqcm!lo^j$D
z7fc(&Y2e}lYFtaY7!9o>b(B*b)AKYwY0+hCv|6*yOi?OTw#JkRFSPnht&S#5X4)L%
z+WeBt_*oFM%|qK$T+=hT28#$7SrCf_p(54=`5r+QB##h4EtbiuqiH3)pA&*odbCWB
zqqYK(uLfL>DEQFHJRA6@_@Gy7oOGr}i*uw}i#s(M4$ov+fU8x2WA&M=i`KiaDL(gq
z^G86Zh-kC?r+H#mup^_#C!+v`C&L8%aDqfQD!~~;69^JFZnK(-LsyUPJG0JQFsJ{1
zlcF;11RBvT8ol#EQkmvZB+@$?zs18RiQZjhd$0B#-rb&#y?7`UlP)f5ThtQxwC?L&
z<`X-=Z;tPBR1URHgctt2b<j98@@4bbb+)8)L+7TEAI?rx-A0NWbH>BfTed6cK*}FI
zEthW8Pk%JDtueJ^UTNG|&vy?^Z_k{OSdJ<-S&uBRjiO&D3i3v`*W9||o$H-7U$GQ*
z+*-bh?d$HnJA5zxBcNPZBi~Nws(-DsQngz<?D*X2&Y1Y-t3Nl?xx+ZwJ#FR%v$d^Z
z=`|k9yOzEr`DJ8bmG4b-8g=k}wen+X<RBV)xY=XB|KmVWe(Gg7;Oe_$oe5`?pYPbY
zt!r5?9qxUH`K4iPAji?OrSg<zt9sboOfBoRg-yh_bp;){E4l|S{`FgW`zIeNS1ph$
zb8CA}=ER+EY?b>f_AJ?WbYpVsj)BhMYd5a%xUlp@%h;X=&vhyjPMv$u{>XT}sRDoR
z_nsr?O*axV)~3|Ay_@ldaH(befx-N4Cp$QgmQ;ASF2@t@FKtll@0s70mQ@~cuk$CA
zkDqB+e*D+HyCSPcX7?}oyS%KhtD*ji_k)|W_9c>$2SHDwdUo%ew4Xj}YCqP--c(&)
wR^m9|Dv8`#_j=<ieI2s(+~MkD$2P|)kkd1`%ll8>8;JgAZP|I&<7P+QKh?e=Pyhe`

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xhdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce357bfa94814b85a8b7020dd70e7f65aa80aaed
GIT binary patch
literal 1469
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2toj|DT`gP;EX|xuTnr6eO)N~E
z4cv^~TrHi94c&}P&0%^y^NLFn^O93xc4va@hUm4xtJli8C^fMpzbGU>KL?fy0y6ST
z@{2R_3lyB4!LhEO5uTZsl3!k|35q6&uU%4$GRsm^+=}vZ6~N(am5Id-$!3YBMrKJV
zx=CqCCb}k;Cg!@97G}x1CdQ^_#z0_doR+2p)t^Fc_~`>3r4LFhNQnm~1Wb`2COj(u
zIq=Msng`55MZm1`IeOJ41_s8vo-U3d6}OIr$NC*M;5p~tzD$utNWt%b=7a}D1^s(-
z)>k`sgj=v~UlAtIwDg#q=BG;*u|X^o?Y2fG)&Dd)Uba<B`oO)?bsP2OTtCEiMQ;D<
ztOGAEOtxlk<Z1J8UVdzU@e&WqsLnk?Az5x25>7>;imw((8hUt@I(Tg0QM6Qln$qXU
z+T|E@%W@r4!6%7K_bneU{9Ad0t;+qDpsYe#NAi)MMLYLIuD{-YZfCd$&#dL8Tjssl
z^Y_f})i=@<Rpu%z>rg)OGHK%uw{+7Ko+$sal=pvq_TJZ6nX2V4AYK}4?{HATdeiqh
ztF7CVuTFeC_lIlnov+=7&kW2TZ^`|gws!B4>*Yt-A6@>x|8|0L=ZmeXEw?>P(!^Nq
zo-;M>Tws)Srz3X#e9n#(+1N=ZT2(H8whZ(ADENnaWuHp6$JAv#v!uUfwj9k};+1k=
zhTlUrKSEdL-u7i3Z*QM7yfk;RG3V5EnX{e?1#PKLT4KA^aB1w(8*9Q=N8c%(yK<A;
zZtMAtPFpW7;97m=W{utcLorqMQ+{O5yLPc^lklpZM?0s-r~UT+T5|Z)+Q(Viim#@a
zKj8DWYJZ`-qGjFM-W4a_PITys`^$beVZEtr*0SSY_6EuC30J+yDr?vCbB)C0de{5$
aOgs$7!Y2x6IJ6dn3RF*5KbLh*2~7Y$vmB}b

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xhdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..047cc68c601c688bc331e6d649ee4d79a3f7bf36
GIT binary patch
literal 1994
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
A!~g&Q

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xhdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8423d305c45111f7bc8320ee14b7ecaa5671f37
GIT binary patch
literal 2155
zcmbVNX;c&E8lJGK1&bnxxP@sz6tZt55+DnKfWZK%V1-IxCL}^KAq&J55s6e$aKQ=+
zXz8&n2wEwXrS%k03U00Rg35Bhf+*MvsBlklL%9Qjy+1ttapybpZSy?u{+`K^gaz3z
za$N)ffW0VK5P_}%Gw%W$bgodQ+(VZY`oL&?BqG<R$+R%Qg^+j{D^kf4;Rsj;?M%52
z`vQPvs!|%Qj}~uYCm<?<Yz9Lxsx&AY0DS$88d*XTtjET~iApsGd~&G~#3~^U7)2M8
z#2P-VPzIZ{aHJ_rnqW#wU_qe2AJ*5%Mg^!~y$owqC98F8BL|$7%SQJz*F+FI3(+TW
zz_&(4izQe-qJ^<^0t25wBGa%;7J*D>Fj-7*ECoFiNj^jh2~T3N=~Om}f}MLnRGSu(
zvm*q;IbG<911j`-4Vy?zOG_i9Q3;4Pkw|8-SVR(qNTJ|S1YWmOt(O_`YTZZk5(Ka=
zL95j0m53TUBT*KQ81x(vwe+nEDvenDPOw@x7brAjM59bYBojzPm1@SXS+q_c0sn2r
zd(k@SP7O?qfOUvLn}Fs+{?R-cjom*hngOELus3U!Xi{X!0wlqpg4KGFfCHjm2#^wD
zGbl8woGFXP)8uH_WDpIV<S-RaC&^_r7K6l~#8c<xypN9pC@d0{%;3?;WO5+QM@Zob
zX%rq^$m7$<Lhd|Qq}J(W>I8URw-VJo$0hwEm(AD0GCiV|B1rOl6-X3_9?>Zf4VKTJ
z%{taIN~wmBG~N1{G`;m&0Be=0FeKC>D(q~W*~<6WK!soujTJA)Q)w_64^e6H_;?mX
z$CF_wo-U)pOtPE|&herDH-1FaDB?`9{7>=BU!fH_vwhbJ=;2*6!D_UFv}mhXJ>b{@
zfYm{ffGaijj23TA7IR&$mfd##xJK&!%cLY!Ao*nJ8gC~7F5d%(&o?>X?(X%A=Dn1J
zf;B<j-`ji$3PzXmdcXo>>3;X%dTHh4`M;*MjULR-n6#milY`ed+b2TR-|FNIFTUK`
zaFQynxNu>4PI8_gYa2FTet_Gwy{jI2iEno-$+a>E5P!G)+FUU8Y;(W8(eAN%Wj|<q
z_|uS^SInaR-k!{K2~f>#-#)>xRB<<x4t03)ylg*fS|WMfXt!r^sg<wgN^V$5>s5+L
z?%CA}AJ=p@IAxkTVk8R-GPl^=RJXuew5zXYIF@?V+l6q8T4cvt4U*WtDX=M8Q+%m1
zN@(c2|I_qYAo6m`P2@H5^MKE*xRe#Ssu#Zekuc5Xrtl0ik#*kD1@IVOdUl7nYad(F
z6pCpz#}?)7#uNnktWw?1Y>8t>TeFkSIX?(>@)>J!D7~KOuc#RR)#-?J>QzO$`A*7d
z?+oFcYlY@84`D3E)y!Y@puETZ$Ok;vHp#tzO`QwtH|*ba(W5DOak6x5^$Cjx_9NvV
z&$~C|C2G5ZyeuTkww&wUf8S+%%2VT<4%AF-jLLs<yqQf+UQp%m^^OPA3u;5#ht0a)
z{$+<I9z9!86_CH%w(y%BXUR8G+yjc#o%j2C%gQgliHps>V{X5zJ*{vfD(-TE=!|fu
zxN39Pn_8SoULvX>59icwEHadp+XPpnG|_C2MMr*m3&d|5_%VY#WD)Dt-&dZ5>FM}B
z%hL9MOYAFeQPShmlFOs7w$<_D_CB3_G+Kc>f1&w5dyjey0mQVOZSH*qL)i-nsd?X7
zKl(F#kU!O0fpe_tI99sJ(E>94{`}dhmwpFA5Zk-;o}K%F)!xiE)U@$SWQNbFm@iJL
zd709Kd1V~lX=peo&)=rC-n+48%+ak*$Zb1Ye$l!2d5X=AX%zKIXkJ<K!JqS)yRS$F
zt&!T84;-p-0XaC;iYLp&TWc0#)<i3O0}~6~2MtFDOlw|#47{9NzKgZK@M@!|lI9k0
z(i#I57yCK?dp*?+7#kU}+c+7RUm&YLWSZ>zOMRp@DSLp!Jq;!Gwp0O~gJV{PTb7e9
z&e&M@5S=n)ZHUzJtL6<!6^BR9;952A0rp)JYZq3X+{N$!x=jbezY<l#+q0FJPtD(a
zUedea$~wl;WV&=xJ9(!b$lAxvKKzH@i(1hzCKi*C^K`gk$67{1(XLl;Bv4%jrVqX8
z3(8x!eWII**O~nLah_JM_WrOkZkZ({YA+F{XXopzD=lbNuD8vp2cC-U`+`YrO~um~
z`GS3Q{F23cg3qiWg&TgOC(~n|`7yIk_$)nh?9?7Gy|UwGcSfm3<KFr?0O`k-J}1^)
z3F@uQz42|^NOOJIz;evBj4XRF-MO*n>AeBVLeW}f$d7~pCdM`QmcyTC6j6_tbpG;X
znSaF(8&@lSy<dGm5Bd_fV2(FImi*3#LF4V6EA`6<J|wJPa;eTCZRE3l4<F*Dn8L#e
oqRZ3v9`)81R&xVa{n|MW$mMsAw$u%H&;0&HfnkF0cyU?(1rt(I1^@s6

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xhdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8376cd0aa027c6ddcf173a555f746b7d85a0015
GIT binary patch
literal 2000
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png b/OsmAnd/res/drawable-xhdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..466683aee31797f42e7449e7da2eb8461cc78a92
GIT binary patch
literal 1718
zcmbVNdr;GM97mWaaO&6)PuwI1*+6KMw&^QS5L(b~P%6{`4wW=XOTjiJ4W%%Z15`wG
zw;kuEfOifb!^y<wbb_O>V-9tPC_bi$usOuXpgNom6_)aFyPfAB%l-0u<@@=3-<MLg
zYSA=LKTj7ImubqyibQq|cfM2I*%^KIGtDlunV1wNiPAB-7)`oF5tNn$ltxTXCXyJD
zm)%OT2sf)ilftCL$Duf7<YG=4uFYs>(JWb{&5Yq$Bm-zky}={{2kIL^z(B~rWMMoU
zZ<do8hQ;|bnUt^6;Q3j&lmH_mfN&ei5*SGa18l}sCJSnlfup=AyLVngATTPzWXZrW
zqf+A4fSjU9K*$wwaF~YxVkws=6p5wcP=L>#Ay@+OVGb-sg#r}j1LF_KYNH7qny82!
z*TtS>U<SjOQ3%S-&E@6_xD>62cv7hpg82}i&tWAvmOK-K**GRkzyyPWwBWSC%or#W
z;AF(KR1PBpSxd)UFq-4zUl5xt<AGvB2H7w(#N)z{(dhJRRNBHMlK+_TQfZ4O&rCvz
zq=m|%aW)^ifC(@gyH_i63bNLq3ABMt3bsl?;W<Xq#3&Uqkp03X3<N6TBLbZm({d0U
z8#atU*hxnUI6_#5AyN@6;%fyHJTJq?iuo{tNDxsppU30HAd;9ENfckmlPVBllspQa
zz$#4^1~cL0gl+??dmJlxB^H&_B*sv*hN4zYRDn8!Vkk=nWd`K((X0bO$p#Za<ywNB
zX&UodLDB{*NyO5W5g3g#YIunaVgaI+N)RE3fCWO17C{J(1jk8^fJYLzSc2=MVjVb+
zC;o5zAl4|zSuFo5o{1~ABAwe8t-u~$G!toJJBVgmCFw1%dKVYh%SuI*#&+#~Wm{Iq
zLZ8$6ERJtXZAWo_#@0u`g%yLhl;=H{&GbGMH1}?*FDGc&6<Vr36y35?-BH}P2PoQK
zQr*`QxzJ~Z@3Faq>V06*jp)*wi@KuyDt9P#6~+sXyXA+UiUb2klmaFCp(8wDJzj8U
z<Z-5AQtjk9cE1%XCw)+~Cw(?F%W->FVXytqf~ME%5(;m2&w?6@c@B@&?gM!@PT0RF
zY(9Er%YxL}DIYcY9-JMzq;;2caPra2h><A`lj@pq$2^rjdtId+Q@if?YHifYervC*
z&CA{HrfxTOreAHH9#Q3fFElKPp_dPwP=#PaZhdZ~T4M>@l&1H;vZL>l{wb$5)*?k)
zQA@Y2Q`QiMA8y)tvi{ep;)kWc*=!l?leyk7@Qprg+W`-2h3CMMzc#Mf+gwS54ec7+
zQq{WTN>8Y*)Liz{9@1P}nbouX^0l44sT&VYE&I=K#C>{e?bUKwXfrrA(vo|WX75@z
zuRLX4$PtY`u)47o;fB|gFHe^^x;8!>@qX?ao;<wz_2j7MIhN}^!z&8E%pQ9Ga7o<;
zqWHlZY1W2ZXgyKPJNM|^-Fa);`2OPl`uk9+qvoBFmP3vjvTNCi_;M;Yv{SeJxNk&t
z>tl&;|DoE`i*40Eh)(Sc0gunDVnXA7H<taFlPx>b5%As<d`oPFEvV+>GURCcZn(ld
z#Tq_;>C+I))0qA`bo#vwyS*=FKk?{0?~`4j45(=o#8ugJCrhZ{g3Fno6;HoCXK(XO
zd+BDci(9W=k?8MS@7BeVCH7<UzrV2Lw}hUviRX7ekT3WJ+ojqjT0q7<S@?B*O?cOg
zgm1r-ZQg|RQmK(|e*W%Ukgbz~jE8verLY67BTV2kb@@Po(xxtN+@ED13|+ISv8p(8
zs6#uH*ZH<NFtF#3Gb6$Nm)iYMSN}rGN%vt7*rk4-RjO@Ps+@lkWsFL3AUeJ1Zz|)N
Apa1{>

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png b/OsmAnd/res/drawable-xhdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..82791f9ac72fcc3ca5a9b4307d9f28f1db737635
GIT binary patch
literal 1916
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
P?*E}$ktna4l~M2yA&~7l

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xhdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b363858797c6d517f997d64c1d8615715235125f
GIT binary patch
literal 2500
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_home2.png b/OsmAnd/res/drawable-xhdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d1bfdfc1e6c281295ac3b30bf195edf987858b8
GIT binary patch
literal 1421
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ-L~|%Q8bEN+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut(
zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC(
zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh*i`vVozAg1M!hp{bd<
zrMZrR5s<HMV4-hhple`hWom3?V59&AN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo<>h+i
z#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8<(HP&
zDgj*z@j`BauP@x-ykclT0fS7xBC$Z<P|rX=Hy7kDu<GKHpj3o2u&OQ&sVqp<4@xc0
zFD*(2#z&emOfxX-@LL2@2y~5=e^DkdQWA4q@{>z*Q}aqZU2K(rGI}YQDOP4iCdO&z
ziAlO9X~1AhOfdlxX{pA#rUq$=CYELfW=2WIFmtf!cQbQzc5^ZVLL);%Lst_ES62&1
zBU3|57ZX!QXGa5=UeCPZlEl2^RG8hFK)a!O9r5b5axO|uEXgkl$<NP$rGkKr{F40Q
zjQj!xXJ>G%D`<pg=B4D97i)r|3F2#))S}F?)D*X({9FZaI9p|6af7+BNs^_7iK%Xi
zfw8G>l8H%*u0?Wks;;qNYD%)XMRJ;@d72Vbe+s$brw??LJ}9vuB_5a%Fhzox@T>sj
zz%x^79xw+L0kg^iw+>kb2FA6XE{-7;x8BTl^g9$F&~|%zo9MdNQhONX94#8PBMKSC
zUg(Off54Qdu&z{5?v(FbwaZ5YGU9JnKCbSspJeagHLLDz^0REION%rnd23CMiC~mC
zFfp`je^7pu=F`r2dCgVq6EqL=X{?`OS-)?Yj;6h#-b?LMx8-lN+<#vg9df|(X|s{_
z#@ti4KSea;Ys63SJX?M$m;GPfg#*HETNx#z=SZw?OqZROb@$SDsfu&FtGtb^uHM<h
zR=40y1<O~-c<X!9w;x#QVN)E$|6QHy&6_TcwGx337M{L8$H8BKRd4sJ<)_!(+Wfkk
zY4w@2#>KU3c-N%4rJs3w;j2qIV_4~ZHpiK}*uwVj&J>tZdpqqWTZOKrT+8u?Q9?U}
z8hV#7aB!bL78cNRRPv6M5SMt<rrfB;V@?`ko)%jlB+G4My(YpH>S#ERqqXF&(cu-G
zKkQo%wJxZUkGFU{Ghm0%l-<b*^IL!-d%~M0eY_yH_vE(?T8<~ZABg+Kwtf=WxxK<A
zoPo`t;jmus^TWBvV;i-35*U~z4uHfM5zOk)uK&8gKy|#no`IQxrNM34+Ou1qfeJ`Z
LS3j3^P6<r_BDV7q

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_info2.png b/OsmAnd/res/drawable-xhdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0330ad4b964a30d787d514f8fa1a42a832cc1d9
GIT binary patch
literal 1873
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
UXB;dW?fA(l<q@)D!7JDQ14swyc>n+a

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb3cc5e4a44fec88a66338dafa96d310cf93eb0
GIT binary patch
literal 1968
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
Saq~-of2dxYrD=cFSo0rR^8>{I

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png b/OsmAnd/res/drawable-xxhdpi/bg_cardui.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..97fe3d89f1cef2cdb0d68870129cd21b2f2fdc4d
GIT binary patch
literal 1494
zcmeAS@N?(olHy`uVBq!ia0vp^vLMXC1|-8Kr}G0T$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2?D`EXjg5>g%$!VI3=LgPEDX(@
zoDEzYEeu>tT#U>eVR}9Dic1pnl2c)JXM*hp>ov!#*UGslHL)bWC?r2W2bKx~GV)9E
zi!<^I6r7#Gv96#Io|%`DUtX*UiYAD!T~doO%TiO^it=+6z~O9_iNy`cW{IXoW=Sc!
zNoh$Yx+az;=DL;^X34rH#-?V*KwxT|mZk*NpF(c<=>r|54@xXZi3cVGOpzcaJSzY>
z@XVB&2h2f5z^uX$YJQJ_f$^KCi(^Q|tuxck`Y}23G`!sKVAGL=q#jQ3y%itZ;wpIL
zJ%sgJjvMZ4SBrCCE|)vd(yC#doSo*m()hRW$NWicH<!NMKKJdmR<|2QIsB!)4`+XU
z!hE%ijZgN&4GBhLSAGFe2Fs9}d$k&}c3)4O=+5epAfWo~0mHNX3UZIQEwmUXnao_l
zq~UpN$wOv$)&nvkh7TXG70+Qd4_m-<N8tUs)=lk~TrC|erFhuXKmYt==6hLvZE4nx
zMcKRj|4){C8NGYm*ULi7H#47GoV{2@!?wsku3!K9>#tWrB369&`6YH|bKR{sEoBRA
zPD!N7KP|A3nYU=McyRJWyPFgDeiiP{n0w)f+<8OUnVb<R?%%HYD=j?r(QkX_mG|G*
zJ7q1|n*Gbp`00szHrAobFI)0A9xJRl_V<L>GMUUht;`PEEUTt?#TbMy*}v@{57)fD
zg@%Inn`f;x%wHondyz-)ip5o1qkNqfWSBp#Q;DhEbu|5AoQ~Lc#eglllUwKi{(9~1
z+%A`k*VcFlM>l(GPul*i&uww{s)S3*e^+gt?k>G^*O?r%-En%;`6H+8EfR=*{MY@@
z|6`X^m2Rd!X#e%HZEx^A4>z+yWto#b_d2Sygbjo*H<vNiURJ0$Hf@#hB<{3TJqwDY
zSPVs*9=F5<O5R`o>2>k@{j)!4TXKB-t9XDx{r-)|((hi_gGyRYS3j3^P6<r_BYGqG

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..237956975f9e67a6ecc91a32d52b9d74d8e310c0
GIT binary patch
literal 2501
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_help.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec5431de617717099d655758728eb324f3043910
GIT binary patch
literal 2758
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png b/OsmAnd/res/drawable-xxhdpi/ic_ac_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..588432071c6f239c5f33f2bbbbac9b9bb11920ca
GIT binary patch
literal 2605
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bus2.png
new file mode 100644
index 0000000000000000000000000000000000000000..78ee74d36d8d98a5643213c295fca6e1acec7742
GIT binary patch
literal 1997
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
MGBQ@NU$%PVUqz=B(*OVf

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fav2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8ef5ba418260f9063b1c9625d69d82b47c3e5f3
GIT binary patch
literal 2439
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..72179cc54bf97d0a88fda63993182031a11547fb
GIT binary patch
literal 3353
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
UQ-@1-uKuiey805XI!6fp11M*kdjJ3c

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_home2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38f14f71c57fdb5b7f9e9beb7d33245e8a141bf
GIT binary patch
literal 1784
zcmbVNc~BE~6wc^W5v8J{h#h2!Rsq@U=4K<2LN-XmAomf$A!IiaVY4w=OhSvbShT5#
zK`cTGYNJziTJb^@3R1j45fHRWRqWV7jIAd!iuLLS2<;z^e{^T|ckTDR_kQnvZ`KkW
zwb;#dmMeq7aFa!#vGlBPye{MDF=$`t7<%%eq{&nqsiurdJ<bTl$P65i5z3W#EUv`N
ztIy-X493_sn)qZYS-w=HA_<n#fnk{l9nEGif<sI?r78=jfDC-4Mk{7M`niz_XfQD|
zi7$ucItiYsiOALCak)|Ps@yCUf-yrD0l_8_ZGgZjC14`5wFZ$%%p9^SqSuaNhzSfq
zs4OvaIH+WKG$0}MIKXEKKo!j90YZeu<_m;~Fc9F-dk7AKI4}q!B0g6HbAXYDNqf^{
zYEdj2KH`hsiJ6%cr4vDr(P(5Dxhzt@5@I6=0>K=J!vSdoXfSIjr3us;<~S{&xIv}Y
z=qL@T1soQY8DtJ6X3~)kUxCoc<)enRhLJ?kDT7Q(9mHnA5J5QZHH0=$vG~7Xyc2DR
zH|uaH7B`SNdKFy{^&BUe&fWVRIe>IDqGfswT@+<DN~&@QTuaGNF_Zqn!Zesjz~OP#
zLS+WXQ`2cvVmx|K<6MvrtCc)N01G%7T&JCP@ud<8Ul=A82*NmQHe1RI<8k>xFw7H#
zbNNyUEOc^ZS_7rjs&J=o4efh`%YQFdB+=taiqyxGWVTZU(U~Mg8Zt>8Adw7J9q>!i
zXfe`g@OPAH_|_<{*Q~*@a6L%?LwOcy-VuY4%gaE5czh6pxqL8#$HTxNl?n&BY#dVw
zgH&onsAi7vvHzPthz<&Jh~+=xaURi%bSy_(f!>TZ6RxE@NKd!Q=ENcs-GMV@XlT6Y
z`u)lWk#RAMa~*xWw(Xa^{5jj)7qF8r!Ao2wd>QJpH9aOj@6hC!7$4i@eD^`$ztdv|
zd~Lh-`Q^{e|N55w^+DIGhHkD^zvfX-!;L)i+Q;zShhnHPt-bxXa&AJvH-#=csy!mA
z(TSE)`<{~W2KW6bi(PBmZ?r~Wvvyj#q+i^W%rJ#)3S>6&slnz%jHtv;@4PlxhQ9nn
z*gqSoYf?Qk`j`sQYrio1-H__@?D6J{>(EbCp8eCj47&R>xAcIW5B-4Oi$gu{PU^47
zM;EGGUle9P*J+`S%B}V`q^Lezw90Sydc4AF-;8Vt4pn^S*IN3d3|}%JO0+ItbbNjr
zC+Wo2rPcO%y{sc1>E4k)?e^bqTVCwhQZBl3tffv-GOuo;dE><^hugib)`I@Fm)3(V
zx5r%}{(5yva7HlzC+S{{`!K~^qYSFDJx#5BFsUi9x#srxBaqfMA4wf3e|%{D=@u*%
z^^x4_{{YUW4iiUXJc+&9j$&|LeRqv`V(zzId+c}MK#x>bMd|Lj*GtVG)vmH_B%W3R
z^@C}<^0;^X_3h~PqxU6|$x<Vev?9~;`ntEbAF|YtU7v>)l?|r9{3B;9)4fwt@yc`Q
ztL~1IZhS>`kH_nR!m>fmsYMToZT1OqxB4ClpX}Ya;D#l4(+<I%$;YVgdZS+e9aIAf
z0Z_4^B=~yw^UI-|PUZ)H)v^j|N$Ab1dz@C?b2C+1RqmcmZCK}#c2oD~X^UOm>#LWo
zeS4eP!@Cwx=WQ;y*s4kBySK0BNBivFIkDSX-^TV{IMIB-Ug1wJ^tMWx3ooa%@3)J8
zs5c`4#wxD^eXIw4DN~ACR-X-CA*b+)^A{4@uzN=akK0S4Rv-ln0=PAC&!RRMni4>C
zOjG+oAK!+=0r@#l_WI3)WuAN9ptVu7rXs7YnU>N_f2%!t$~h?fNmhZPYx;rjCBt&d
zw9J?ac81wLR@e%hP~Xm};9LcLG@?kXxT`Vj*Xg6MW=qJJNsKeKSU2H)cAev2B$Gy=
JRblD*{{VZhzL@|3

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_info2.png
new file mode 100644
index 0000000000000000000000000000000000000000..459af1e1526f3ba41175df59d532cb43a2e81a4c
GIT binary patch
literal 2345
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..acdda2ad518d63dd527c3ad8cfdc1caf67cf69a6
GIT binary patch
literal 2527
zcmbVOc~nz(77jsz3W(xT5Wx^c7RjCfiA0tJ6c7>?5p-O#ypVv&OS2GUQ$bV|utn6m
z5)~X5K<W;N)Jh49lnhiBVMIY7g$PP9mMC=|D$e}j=^yjXdGEK~@4NT+-Fwe@*{ra&
z7IT-*g~4DJLF*V1(70*(osEFLUYGpf&|o7Eh>=Hve7TY>1z>(WkOLrtMC>>q0$}rY
ze%k<e!(hgV!l)Q|Oz3(l7ZhRG(>9nSkpx1+VBS7S5;ivhkRv%joKQ?djaAj4kU|~}
zwUHc(3zg6TfpA^26o^a?i{d6Ha49^L&l;q65)~p40dh7nNwh;OqbAW%A9<<Je0m#;
zLVh%nC(uxzf{F=cA?ctLK$0;YXf6&<LV8j#c(R8l#nT;0fYw-?7nXoS<0w=zk%}WA
zKR+nQo0P|=Mlb?D`+`<9lt3<*P_bC0Qi)L#F`zUKi>FX1SR4UMAfO=&v}~tX&Q3y$
zWsWlp3_!+}3MFzOC`L{*vN@naPD4SFe!7B45*qr2SS<T26eJloi7mn6F*vM9G<~m+
z)-rhn@ZT`LYAuV}DFLt%fDBYfxllg%jx%6LyT5ldZ3sm}WlDumQrJ5fAXgy*#PT2p
z4F#QGctRf4gFqtkJ=q*Ii4V!f=8>QeA0VR1I6j+1@xXZyIK&yAui*n2BnHtR@8RK3
zz~k`&B!3c-?1jUTJOYX206NZd1{)-n$=PBqFymVY`TmS0|1FkEmjY}#D2)Qa9WzzH
z5`c10CIBT!I{jnTkuDpBVjifJxlX6))2$hRRG0|x0;Qk``B7)8@GCKR5=k727m1AK
z;fQ23heYC`y|`QeO~eB{uBR85Px0iVKI3`+uYOo4DC~5x{7>=BY(W({J^j)O(Bexo
z0b;0wq)@AjhK$aG!Aw2`G5n&Ep6Jdb9N4g7k-9^%1BYI0h;Xr55f+(4|KaFz!~Ezl
z9-o6<Mb6J?FkO^I=chFY+%C;YcHu4!=Lbi{Th`9H%&-kMCa!dDZgp)Q$J6R;z>$_%
zV_?nT(;Mwwhf_YhGPP+*FX=tqu{CatR*|}f`HNs&*Vp(aVyOHY?=WZMjh48=Ci_SB
zNVU9tSKOT&%Ih`kJLR6`yKW749=!OE@Bu@<PvwC$=c>FdO{21t{iX-@*JF#;syjD#
zF2BAl4*bKxt3$P_tF7~`o$0FFS7w!r9%S5PldhxlOd0%T|NK|(`gwZ)fO==E;jJq~
z&Btzsz$aoVZl3C-6L)+gqP0AAOFOV+B34(dyQMR;ds=p-$TFmu8NR2C4f2_9w9i*>
zFhtp!X<zGd^IH0j%t<q>H&~Mdr^#dG?~c?AW7AICyJ=H8L%dTq`aDh;<>+%XzRc}4
zKmQu;)!6V(znA6P|9pI9RmRVeSrgUmN==-j-Lpwrh38w{Vyi=URCuIy*z<(DwS7+7
zgf3;Ix4(OTs&N|PoykFFsMRS?)fjO2!2F5X+0AB}`h8^9y?A6+P9Z|u?GkifeZ|4*
zf=oknO>dT47&v-CKhm;%8;8l;=G&lr_+Wf2dwiE^&O6*DjsjueKYaG;wE~l3U3GQ}
zQ<a;>>RIV?^*DDh*k;wghppsi!dbmH)a8Z4PWR?f5_1Y}X}mV7Os`|fv$dOz^oj*Q
z_~6{&i}r$qg4)v*!J{fo*fKkQ?@xbG0_<waLEiF+(al-ViS~O$T(fuLRe##0{_xDd
za^*&wQdZnOo}XHNjMZU3uqL_!wxxJktySxpXRWS^c*_Q&X(?^#`}$`QA7U!*pTqcC
zM$F?JGSXfv7_nVM)%v)cu(?v2*_dhVd`+odWb761b$%qGWYrjaf;|w@${A-Dj~`Xm
zn`j*yS?+v-u%qiad_p{cEF-{5w+vZge8(WVgGPdvRAmLMw3_#vpeG-Evjwe)k3VIm
zSu$4rL&!P&Btk)&oY;C6F|jh!w;XO3f^L1()f8m+7%|nYgOl=oOA!xx{2Ctp${CDQ
zt-tZxxzgxticF(PzTj6U4{kSWU&Oi?*cj7%EO>FkCQX9*TKVxN+H164p(8RS=IPPS
z>Qq;tq`<BH=8@VTwS(A1p9{|<s2)_{6PdaO)BA_Zq}AD9q_=CFqT^I}>igYkk%$M;
zjmBjsuXmih>B!EVLuztKN4MQ2wGF4~!3FfdD~h9*st-lHZ+Rujnfa*|GR^!Yhyh2F
z>X?zsW#?Y*8~Y8Dm33*`pR+25O7cQmg!lg$FLZKR{h;>z8LJ~o)oW219;L}G`m;Jb
zWwQHfk<aS-EPb&1i&X-1bzwGaqHVe?9bRO-H8I~=SnGQ~v+j7GiBV>HzIpV#n3v++
z3MY|~e_i~ZZ_sYH;kh^a?!o+gP-&J3(%zhnA->;juE#AD&RJS<ct0FIg|it<D0v%Y
z*gKU7`|e+A#W4%sk0G7LMLtYsq_#V=J(p)>SgT)XpBdPjsD>>~K9(PK1$=@@yAb2c
zJwG}1qC>ss-o)>M^{OCyk7oNl;@j!4N_gma<q$m)WVT;B8=F~|p-Q&&?Kslhw*vH~
zcN*9g^!lb^%SEdN`TJQ_nTg%SBDckwcMXz<k0S;9Zf+r{&OI*BRTmyz5_BpmUX`+M
zDE38ZcM;lcgQlLiJu&?_+jdK9-S-g)3$}+Q^`T)X#5QVJbuREi_!H_luPhs@s_Ig@
z)-2E+r&cwoKKQsJtaEE4w+@f<35S^~hxZQn+@3e^%ZD0O%rdp><gDltmLA`mF}{E_
zdil<cU2f;y8`r-cxUX9+m~Cs$>232*v=}KMyj+8T^w-Mtr{Q^pj=&}JN(uYOPft^i
z#;&V8weZ+7!R#OdlSy<rF_1FfVRv1%(#olANnVGtKsVA8izs!}sZwZD%If7yHsv|5
zog9eqqi-I#b#1fviTvt|nXGMdL&h4Wtg9ZCSX}O};Cz6k#Af}z+z0`)+wBO>+aP>1
P{mT^;5XLC;-=6UweFQOd

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable/dashboard_button.xml b/OsmAnd/res/drawable/dashboard_button.xml
new file mode 100644
index 0000000000..8095342d73
--- /dev/null
+++ b/OsmAnd/res/drawable/dashboard_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@color/dashboard_divider" android:state_selected="true"></item>
+	<item android:drawable="@color/dashboard_divider" android:state_pressed="true"></item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/dashboard_search.xml b/OsmAnd/res/layout-land/dashboard_search.xml
new file mode 100644
index 0000000000..34d0ce8b71
--- /dev/null
+++ b/OsmAnd/res/layout-land/dashboard_search.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/bg_cardui"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/search_for"
+        style="@style/DashboardSubHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:text="@string/search_for" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dashboard_divider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/poi"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_info2"
+            android:text="@string/poi" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/address"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_home2"
+            android:text="@string/address" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/coord"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_marker2"
+            android:text="@string/coordinates" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/fav_btn"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_fav2"
+            android:text="@string/my_favorites" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/history"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_history2"
+            android:text="@string/history" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/transport"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_bus2"
+            android:text="@string/rendering_category_transport" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_fav_list.xml b/OsmAnd/res/layout/dash_fav_list.xml
new file mode 100644
index 0000000000..19134a41ca
--- /dev/null
+++ b/OsmAnd/res/layout/dash_fav_list.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:background="@drawable/dashboard_button"
+			  android:layout_height="50dp">
+    <View android:layout_width="match_parent"
+          android:background="@color/dashboard_divider"
+          android:layout_height="1dp"/>
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+        <ImageView android:id="@+id/icon"
+                   android:layout_gravity="center_vertical"
+                   android:layout_marginLeft="12dp"
+                   android:layout_marginRight="12dp"
+                   android:layout_width="28dp"
+                   android:layout_height="28dp"/>
+
+        <LinearLayout android:orientation="vertical"
+                      android:layout_gravity="center_vertical"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content">
+            <TextView android:id="@+id/name"
+                      android:textSize="16sp"
+                      android:textColor="@color/dashboard_black"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+            <TextView android:id="@+id/distance"
+                      android:textSize="12sp"
+                      android:textColor="@color/dashboard_blue"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+        </LinearLayout>
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
new file mode 100644
index 0000000000..2c3f62b84d
--- /dev/null
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/dashboard_background" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="6dp" >
+		<include android:id="@layout/dashboard_search"/>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_cardui"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="40dp"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/map_text"
+                    style="@style/DashboardSubHeader"
+                    android:text="@string/map_Button" />
+
+                <Button
+                    android:id="@+id/show_map"
+                    style="@style/DashboardGeneralButton"
+                    android:text="@string/show_map" />
+            </LinearLayout>
+
+            <net.osmand.plus.views.OsmAndMapSurfaceView
+                android:id="@+id/MapView"
+                android:layout_width="fill_parent"
+                android:layout_height="110dp"
+                android:layout_marginBottom="2dp"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:contentDescription="@string/map_view"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/main_fav"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_cardui"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="40dp"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/fav_text"
+                    style="@style/DashboardSubHeader"
+                    android:text="@string/my_data_Button" />
+
+                <Button
+                    android:id="@+id/show_all"
+                    style="@style/DashboardGeneralButton"
+                    android:text="@string/show_all" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/favorites"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+        </LinearLayout>
+        
+            <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="6dp" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_weight="0.5">
+
+            <TextView
+                android:id="@+id/About"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left|bottom"
+                android:text="@string/about_settings"
+                android:textSize="20sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/Copyright"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:gravity="right"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/OpenStreetMaps"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:gravity="right"
+                android:autoLink="web"
+                android:text="@string/openstreetmap_copyright"
+                android:textSize="14sp" />
+        </LinearLayout>
+    </LinearLayout>
+    </LinearLayout>
+
+
+
+</ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard_search.xml b/OsmAnd/res/layout/dashboard_search.xml
new file mode 100644
index 0000000000..cee3135087
--- /dev/null
+++ b/OsmAnd/res/layout/dashboard_search.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+    
+        <LinearLayout
+            android:id="@+id/search"
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_cardui"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/search_for"
+                style="@style/DashboardSubHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:text="@string/search_for" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dashboard_divider" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="90dp"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/poi"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_info2"
+                    android:text="@string/poi" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/dashboard_divider" />
+
+                <Button
+                    android:id="@+id/address"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_home2"
+                    android:text="@string/address" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/dashboard_divider" />
+
+                <Button
+                    android:id="@+id/coord"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_marker2"
+                    android:text="@string/coordinates" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dashboard_divider" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="90dp"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/fav_btn"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_fav2"
+                    android:text="@string/my_favorites" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/dashboard_divider" />
+
+                <Button
+                    android:id="@+id/history"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_history2"
+                    android:text="@string/history" />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/dashboard_divider" />
+
+                <Button
+                    android:id="@+id/transport"
+                    style="@style/DashboardSearchButton"
+                    android:drawableTop="@drawable/ic_action_bus2"
+                    android:text="@string/rendering_category_transport" />
+            </LinearLayout>
+        </LinearLayout>
+
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index eb736b610d..23493e1d2a 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="actionbar_color">#ff8f00</color>
+	<color name="dashboard_background">#eaeaea</color>
+	<color name="dashboard_divider">#f0f0f0</color>
+	<color name="dashboard_black">#212121</color>
+	<color name="dashboard_blue">#536DFE</color>
     <color name="gpx_color_point">#cd2c33</color>
     <color name="gpx_speed">#c79c00</color>
     <color name="gpx_altitude_desc">#32CD32</color>
diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 073257a582..50c88aedfd 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -14,6 +14,7 @@
     <string name="ga_debug">true</string>
     <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
     <string name="next_tips_and_tricks_not_translate"></string>
+    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">@OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMaps ODbL
     
 	\n\nAll rights belong to OsmAnd app.
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 47fee71aaf..8bb744f223 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,9 +9,14 @@
          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="home_button">Home</string>
     <string name="osmo_use_https_descr">Use secure connection with server</string>
     <string name="osmo_use_https">Use https</string>
 	<string name="advanced_settings">Advanced</string>
+	<string name="search_for">Search for</string>
+	<string name="show_map">SHOW MAP</string>
+	<string name="show_all">SHOW ALL</string>
+	<string name="coordinates">Coordinates</string>
 	<string name="rendering_attr_publicTransportMode_name">Bus, trolleybus, shuttle routes</string>
 	<string name="rendering_attr_tramTrainRoutes_name">Tram and train routes</string>
 	<string name="rendering_attr_subwayMode_name">Subway routes</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index e2b218fdb4..10c9b4d7a1 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -7,9 +7,41 @@
     	<item name="android:windowContentOverlay">@null</item>
     	<item name="android:backgroundDimEnabled">false</item>
 	</style>
-		
-	
-	<style name="ListText">
+
+	<style name="DashboardSubHeader">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:layout_height">fill_parent</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">@color/dashboard_black</item>
+        <item name="android:layout_marginLeft">15dp</item>ll
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="DashboardGeneralButton">
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/dashboard_blue</item>
+        <item name="android:background">@drawable/dashboard_button</item>
+    </style>
+
+    <style name="DashboardSearchButton">
+        <item name="android:paddingTop">17dp</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/dashboard_black</item>
+        <item name="android:background">@drawable/dashboard_button</item>
+		<item name="android:gravity">bottom|center_horizontal</item>
+		<item name="android:paddingBottom">11dp</item>
+    </style>
+
+    <style name="ListText">
         <item name="android:textSize">20sp</item>
     </style>
     <style name="ListText.Small">
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
index fcfef74bf8..32ee61c735 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
@@ -9,6 +9,7 @@ import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.Location;
 import net.osmand.data.LocationPoint;
+import net.osmand.plus.activities.DashboardActivity;
 import net.osmand.plus.activities.FavouritesActivity;
 import net.osmand.plus.activities.MainMenuActivity;
 import net.osmand.plus.activities.MapActivity;
@@ -47,9 +48,6 @@ public class OsmAndAppCustomization {
 		return true;
 	}
 
-	public void customizeMainMenu(Window window, Activity activity) {
-	}
-	
 	
 	// Activities
 	public Class<? extends Activity> getSettingsActivity(){
@@ -68,8 +66,8 @@ public class OsmAndAppCustomization {
 		return FavouritesActivity.class;
 	}
 
-	public Class<MainMenuActivity> getMainMenuActivity() {
-		return MainMenuActivity.class;
+	public Class<DashboardActivity> getMainMenuActivity() {
+		return DashboardActivity.class;
 	}
 	
 	public Class<? extends Activity> getDownloadIndexActivity() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
new file mode 100644
index 0000000000..2494ea3eb8
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -0,0 +1,626 @@
+package net.osmand.plus.activities;
+
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+import net.osmand.access.AccessibleAlertBuilder;
+import net.osmand.data.FavouritePoint;
+import net.osmand.data.LatLon;
+import net.osmand.map.MapTileDownloader.DownloadRequest;
+import net.osmand.map.MapTileDownloader.IMapDownloaderCallback;
+import net.osmand.plus.FavouritesDbHelper;
+import net.osmand.plus.OsmAndAppCustomization;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+import net.osmand.plus.activities.search.SearchActivity;
+import net.osmand.plus.base.FavoriteImageDrawable;
+import net.osmand.plus.download.DownloadActivity;
+import net.osmand.plus.render.MapRenderRepositories;
+import net.osmand.plus.render.MapVectorLayer;
+import net.osmand.plus.resources.ResourceManager;
+import net.osmand.plus.sherpafy.TourViewActivity;
+import net.osmand.plus.views.MapTextLayer;
+import net.osmand.plus.views.OsmAndMapSurfaceView;
+import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.util.MapUtils;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.format.DateFormat;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.util.TypedValue;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+import com.ibm.icu.util.Calendar;
+
+/**
+ * Created by Denis on 05.11.2014.
+ */
+public class DashboardActivity extends SherlockFragmentActivity implements IMapDownloaderCallback {
+	public static final boolean TIPS_AND_TRICKS = false;
+	public static final int APP_EXIT_CODE = 4;
+	public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
+	
+	private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
+	private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
+	private static final String TIPS_SHOW = "TIPS_SHOW"; //$NON-NLS-1$
+	private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
+	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
+	
+	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
+	private ProgressDialog startProgressDialog;
+	private OsmandMapTileView osmandMapTileView;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		getMyApplication().applyTheme(this);
+		super.onCreate(savedInstanceState);
+		if(getIntent() != null){
+			Intent intent = getIntent();
+			if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
+				getMyApplication().closeApplication(this);
+				return;
+			}
+		}
+		if(Version.isSherpafy(getMyApplication())) {
+			final Intent mapIntent = new Intent(this, TourViewActivity.class);
+			startActivity(mapIntent);
+			finish();
+			return;
+		}
+		setContentView(R.layout.dashboard);
+		setupContributionVersion();
+		getSupportActionBar().setTitle(Version.getFullVersion(getMyApplication()));
+		ColorDrawable color = new ColorDrawable(getResources().getColor(R.color.actionbar_color));
+		getSupportActionBar().setBackgroundDrawable(color);
+		getSupportActionBar().setIcon(android.R.color.transparent);
+		setupMapView();
+		setupButtons();
+		setupFonts();
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if(resultCode == APP_EXIT_CODE){
+			getMyApplication().closeApplication(this);
+		}
+	}
+	
+	protected void setupContributionVersion() {
+		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
+		final Calendar inst = Calendar.getInstance();
+		inst.setTime(new Date());
+		final String textVersion = "@OsmAnd " + inst.get(Calendar.YEAR);
+		textVersionView.setText(textVersion);
+		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
+		textVersionView.setOnClickListener(new OnClickListener(){
+
+			int i = 0;
+			@Override
+			public void onClick(View v) {
+				if(i++ > 8 && Version.isDeveloperVersion(getMyApplication())) {
+					prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
+					enableLink(DashboardActivity.this, textVersion, textVersionView);
+				}
+			}
+		});
+		// only one commit should be with contribution version flag
+//		 prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
+		if (prefs.contains(CONTRIBUTION_VERSION_FLAG) && Version.isDeveloperVersion(getMyApplication())) {
+			enableLink(this, textVersion, textVersionView);
+		}
+		final TextView about = (TextView) findViewById(R.id.About);
+		final String aboutString = getString(R.string.about_settings);
+		SpannableString ss = new SpannableString(aboutString);
+		ClickableSpan clickableSpan = new ClickableSpan() {
+		    @Override
+		    public void onClick(View textView) {
+		    	showAboutDialog(DashboardActivity.this, getMyApplication());
+		    }
+		};
+		ss.setSpan(clickableSpan, 0, aboutString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+		about.setText(ss);
+		about.setMovementMethod(LinkMovementMethod.getInstance());
+	}
+	
+	public static void showAboutDialog(final Activity activity, final OsmandApplication app) {
+		Builder bld = new AlertDialog.Builder(activity);
+		bld.setTitle(R.string.about_settings);
+        ScrollView sv = new ScrollView(activity);
+        TextView tv = new TextView(activity);
+        sv.addView(tv);
+		String version = Version.getFullVersion(app);
+		String vt = activity.getString(R.string.about_version) +"\t";
+		int st = vt.length();
+		String edition = "";
+        SharedPreferences prefs = app.getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
+        if (prefs.contains(CONTRIBUTION_VERSION_FLAG) && Version.isDeveloperVersion(app)) {
+            try {
+                PackageManager pm = activity.getPackageManager();
+                ApplicationInfo appInfo = pm.getApplicationInfo(OsmandApplication.class.getPackage().getName(), 0);
+                Date date = new Date(new File(appInfo.sourceDir).lastModified());
+                edition = activity.getString(R.string.local_index_installed) + " :\t" + DateFormat.getDateFormat(app).format(date);
+            } catch (Exception e) {
+            }
+            SpannableString content = new SpannableString(vt + version +"\n" +
+    				edition +"\n\n"+
+    				activity.getString(R.string.about_content));
+    		content.setSpan(new ClickableSpan() {
+    			@Override
+    			public void onClick(View widget) {
+    				final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
+    				activity.startActivityForResult(mapIntent, 0);
+    			}
+    			
+    		}, st, st + version.length(), 0);
+    		tv.setText(content);
+        } else {
+        	tv.setText(vt + version +"\n\n" +
+    				activity.getString(R.string.about_content));
+        }
+        
+		tv.setPadding(5, 0, 5, 5);
+		tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 19);
+		tv.setMovementMethod(LinkMovementMethod.getInstance());
+		bld.setView(sv);
+		bld.setPositiveButton(R.string.default_buttons_ok, null);
+		bld.show();
+		
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		setupFavorites();
+	}
+	
+	
+	
+	protected void initApp(final OsmAndAppCustomization appCustomization, final Activity activity, OsmandApplication app) {
+		// restore follow route mode
+		if(app.getSettings().FOLLOW_THE_ROUTE.get() && !app.getRoutingHelper().isRouteCalculated()){
+			final Intent mapIndent = new Intent(this, appCustomization.getMapActivity());
+			startActivityForResult(mapIndent, 0);
+			return;
+		}
+		startProgressDialog = new ProgressDialog(this);
+		getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog);
+		boolean dialogShown = false;
+		boolean firstTime = false;
+		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
+		boolean appVersionChanged = false;
+		if (!pref.contains(FIRST_TIME_APP_RUN)) {
+			firstTime = true;
+			pref.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
+			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
+		} else if (!Version.getFullVersion(app).equals(pref.getString(VERSION_INSTALLED, ""))) {
+			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
+			appVersionChanged = true;
+		}
+		if (appCustomization.showFirstTimeRunAndTips(firstTime, appVersionChanged)) {
+			if (firstTime) {
+				applicationInstalledFirstTime();
+				dialogShown = true;
+			} else {
+				int i = pref.getInt(TIPS_SHOW, 0);
+				if (i < 7) {
+					pref.edit().putInt(TIPS_SHOW, ++i).commit();
+				}
+				if (i == 1 || i == 5 || appVersionChanged) {
+					if(TIPS_AND_TRICKS) {
+					TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this);
+					Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false);
+					dlg.show();
+					dialogShown = true;
+					} else {
+						if(appVersionChanged) {
+							final Intent helpIntent = new Intent(activity, HelpActivity.class);
+							helpIntent.putExtra(HelpActivity.TITLE, Version.getAppVersion(getMyApplication()));
+							helpIntent.putExtra(HelpActivity.URL, "changes-1.9.html");
+							activity.startActivity(helpIntent);
+							dialogShown = true;
+						}
+					}
+				}
+			}
+		}
+		if(!dialogShown && appCustomization.checkBasemapDownloadedOnStart()) {
+			if (startProgressDialog.isShowing()) {
+				startProgressDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+					@Override
+					public void onDismiss(DialogInterface dialog) {
+						checkVectorIndexesDownloaded();
+					}
+				});
+			} else {
+				checkVectorIndexesDownloaded();
+			}
+		}
+		if(appCustomization.checkExceptionsOnStart() && !dialogShown){
+			checkPreviousRunsForExceptions(firstTime);
+		}
+	}
+	
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		if(id == OsmandApplication.PROGRESS_DIALOG){
+			return startProgressDialog;
+		}
+		return super.onCreateDialog(id);
+	}
+	
+	private void applicationInstalledFirstTime() {
+		boolean netOsmandWasInstalled = false;
+		try {
+			ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo("net.osmand", PackageManager.GET_META_DATA);
+			netOsmandWasInstalled = applicationInfo != null && !Version.isFreeVersion(getMyApplication());
+		} catch (NameNotFoundException e) {
+			netOsmandWasInstalled = false;
+		}
+		
+		if(netOsmandWasInstalled){
+//			Builder builder = new AccessibleAlertBuilder(this);
+//			builder.setMessage(R.string.osmand_net_previously_installed);
+//			builder.setPositiveButton(R.string.default_buttons_ok, null);
+//			builder.show();
+		} else {
+			Builder builder = new AccessibleAlertBuilder(this);
+			builder.setMessage(R.string.first_time_msg);
+			builder.setPositiveButton(R.string.first_time_download, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					startActivity(new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getDownloadIndexActivity()));
+				}
+
+			});
+			builder.setNegativeButton(R.string.first_time_continue, null);
+			builder.show();
+		}
+	}
+	
+	public void checkPreviousRunsForExceptions(boolean firstTime) {
+		long size = getPreferences(MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0);
+		final OsmandApplication app = ((OsmandApplication) getApplication());
+		final File file = app.getAppPath(OsmandApplication.EXCEPTION_PATH);
+		if (file.exists() && file.length() > 0) {
+			if (size != file.length() && !firstTime) {
+				String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
+				Builder builder = new AccessibleAlertBuilder(DashboardActivity.this);
+				builder.setMessage(msg).setNeutralButton(getString(R.string.close), null);
+				builder.setPositiveButton(R.string.send_report, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Intent intent = new Intent(Intent.ACTION_SEND);
+						intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "osmand.app+crash@gmail.com" }); //$NON-NLS-1$
+						intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
+						intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$
+						intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$
+						StringBuilder text = new StringBuilder();
+						text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$
+						text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$
+						text.append("\nModel : ").append(Build.MODEL); //$NON-NLS-1$
+						text.append("\nProduct : ").append(Build.PRODUCT); //$NON-NLS-1$
+						text.append("\nBuild : ").append(Build.DISPLAY); //$NON-NLS-1$
+						text.append("\nVersion : ").append(Build.VERSION.RELEASE); //$NON-NLS-1$
+						text.append("\nApp Version : ").append(Version.getAppName(app)); //$NON-NLS-1$
+						try {
+							PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
+							if (info != null) {
+								text.append("\nApk Version : ").append(info.versionName).append(" ").append(info.versionCode); //$NON-NLS-1$ //$NON-NLS-2$
+							}
+						} catch (NameNotFoundException e) {
+						}
+						intent.putExtra(Intent.EXTRA_TEXT, text.toString());
+						startActivity(Intent.createChooser(intent, getString(R.string.send_report)));
+					}
+
+				});
+				builder.show();
+			}
+			getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit();
+		} else {
+			if (size > 0) {
+				getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, 0).commit();
+			}
+		}
+	}
+
+	private void setupFonts() {
+		Typeface typeface = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Medium.ttf");
+		((TextView) findViewById(R.id.search_for)).setTypeface(typeface);
+		((TextView) findViewById(R.id.map_text)).setTypeface(typeface);
+		((TextView) findViewById(R.id.fav_text)).setTypeface(typeface);
+		((Button) findViewById(R.id.show_map)).setTypeface(typeface);
+		((Button) findViewById(R.id.show_all)).setTypeface(typeface);
+	}
+
+	private void setupFavorites(){
+		final FavouritesDbHelper helper = getMyApplication().getFavorites();
+		final List<FavouritePoint> points = helper.getFavouritePoints();
+		LinearLayout favorites = (LinearLayout) findViewById(R.id.favorites);
+		favorites.removeAllViews();
+		if (points.size() == 0){
+			(findViewById(R.id.main_fav)).setVisibility(View.GONE);
+			return;
+		}
+
+		if (points.size() > 3){
+			while (points.size() != 3){
+				points.remove(3);
+			}
+		}
+
+
+		for (final FavouritePoint point : points) {
+			LayoutInflater inflater = getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_fav_list, null, false);
+			TextView name = (TextView) view.findViewById(R.id.name);
+			TextView label = (TextView) view.findViewById(R.id.distance);
+			ImageView icon = (ImageView) view.findViewById(R.id.icon);
+			name.setText(point.getName());
+			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(DashboardActivity.this, point.getColor()));
+			LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation();
+			int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(),
+					lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
+			String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + "  ";
+			label.setText(distance, TextView.BufferType.SPANNABLE);
+			label.setTypeface(Typeface.DEFAULT, point.isVisible() ? Typeface.NORMAL : Typeface.ITALIC);
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					final Intent mapIntent = new Intent(DashboardActivity.this, getMyApplication().getAppCustomization().getMapActivity());
+					getMyApplication().getSettings().setLastKnownMapLocation(point.getLatitude(), point.getLongitude());
+					startActivity(mapIntent);
+				}
+			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			view.setLayoutParams(lp);
+			favorites.addView(view);
+		}
+	}
+
+	private void setupButtons(){
+		final Activity activity = this;
+		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+
+		(findViewById(R.id.show_map)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
+				activity.startActivityForResult(mapIndent, 0);
+			}
+		});
+
+		(findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
+				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				activity.startActivity(favorites);
+			}
+		});
+
+		(findViewById(R.id.poi)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.address)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.ADDRESS_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.coord)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.LOCATION_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.fav_btn)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.FAVORITES_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.history)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+
+		(findViewById(R.id.transport)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
+				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+				getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.TRANSPORT_TAB_INDEX);
+				activity.startActivity(search);
+			}
+		});
+	}
+
+	private void setupMapView() {
+		OsmAndMapSurfaceView surf = (OsmAndMapSurfaceView) findViewById(R.id.MapView);
+		osmandMapTileView = surf.getMapView();
+		osmandMapTileView.getView().setVisibility(View.VISIBLE);
+		osmandMapTileView.removeAllLayers();
+		MapVectorLayer mapVectorLayer = new MapVectorLayer(null);
+		MapTextLayer mapTextLayer = new MapTextLayer();
+		mapTextLayer.setAlwaysVisible(true);
+		// 5.95 all labels
+		osmandMapTileView.addLayer(mapTextLayer, 5.95f);
+		osmandMapTileView.addLayer(mapVectorLayer, 0.5f);
+		osmandMapTileView.setMainLayer(mapVectorLayer);
+		mapVectorLayer.setVisible(true);
+		LatLon lm = getMyApplication().getSettings().getLastKnownMapLocation();
+		int zm = getMyApplication().getSettings().getLastKnownMapZoom();
+		osmandMapTileView.setLatLon(lm.getLatitude(), lm.getLongitude());
+		osmandMapTileView.setIntZoom(zm);
+		osmandMapTileView.refreshMap(true);
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, 0, 0, R.string.tips_and_tricks).setIcon(R.drawable.ic_ac_help)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+		return true;
+	}
+
+
+
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		if (item.getItemId() == 0) {
+			if(TIPS_AND_TRICKS) {
+				TipsAndTricksActivity activity = new TipsAndTricksActivity(this);
+				Dialog dlg = activity.getDialogToShowTips(false, true);
+				dlg.show();
+			} else {
+				final Intent helpIntent = new Intent(this, HelpActivity.class);
+				startActivity(helpIntent);
+			}
+		} else if (item.getItemId() == 1){
+			final Intent settings = new Intent(this, appCustomization.getSettingsActivity());
+			startActivity(settings);
+		} else if (item.getItemId() == 2){
+			getMyApplication().closeApplication(this);
+		}
+		return true;
+	}
+
+	private OsmandApplication getMyApplication() {
+		return (OsmandApplication) getApplication();
+	}
+
+	protected void checkVectorIndexesDownloaded() {
+		MapRenderRepositories maps = getMyApplication().getResourceManager().getRenderer();
+		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
+		boolean check = pref.getBoolean(VECTOR_INDEXES_CHECK, true);
+		// do not show each time 
+		if (check && new Random().nextInt() % 5 == 1) {
+			Builder builder = new AccessibleAlertBuilder(this);
+			if(maps.isEmpty()){
+				builder.setMessage(R.string.vector_data_missing);
+			} else if(!maps.basemapExists()){
+				builder.setMessage(R.string.basemap_missing);
+			} else {
+				return;
+			}
+			builder.setPositiveButton(R.string.download_files, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					startActivity(new Intent(DashboardActivity.this, DownloadActivity.class));
+				}
+
+			});
+			builder.setNeutralButton(R.string.vector_map_not_needed, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					getPreferences(MODE_WORLD_WRITEABLE).edit().putBoolean(VECTOR_INDEXES_CHECK, false).commit();
+				}
+			});
+			builder.setNegativeButton(R.string.first_time_continue, null);
+			builder.show();
+		}
+		
+	}
+	
+	private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
+		SpannableString content = new SpannableString(textVersion);
+		content.setSpan(new ClickableSpan() {
+
+			@Override
+			public void onClick(View widget) {
+				final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
+				activity.startActivityForResult(mapIntent, 0);
+			}
+		}, 0, content.length(), 0);
+		textVersionView.setText(content);
+		textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
+	}
+
+	@Override
+	public void tileDownloaded(DownloadRequest request) {
+		if(request != null && !request.error && request.fileToSave != null){
+			ResourceManager mgr = getMyApplication().getResourceManager();
+			mgr.tileDownloaded(request);
+		}
+		if(request == null || !request.error){
+			if(osmandMapTileView != null) {
+				osmandMapTileView.tileDownloaded(request);
+			}
+		}		
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index c828750617..f71323e1ef 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -1,408 +1,30 @@
 package net.osmand.plus.activities;
 
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.Random;
-
-import net.osmand.access.AccessibleAlertBuilder;
-import net.osmand.data.LatLon;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.Version;
 import net.osmand.plus.activities.search.SearchActivity;
-import net.osmand.plus.download.DownloadActivity;
-import net.osmand.plus.download.DownloadIndexFragment;
-import net.osmand.plus.render.MapRenderRepositories;
-import net.osmand.plus.sherpafy.TourViewActivity;
 import android.app.Activity;
-import android.app.AlertDialog.Builder;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
 import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.Window;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Animation;
-import android.view.animation.Transformation;
-import android.view.animation.TranslateAnimation;
-import android.widget.TextView;
 
 public class MainMenuActivity extends Activity {
 
-	private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
-	private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
-	private static final String TIPS_SHOW = "TIPS_SHOW"; //$NON-NLS-1$
-	private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
-	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
-	
-	private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
-	
-	public static final int APP_EXIT_CODE = 4;
-	public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
-	public static final boolean TIPS_AND_TRICKS = false;
-	
-	private ProgressDialog startProgressDialog;
-	
-	public void checkPreviousRunsForExceptions(boolean firstTime) {
-		long size = getPreferences(MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0);
-		final OsmandApplication app = ((OsmandApplication) getApplication());
-		final File file = app.getAppPath(OsmandApplication.EXCEPTION_PATH);
-		if (file.exists() && file.length() > 0) {
-			if (size != file.length() && !firstTime) {
-				String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
-				Builder builder = new AccessibleAlertBuilder(MainMenuActivity.this);
-				builder.setMessage(msg).setNeutralButton(getString(R.string.close), null);
-				builder.setPositiveButton(R.string.send_report, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						Intent intent = new Intent(Intent.ACTION_SEND);
-						intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "osmand.app+crash@gmail.com" }); //$NON-NLS-1$
-						intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
-						intent.setType("vnd.android.cursor.dir/email"); //$NON-NLS-1$
-						intent.putExtra(Intent.EXTRA_SUBJECT, "OsmAnd bug"); //$NON-NLS-1$
-						StringBuilder text = new StringBuilder();
-						text.append("\nDevice : ").append(Build.DEVICE); //$NON-NLS-1$
-						text.append("\nBrand : ").append(Build.BRAND); //$NON-NLS-1$
-						text.append("\nModel : ").append(Build.MODEL); //$NON-NLS-1$
-						text.append("\nProduct : ").append(Build.PRODUCT); //$NON-NLS-1$
-						text.append("\nBuild : ").append(Build.DISPLAY); //$NON-NLS-1$
-						text.append("\nVersion : ").append(Build.VERSION.RELEASE); //$NON-NLS-1$
-						text.append("\nApp Version : ").append(Version.getAppName(app)); //$NON-NLS-1$
-						try {
-							PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
-							if (info != null) {
-								text.append("\nApk Version : ").append(info.versionName).append(" ").append(info.versionCode); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						} catch (NameNotFoundException e) {
-						}
-						intent.putExtra(Intent.EXTRA_TEXT, text.toString());
-						startActivity(Intent.createChooser(intent, getString(R.string.send_report)));
-					}
-
-				});
-				builder.show();
-			}
-			getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, file.length()).commit();
-		} else {
-			if (size > 0) {
-				getPreferences(MODE_WORLD_WRITEABLE).edit().putLong(EXCEPTION_FILE_SIZE, 0).commit();
-			}
-		}
-	}
-	
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if(resultCode == APP_EXIT_CODE){
-			getMyApplication().closeApplication(this);
-		}
-	}
-	
-	public static Animation getAnimation(int left, int top){
-		Animation anim = new TranslateAnimation(TranslateAnimation.RELATIVE_TO_SELF, left, 
-				TranslateAnimation.RELATIVE_TO_SELF, 0, TranslateAnimation.RELATIVE_TO_SELF, top, TranslateAnimation.RELATIVE_TO_SELF, 0);
-		anim.setDuration(700);
-		anim.setInterpolator(new AccelerateInterpolator());
-		return anim;
-	}
-	
-	public static void onCreateMainMenu(Window window, final Activity activity){
-		View head = (View) window.findViewById(R.id.Headliner);
-		head.startAnimation(getAnimation(0, -1));
-		
-		View leftview = (View) window.findViewById(R.id.MapButton);
-		leftview.startAnimation(getAnimation(-1, 0));
-		leftview = (View) window.findViewById(R.id.FavoritesButton);
-		leftview.startAnimation(getAnimation(-1, 0));
-		
-		View rightview = (View) window.findViewById(R.id.SettingsButton);
-		rightview.startAnimation(getAnimation(1, 0));
-		rightview = (View) window.findViewById(R.id.SearchButton);
-		rightview.startAnimation(getAnimation(1, 0));
-		
-		final String textVersion = Version.getAppVersion(((OsmandApplication) activity.getApplication()));
-		final TextView textVersionView = (TextView) window.findViewById(R.id.TextVersion);
-		textVersionView.setText(textVersion);
-		final SharedPreferences prefs = activity.getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
-		textVersionView.setOnClickListener(new OnClickListener(){
-
-			int i = 0;
-			@Override
-			public void onClick(View v) {
-				if(i++ > 8) {
-					prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
-					enableLink(activity, textVersion, textVersionView);
-				}
-			}
-		});
-		// only one commit should be with contribution version flag
-//		 prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
-		if (prefs.contains(CONTRIBUTION_VERSION_FLAG)) {
-			enableLink(activity, textVersion, textVersionView);
-		}
-		View helpButton = window.findViewById(R.id.HelpButton);
-		helpButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if(TIPS_AND_TRICKS) {
-					TipsAndTricksActivity tactivity = new TipsAndTricksActivity(activity);
-					Dialog dlg = tactivity.getDialogToShowTips(false, true);
-					dlg.show();					
-				} else {
-					final Intent helpIntent = new Intent(activity, HelpActivity.class);
-					activity.startActivity(helpIntent);
-				}
-
-				
-			}
-		});
-	}
-
-	private static void enableLink(final Activity activity, String textVersion, TextView textVersionView) {
-		SpannableString content = new SpannableString(textVersion);
-		content.setSpan(new ClickableSpan() {
-
-			@Override
-			public void onClick(View widget) {
-				final Intent mapIntent = new Intent(activity, ContributionVersionActivity.class);
-				activity.startActivityForResult(mapIntent, 0);
-			}
-		}, 0, content.length(), 0);
-		textVersionView.setText(content);
-		textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
-	}
-
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		getMyApplication().applyTheme(this);
-		super.onCreate(savedInstanceState);
-		if(getIntent() != null){
-			Intent intent = getIntent();
-			if(intent.getExtras() != null && intent.getExtras().containsKey(APP_EXIT_KEY)){
-				getMyApplication().closeApplication(this);
-				return;
-			}
-		}
-		if(Version.isSherpafy(getMyApplication())) {
-			final Intent mapIntent = new Intent(this, TourViewActivity.class);
-			startActivity(mapIntent);
-			finish();
-			return;
-		}
-		
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		setContentView(R.layout.menu);
-		
-		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
-		
-		onCreateMainMenu(getWindow(), this);
-
-		Window window = getWindow();
-		final Activity activity = this;
-		View showMap = window.findViewById(R.id.MapButton);
-		showMap.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent mapIndent = new Intent(activity, appCustomization.getMapActivity());
-				activity.startActivityForResult(mapIndent, 0);
-			}
-		});
-		View settingsButton = window.findViewById(R.id.SettingsButton);
-		settingsButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent settings = new Intent(activity, appCustomization.getSettingsActivity());
-				activity.startActivity(settings);
-			}
-		});
-
-		View favouritesButton = window.findViewById(R.id.FavoritesButton);
-		favouritesButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent favorites = new Intent(activity, appCustomization.getFavoritesActivity());
-				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				activity.startActivity(favorites);
-			}
-		});
-
-		final View closeButton = window.findViewById(R.id.CloseButton);
-		closeButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				getMyApplication().closeApplication(activity);
-			}
-		});
-		View searchButton = window.findViewById(R.id.SearchButton);
-		searchButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent search = new Intent(activity, appCustomization.getSearchActivity());
-				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				activity.startActivity(search);
-			}
-		});
-		appCustomization.customizeMainMenu(window, this);
-		OsmandApplication app = getMyApplication();
-		// restore follow route mode
-		if(app.getSettings().FOLLOW_THE_ROUTE.get() && !app.getRoutingHelper().isRouteCalculated()){
-			final Intent mapIndent = new Intent(this, appCustomization.getMapActivity());
-			startActivityForResult(mapIndent, 0);
-			return;
-		}
-		startProgressDialog = new ProgressDialog(this);
-		getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog);
-		boolean dialogShown = false;
-		boolean firstTime = false;
-		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
-		boolean appVersionChanged = false;
-		if (!pref.contains(FIRST_TIME_APP_RUN)) {
-			firstTime = true;
-			pref.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
-			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
-		} else if (!Version.getFullVersion(app).equals(pref.getString(VERSION_INSTALLED, ""))) {
-			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
-			appVersionChanged = true;
-		}
-		if (appCustomization.showFirstTimeRunAndTips(firstTime, appVersionChanged)) {
-			if (firstTime) {
-				applicationInstalledFirstTime();
-				dialogShown = true;
-			} else {
-				int i = pref.getInt(TIPS_SHOW, 0);
-				if (i < 7) {
-					pref.edit().putInt(TIPS_SHOW, ++i).commit();
-				}
-				if (i == 1 || i == 5 || appVersionChanged) {
-					if(TIPS_AND_TRICKS) {
-					TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this);
-					Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false);
-					dlg.show();
-					dialogShown = true;
-					} else {
-						if(appVersionChanged) {
-							final Intent helpIntent = new Intent(activity, HelpActivity.class);
-							helpIntent.putExtra(HelpActivity.TITLE, Version.getAppVersion(getMyApplication()));
-							helpIntent.putExtra(HelpActivity.URL, "changes-1.9.html");
-							activity.startActivity(helpIntent);
-							dialogShown = true;
-						}
-					}
-				}
-			}
-		}
-		if(!dialogShown && appCustomization.checkBasemapDownloadedOnStart()) {
-			if (startProgressDialog.isShowing()) {
-				startProgressDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-					@Override
-					public void onDismiss(DialogInterface dialog) {
-						checkVectorIndexesDownloaded();
-					}
-				});
-			} else {
-				checkVectorIndexesDownloaded();
-			}
-		}
-		if(appCustomization.checkExceptionsOnStart() && !dialogShown){
-			checkPreviousRunsForExceptions(firstTime);
-		}
-	}
-
-
-	private void applicationInstalledFirstTime() {
-		boolean netOsmandWasInstalled = false;
-		try {
-			ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo("net.osmand", PackageManager.GET_META_DATA);
-			netOsmandWasInstalled = applicationInfo != null && !Version.isFreeVersion(getMyApplication());
-		} catch (NameNotFoundException e) {
-			netOsmandWasInstalled = false;
-		}
-		
-		if(netOsmandWasInstalled){
-//			Builder builder = new AccessibleAlertBuilder(this);
-//			builder.setMessage(R.string.osmand_net_previously_installed);
-//			builder.setPositiveButton(R.string.default_buttons_ok, null);
-//			builder.show();
-		} else {
-			Builder builder = new AccessibleAlertBuilder(this);
-			builder.setMessage(R.string.first_time_msg);
-			builder.setPositiveButton(R.string.first_time_download, new DialogInterface.OnClickListener() {
-
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					startActivity(new Intent(MainMenuActivity.this, getMyApplication().getAppCustomization().getDownloadIndexActivity()));
-				}
-
-			});
-			builder.setNegativeButton(R.string.first_time_continue, null);
-			builder.show();
-		}
-	}
-	
-	protected void checkVectorIndexesDownloaded() {
-		MapRenderRepositories maps = getMyApplication().getResourceManager().getRenderer();
-		SharedPreferences pref = getPreferences(MODE_WORLD_WRITEABLE);
-		boolean check = pref.getBoolean(VECTOR_INDEXES_CHECK, true);
-		// do not show each time 
-		if (check && new Random().nextInt() % 5 == 1) {
-			Builder builder = new AccessibleAlertBuilder(this);
-			if(maps.isEmpty()){
-				builder.setMessage(R.string.vector_data_missing);
-			} else if(!maps.basemapExists()){
-				builder.setMessage(R.string.basemap_missing);
-			} else {
-				return;
-			}
-			builder.setPositiveButton(R.string.download_files, new DialogInterface.OnClickListener() {
-
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					startActivity(new Intent(MainMenuActivity.this, DownloadActivity.class));
-				}
-
-			});
-			builder.setNeutralButton(R.string.vector_map_not_needed, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					getPreferences(MODE_WORLD_WRITEABLE).edit().putBoolean(VECTOR_INDEXES_CHECK, false).commit();
-				}
-			});
-			builder.setNegativeButton(R.string.first_time_continue, null);
-			builder.show();
-		}
-		
-	}
-
 	private OsmandApplication getMyApplication() {
 		return (OsmandApplication) getApplication();
 	}
-	
+
 	@Override
-	protected Dialog onCreateDialog(int id) {
-		if(id == OsmandApplication.PROGRESS_DIALOG){
-			return startProgressDialog;
-		}
-		return super.onCreateDialog(id);
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		setContentView(R.layout.menu);
+		
+		final OsmAndAppCustomization appCustomization = getMyApplication().getAppCustomization();
+		final Intent settings = new Intent(this, appCustomization.getMainMenuActivity());
+		startActivity(settings);
 	}
 	
 
@@ -417,114 +39,6 @@ public class MainMenuActivity extends Activity {
         }
         return super.onKeyDown(keyCode, event);
     }
-    
-    public static void backToMainMenuDialog(final Activity a, final LatLon searchLocation) {
-		final Dialog dlg = new Dialog(a, R.style.Dialog_Fullscreen);
-		final View menuView = (View) a.getLayoutInflater().inflate(R.layout.menu, null);
-		menuView.setBackgroundColor(Color.argb(200, 150, 150, 150));
-		dlg.setContentView(menuView);
-		final OsmAndAppCustomization appCustomization = ((OsmandApplication) a.getApplication()).getAppCustomization();
-		MainMenuActivity.onCreateMainMenu(dlg.getWindow(), a);
-		Animation anim = new Animation() {
-			@Override
-			protected void applyTransformation(float interpolatedTime, Transformation t) {
-				ColorDrawable colorDraw = ((ColorDrawable) menuView.getBackground());
-				colorDraw.setAlpha((int) (interpolatedTime * 200));
-			}
-		};
-		anim.setDuration(700);
-		anim.setInterpolator(new AccelerateInterpolator());
-		menuView.setAnimation(anim);
-
-		View showMap = dlg.findViewById(R.id.MapButton);
-		showMap.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				dlg.dismiss();
-			}
-		});
-		View settingsButton = dlg.findViewById(R.id.SettingsButton);
-		settingsButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent settings = new Intent(a, appCustomization.getSettingsActivity());
-				a.startActivity(settings);
-				dlg.dismiss();
-			}
-		});
-
-		View favouritesButton = dlg.findViewById(R.id.FavoritesButton);
-		favouritesButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent favorites = new Intent(a, appCustomization.getFavoritesActivity());
-				favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				a.startActivity(favorites);
-				dlg.dismiss();
-			}
-		});
-
-		View closeButton = dlg.findViewById(R.id.CloseButton);
-		closeButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				dlg.dismiss();
-				// 1. Work for almost all cases when user open apps from main menu
-				Intent newIntent = new Intent(a, appCustomization.getMainMenuActivity());
-				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
-				a.startActivity(newIntent);
-				// 2. good analogue but user will come back to the current activity onResume()
-				// so application is not reloaded !!!
-				// moveTaskToBack(true);
-				// 3. bad results if user comes from favorites
-				// a.setResult(MainMenuActivity.APP_EXIT_CODE);
-				// a.finish();
-			}
-		});
-
-		View searchButton = dlg.findViewById(R.id.SearchButton);
-		searchButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				final Intent search = new Intent(a, appCustomization.getSearchActivity());
-				LatLon loc = searchLocation;
-				search.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude());
-				search.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude());
-				// causes wrong position caching:  search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-				search.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				a.startActivity(search);
-				dlg.dismiss();
-			}
-		});
-		menuView.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				dlg.dismiss();
-			}
-		});
-
-		dlg.show();
-		// Intent newIntent = new Intent(a, MainMenuActivity.class);
-		// newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-		// startActivity(newIntent);
-	}
-	
-    
-    @Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-    	menu.add(0, 0, 0, R.string.exit_Button);
-    	return true;
-	}
-	
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == 0) {
-			getMyApplication().closeApplication(this);
-			return true;
-		}
-		return false;
-	}
+ 
 	
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 5b8ec70958..d148f1ded4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -82,7 +82,7 @@ import android.widget.Toast;
 
 public class MapActivity extends AccessibleActivity implements
 		VoiceRouter.VoiceMessageListener {
-	
+
 	private static final int SHOW_POSITION_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_VIEW + 1;
 	private static final int LONG_KEYPRESS_MSG_ID = OsmAndConstants.UI_HANDLER_MAP_VIEW + 2;
 	private static final int LONG_KEYPRESS_DELAY = 500;
@@ -228,6 +228,7 @@ public class MapActivity extends AccessibleActivity implements
 		
 		mDeviceAdmin = new ComponentName(getApplicationContext(), DeviceAdminRecv.class);
 		mDevicePolicyManager = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
+		
 	}
 	
 	public void addLockView(FrameLayout lockView) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index e4b7343b36..759ace7432 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -838,16 +838,6 @@ public class MapActivityActions implements DialogProvider {
 				}
 			}).reg();
 
-		optionsMenuHelper.item(R.string.settings_Button).icons(R.drawable.ic_action_settings2_dark, R.drawable.ic_action_settings2_light)
-				.listen(new OnContextMenuClick() {
-					@Override
-					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						final Intent intentSettings = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getSettingsActivity());
-						mapActivity.startActivity(intentSettings);
-						return true;
-					}
-				}).reg();
-
 		
 		//////////// Others
 		if (Version.isGpsStatusEnabled(app)) {
@@ -861,23 +851,6 @@ public class MapActivityActions implements DialogProvider {
 				}
 			}).reg();
 		}
-		optionsMenuHelper.item(R.string.tips_and_tricks).
-				icons(R.drawable.ic_action_ghelp_dark, R.drawable.ic_action_ghelp_light).
-				listen(new OnContextMenuClick() {
-					
-					@Override
-					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
-						if (MainMenuActivity.TIPS_AND_TRICKS) {
-							TipsAndTricksActivity tactivity = new TipsAndTricksActivity(mapActivity);
-							Dialog dlg = tactivity.getDialogToShowTips(false, true);
-							dlg.show();
-						} else {
-							final Intent helpIntent = new Intent(mapActivity, HelpActivity.class);
-							mapActivity.startActivity(helpIntent);
-						}
-						return true;
-					}
-				}).reg();
 		final OsmAndLocationProvider loc = app.getLocationProvider();
 		if (app.getTargetPointsHelper().getPointToNavigate() != null || loc.getLocationSimulation().isRouteAnimating()) {
 			if (OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null) {
@@ -897,14 +870,15 @@ public class MapActivityActions implements DialogProvider {
 		}
 
 		OsmandPlugin.registerOptionsMenu(mapActivity, optionsMenuHelper);
-		optionsMenuHelper.item(R.string.exit_Button).icons(R.drawable.ic_action_quit_dark, R.drawable.ic_action_quit_light )
+		optionsMenuHelper.item(R.string.home_button).icons(R.drawable.ic_action_quit_dark, R.drawable.ic_action_quit_light )
 					.listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
 				// 1. Work for almost all cases when user open apps from main menu
 				Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getMainMenuActivity());
 				newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				newIntent.putExtra(MainMenuActivity.APP_EXIT_KEY, MainMenuActivity.APP_EXIT_CODE);
+				// not exit
+				// newIntent.putExtra(DashboardActivity.APP_EXIT_KEY, DashboardActivity.APP_EXIT_CODE);
 				mapActivity.startActivity(newIntent);
 				// In future when map will be main screen this should change
 				// app.closeApplication(mapActivity);
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index dbb79589d3..2f9b3cdf02 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -2,30 +2,14 @@ package net.osmand.plus.activities;
 
 
 import java.io.File;
-import java.util.Date;
 
 import net.osmand.IndexConstants;
-import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
-import net.osmand.plus.Version;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.text.SpannableString;
-import android.text.format.DateFormat;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.ScrollView;
-import android.widget.TextView;
 
 public class SettingsActivity extends SettingsBaseActivity {
 
@@ -110,7 +94,7 @@ public class SettingsActivity extends SettingsBaseActivity {
 			startActivity(new Intent(this, SettingsNavigationActivity.class));
 			return true;
 		} else if (preference == about) {
-			showAboutDialog();
+			DashboardActivity.showAboutDialog(this, getMyApplication());
 			return true;
 		} else if (preference == plugins) {
 			startActivityForResult(new Intent(this, getMyApplication().getAppCustomization().getPluginsActivity()), PLUGINS_SELECTION_REQUEST);
@@ -121,49 +105,6 @@ public class SettingsActivity extends SettingsBaseActivity {
 		return false;
 	}
 
-	private void showAboutDialog() {
-		Builder bld = new AlertDialog.Builder(this);
-		bld.setTitle(R.string.about_settings);
-        ScrollView sv = new ScrollView(this);
-        TextView tv = new TextView(this);
-        sv.addView(tv);
-		String version = Version.getFullVersion(getMyApplication());
-		String vt = getString(R.string.about_version) +"\t";
-		int st = vt.length();
-		String edition = "";
-        SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
-        if (prefs.contains(CONTRIBUTION_VERSION_FLAG)) {
-            try {
-                PackageManager pm = getPackageManager();
-                ApplicationInfo appInfo = pm.getApplicationInfo(OsmandApplication.class.getPackage().getName(), 0);
-                Date date = new Date(new File(appInfo.sourceDir).lastModified());
-                edition = getString(R.string.local_index_installed) + " :\t" + DateFormat.getDateFormat(getApplicationContext()).format(date);
-            } catch (Exception e) {
-            }
-            SpannableString content = new SpannableString(vt + version +"\n" +
-    				edition +"\n\n"+
-    				getString(R.string.about_content));
-    		content.setSpan(new ClickableSpan() {
-    			@Override
-    			public void onClick(View widget) {
-    				final Intent mapIntent = new Intent(SettingsActivity.this, ContributionVersionActivity.class);
-    				startActivityForResult(mapIntent, 0);
-    			}
-    			
-    		}, st, st + version.length(), 0);
-    		tv.setText(content);
-        } else {
-        	tv.setText(vt + version +"\n\n" +
-    				getString(R.string.about_content));
-        }
-        
-		tv.setPadding(5, 0, 5, 5);
-		tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 19);
-		tv.setMovementMethod(LinkMovementMethod.getInstance());
-		bld.setView(sv);
-		bld.setPositiveButton(R.string.default_buttons_ok, null);
-		bld.show();
-		
-	}
+	
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index 3af7ee39c1..cbe8b65169 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -53,8 +53,9 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
 	public static final int POI_TAB_INDEX = 0;
 	public static final int ADDRESS_TAB_INDEX = 1;
 	public static final int LOCATION_TAB_INDEX = 2;
-	public static final int HISTORY_TAB_INDEX = 3;
-	public static final int TRANSPORT_TAB_INDEX = 4;
+	public static final int FAVORITES_TAB_INDEX = 3;
+	public static final int HISTORY_TAB_INDEX = 4;
+	public static final int TRANSPORT_TAB_INDEX = 5;
 	
 	protected static final int POSITION_CURRENT_LOCATION = 1;
 	protected static final int POSITION_LAST_MAP_VIEW = 2;
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index af124a48be..910c4e7385 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -29,7 +29,6 @@ import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.Version;
-import net.osmand.plus.download.DownloadIndexFragment;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.MapActivityLayers;
 import net.osmand.plus.activities.SelectedGPXFragment;
@@ -38,6 +37,7 @@ import net.osmand.plus.api.FileSettingsAPIImpl;
 import net.osmand.plus.api.SettingsAPI;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadActivityType;
+import net.osmand.plus.download.DownloadIndexFragment;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.sherpafy.TourInformation.StageFavorite;
@@ -56,9 +56,7 @@ import android.os.Environment;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.view.Window;
 import android.widget.ArrayAdapter;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
@@ -153,29 +151,6 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		return false;
 	}
 	
-	@Override
-	public void customizeMainMenu(Window window, final Activity activity) {
-		// Update app name
-		TextView v =  (TextView) window.findViewById(R.id.AppName);
-		v.setText("Sherpafy");
-		
-//		TextView toursButtonText = (TextView) window.findViewById(R.id.SettingsButtonText);
-//		toursButtonText.setText(R.string.tour);
-//		View toursButton = window.findViewById(R.id.SettingsButton);
-//		toursButton.setOnClickListener(new OnClickListener() {
-//			@Override
-//			public void onClick(View v) {
-//				final Intent search = new Intent(activity, getTourSelectionActivity());
-//				search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-//				activity.startActivity(search);
-//			}
-//		});
-
-
-		// the image could be also updated
-	}
-	
-	
 	@Override
 	public void getDownloadTypes(List<DownloadActivityType> items) {
 		super.getDownloadTypes(items);

From 9b57c8e5ffa16cfc58d3f7bf51781f96afff9ce2 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 27 Nov 2014 17:39:38 +0100
Subject: [PATCH 054/138] Update master branch with new home screen

---
 OsmAnd/res/layout-land/dashboard_search.xml               | 6 +++---
 OsmAnd/res/layout/dashboard.xml                           | 2 +-
 .../src/net/osmand/plus/activities/DashboardActivity.java | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout-land/dashboard_search.xml b/OsmAnd/res/layout-land/dashboard_search.xml
index 34d0ce8b71..895065e3a9 100644
--- a/OsmAnd/res/layout-land/dashboard_search.xml
+++ b/OsmAnd/res/layout-land/dashboard_search.xml
@@ -52,9 +52,9 @@
             android:drawableTop="@drawable/ic_action_marker2"
             android:text="@string/coordinates" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+	<View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
             android:background="@color/dashboard_divider" />
 
         <Button
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 2c3f62b84d..48bf022388 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="6dp" >
-		<include android:id="@layout/dashboard_search"/>
+		<include layout="@layout/dashboard_search"/>
 
         <LinearLayout
             android:layout_width="fill_parent"
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 2494ea3eb8..779b9c436b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -86,6 +86,13 @@ public class DashboardActivity extends SherlockFragmentActivity implements IMapD
 	private ProgressDialog startProgressDialog;
 	private OsmandMapTileView osmandMapTileView;
 
+	
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		getMyApplication().getResourceManager().getMapTileDownloader().removeDownloaderCallback(this);
+	}
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -112,6 +119,7 @@ public class DashboardActivity extends SherlockFragmentActivity implements IMapD
 		setupMapView();
 		setupButtons();
 		setupFonts();
+		getMyApplication().getResourceManager().getMapTileDownloader().addDownloaderCallback(this);
 	}
 	
 	@Override

From d9a260f0ae79edd2b373a888e6027061dda17bef Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 27 Nov 2014 18:46:50 +0100
Subject: [PATCH 055/138] Translated using Weblate (Danish)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-da/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index d21f9c6c62..36146a26a6 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1846,4 +1846,9 @@
     <string name="advanced_settings">Avanceret</string>
 	<string name="osmo_use_https_descr">Brug sikker forbindelse med server</string>
     <string name="osmo_use_https">Brug https</string>
+	<string name="home_button">Hjem</string>
+    <string name="search_for">Søg efter</string>
+	<string name="show_map">VIS KORT</string>
+	<string name="show_all">VIS ALLE</string>
+	<string name="coordinates">Koordinater</string>
 	</resources>

From d819b8abf5e37fe1d900019cda646da1077e95d5 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 27 Nov 2014 19:03:30 +0100
Subject: [PATCH 056/138] Translated using Weblate (French)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-fr/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 20f7df364b..3ecef59689 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1862,4 +1862,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="advanced_settings">Avancé</string>
 	<string name="osmo_use_https_descr">Utiliser une connexion sécurisée avec le serveur</string>
     <string name="osmo_use_https">Utiliser HTTPS</string>
+	<string name="home_button">Accueil</string>
+    <string name="search_for">Rechercher</string>
+	<string name="show_map">AFFICHER LA CARTE</string>
+	<string name="show_all">AFFICHER TOUT</string>
+	<string name="coordinates">Coordonnées</string>
 	</resources>

From 6d65639c19e9a7bd7061e9f2d9578fe456212d06 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Thu, 27 Nov 2014 19:29:27 +0100
Subject: [PATCH 057/138] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-sc/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index cdf022c0fe..4a12c207eb 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1783,4 +1783,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="advanced_settings">Avantzadas</string>
 	<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
     <string name="osmo_use_https">Imprea https</string>
+	<string name="home_button">Domo</string>
+    <string name="search_for">Chirca pro</string>
+	<string name="show_map">AMMUSTRA MAPA</string>
+	<string name="show_all">AMMUSTRA TOTU</string>
+	<string name="coordinates">Coordinatas</string>
 	</resources>

From dea9b8e63de395a27d1ae9a48bd916be61b67eac Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Thu, 27 Nov 2014 19:48:27 +0100
Subject: [PATCH 058/138] Translated using Weblate (Slovak)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-sk/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 16e07a21f9..334fa6cb7c 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1993,4 +1993,9 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="advanced_settings">Pokročilé</string>
 	<string name="osmo_use_https_descr">Použiť zabezpečené spojenie so serverom</string>
     <string name="osmo_use_https">Použiť HTTPS</string>
+	<string name="home_button">Domov</string>
+    <string name="search_for">Hľadať</string>
+	<string name="show_map">ZOBRAZIŤ MAPU</string>
+	<string name="show_all">ZOBRAZIŤ VŠETKO</string>
+	<string name="coordinates">Súradnice</string>
 	</resources>

From 0fd5b51ef11ea8f0c6534c099cd22a4fa99f7078 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@ovi.com>
Date: Thu, 27 Nov 2014 20:41:57 +0100
Subject: [PATCH 059/138] Translated using Weblate (Catalan)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-ca/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 1473ea4212..ab52bff3c9 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1897,4 +1897,9 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
     <string name="advanced_settings">Avançat</string>
 	<string name="osmo_use_https_descr">Utilitzeu una connexió segura amb el servidor</string>
     <string name="osmo_use_https">Utilitzeu https</string>
+	<string name="home_button">Casa</string>
+    <string name="search_for">Recerca de</string>
+	<string name="show_map">VEURE EL MAPA</string>
+	<string name="show_all">VEURE TOT</string>
+	<string name="coordinates">Coordenades</string>
 	</resources>

From 0191d10fb98333f95df5123319247003b3648480 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Thu, 27 Nov 2014 20:56:09 +0100
Subject: [PATCH 060/138] Translated using Weblate (Dutch)

Currently translated at 100.0% (1567 of 1567 strings)
---
 OsmAnd/res/values-nl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 253d913f49..cee85611ed 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2010,4 +2010,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="advanced_settings">Geavanceerd</string>
 	<string name="osmo_use_https_descr">Gebruik beveiligde verbinding met server</string>
     <string name="osmo_use_https">Gebruik https</string>
+	<string name="home_button">Start</string>
+    <string name="search_for">Zoek naar</string>
+	<string name="show_map">TOON KAART</string>
+	<string name="show_all">TOON ALLES</string>
+	<string name="coordinates">Coördinaten</string>
 	</resources>

From da8fc85b9ff5397d09a29e9f5b3087e0b51b9891 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 27 Nov 2014 21:59:44 +0100
Subject: [PATCH 061/138] Merge changes

---
 ...rd_search.xml => dash_search_fragment.xml} |   2 +-
 OsmAnd/res/layout/dash_search_fragment.xml    | 153 +++++++++++-------
 OsmAnd/res/layout/dashboard_search.xml        |  97 -----------
 3 files changed, 93 insertions(+), 159 deletions(-)
 rename OsmAnd/res/layout-land/{dashboard_search.xml => dash_search_fragment.xml} (99%)
 delete mode 100644 OsmAnd/res/layout/dashboard_search.xml

diff --git a/OsmAnd/res/layout-land/dashboard_search.xml b/OsmAnd/res/layout-land/dash_search_fragment.xml
similarity index 99%
rename from OsmAnd/res/layout-land/dashboard_search.xml
rename to OsmAnd/res/layout-land/dash_search_fragment.xml
index 895065e3a9..27a14f2e74 100644
--- a/OsmAnd/res/layout-land/dashboard_search.xml
+++ b/OsmAnd/res/layout-land/dash_search_fragment.xml
@@ -52,7 +52,7 @@
             android:drawableTop="@drawable/ic_action_marker2"
             android:text="@string/coordinates" />
 
-	<View
+       <View
             android:layout_width="1dp"
             android:layout_height="match_parent"
             android:background="@color/dashboard_divider" />
diff --git a/OsmAnd/res/layout/dash_search_fragment.xml b/OsmAnd/res/layout/dash_search_fragment.xml
index 67ebad9f26..95408d7fd7 100644
--- a/OsmAnd/res/layout/dash_search_fragment.xml
+++ b/OsmAnd/res/layout/dash_search_fragment.xml
@@ -1,64 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:id="@+id/search"
-			  android:orientation="vertical"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content"
-			  android:background="@drawable/bg_cardui"
-			  android:layout_marginBottom="4dp">
-	<TextView android:id="@+id/search_for"
-			  android:text="@string/search_for"
-			  android:layout_height="40dp"
-			  style="@style/DashboardSubHeader"
-			  android:layout_width="wrap_content"/>
-	<View android:layout_width="match_parent"
-		  android:background="@color/dashboard_divider"
-		  android:layout_height="1dp"/>
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_width="match_parent"
-				  android:layout_height="90dp">
-		<Button android:id="@+id/poi"
-				android:text="@string/poi"
-				android:drawableTop="@drawable/ic_action_info2"
-				style="@style/DashboardSearchButton"/>
-		<View android:layout_width="1dp"
-			  android:background="@color/dashboard_divider"
-			  android:layout_height="match_parent"/>
-		<Button android:id="@+id/address"
-				android:text="@string/address"
-				android:drawableTop="@drawable/ic_action_home2"
-				style="@style/DashboardSearchButton"/>
-		<View android:layout_width="1dp"
-			  android:background="@color/dashboard_divider"
-			  android:layout_height="match_parent"/>
-		<Button android:id="@+id/coord"
-				android:text="@string/coordinates"
-				android:drawableTop="@drawable/ic_action_marker2"
-				style="@style/DashboardSearchButton"/>
-	</LinearLayout>
-	<View android:layout_width="match_parent"
-		  android:background="@color/dashboard_divider"
-		  android:layout_height="1dp"/>
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_width="fill_parent"
-				  android:layout_height="90dp">
-		<Button android:id="@+id/fav_btn"
-				android:text="@string/my_favorites"
-				android:drawableTop="@drawable/ic_action_fav2"
-				style="@style/DashboardSearchButton"/>
-		<View android:layout_width="1dp"
-			  android:background="@color/dashboard_divider"
-			  android:layout_height="match_parent"/>
-		<Button android:id="@+id/history"
-				android:text="@string/history"
-				android:drawableTop="@drawable/ic_action_history2"
-				style="@style/DashboardSearchButton"/>
-		<View android:layout_width="1dp"
-			  android:background="@color/dashboard_divider"
-			  android:layout_height="match_parent"/>
-		<Button android:id="@+id/transport"
-				android:text="@string/rendering_category_transport"
-				android:drawableTop="@drawable/ic_action_bus2"
-				style="@style/DashboardSearchButton"/>
-	</LinearLayout>
+    android:id="@+id/search"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/bg_cardui"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/search_for"
+        style="@style/DashboardSubHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:text="@string/search_for" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dashboard_divider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/poi"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_info2"
+            android:text="@string/poi" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/address"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_home2"
+            android:text="@string/address" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/coord"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_marker2"
+            android:text="@string/coordinates" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dashboard_divider" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="90dp"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/fav_btn"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_fav2"
+            android:text="@string/my_favorites" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/history"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_history2"
+            android:text="@string/history" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/dashboard_divider" />
+
+        <Button
+            android:id="@+id/transport"
+            style="@style/DashboardSearchButton"
+            android:drawableTop="@drawable/ic_action_bus2"
+            android:text="@string/rendering_category_transport" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard_search.xml b/OsmAnd/res/layout/dashboard_search.xml
deleted file mode 100644
index cee3135087..0000000000
--- a/OsmAnd/res/layout/dashboard_search.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    
-        <LinearLayout
-            android:id="@+id/search"
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:background="@drawable/bg_cardui"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/search_for"
-                style="@style/DashboardSubHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="40dp"
-                android:text="@string/search_for" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/dashboard_divider" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="90dp"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/poi"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_info2"
-                    android:text="@string/poi" />
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/dashboard_divider" />
-
-                <Button
-                    android:id="@+id/address"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_home2"
-                    android:text="@string/address" />
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/dashboard_divider" />
-
-                <Button
-                    android:id="@+id/coord"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_marker2"
-                    android:text="@string/coordinates" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/dashboard_divider" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="90dp"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/fav_btn"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_fav2"
-                    android:text="@string/my_favorites" />
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/dashboard_divider" />
-
-                <Button
-                    android:id="@+id/history"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_history2"
-                    android:text="@string/history" />
-
-                <View
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/dashboard_divider" />
-
-                <Button
-                    android:id="@+id/transport"
-                    style="@style/DashboardSearchButton"
-                    android:drawableTop="@drawable/ic_action_bus2"
-                    android:text="@string/rendering_category_transport" />
-            </LinearLayout>
-        </LinearLayout>
-

From 841973d387ca7ab12cab24a4e83f63f481696454 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Thu, 27 Nov 2014 18:46:42 +0100
Subject: [PATCH 062/138] Translated using Weblate (Italian)

Currently translated at 99.8% (1564 of 1567 strings)
---
 OsmAnd/res/values-it/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index fda138de43..928d752652 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2029,4 +2029,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="advanced_settings">Avanzato</string>
 	<string name="osmo_use_https">Usa https</string>
 	<string name="osmo_use_https_descr">Usa la connessione sicura con il server</string>
-    </resources>
+    <string name="show_all">MOSTRA TUTTO</string>
+	<string name="coordinates">Coordinate</string>
+	</resources>

From 7b7e3b875d2bdac842dbee554ae4360adc2c5ceb Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Thu, 27 Nov 2014 18:26:09 +0100
Subject: [PATCH 063/138] Translated using Weblate (Russian)

Currently translated at 99.6% (1562 of 1567 strings)
---
 OsmAnd/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index e472d58f0d..9b4e3791f1 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1100,7 +1100,7 @@
 <string name="select_navigation_mode">Выберите вид транспорта</string>
 <string name="day_night_info_description">Восход : %1$s
 \nЗакат : %2$s</string>
-<string name="map_widget_vector_attributes">Настройки отрисовки (векторн.):</string>
+<string name="map_widget_vector_attributes">Атрибуты визуализации</string>
 <string name="map_widget_renderer">Стиль отрисовки (векторн.)</string>
 
 

From 967c59e7d815657e791d8da22cb498d6d0cd98e3 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Thu, 27 Nov 2014 20:00:02 +0100
Subject: [PATCH 064/138] Translated using Weblate (Swedish)

Currently translated at 99.4% (1558 of 1567 strings)
---
 OsmAnd/res/values-sv/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 4e3c86ee7b..33cf5f52b1 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1733,4 +1733,9 @@
     <string name="advanced_settings">Avancerat</string>
 	<string name="osmo_use_https">Använd https</string>
 	<string name="osmo_use_https_descr">Använd säker anslutning till servern</string>
-    </resources>
+    <string name="home_button">Hem</string>
+    <string name="search_for">Sök efter</string>
+	<string name="show_map">VISA KARTA</string>
+	<string name="show_all">VISA ALLA</string>
+	<string name="coordinates">Koordinater</string>
+	</resources>

From c20165b63f4996c7104883f27554332c0e328835 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 27 Nov 2014 22:02:06 +0100
Subject: [PATCH 065/138] Remove link

---
 .../osmand/plus/activities/DashboardActivity.java    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index ee19eb95ae..a0e5c59a57 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -92,18 +92,6 @@ public class DashboardActivity extends BaseDownloadActivity {
 		
 		final String textVersion = Version.getFullVersion(getMyApplication());
 		getSupportActionBar().setTitle(textVersion);
-		final int abTitleId = getResources().getIdentifier("action_bar_title", "id", "android");
-		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
-		findViewById(abTitleId).setOnClickListener(new View.OnClickListener() {
-			int i=0;
-			@Override
-			public void onClick(View view) {
-				if(i++ > 8) {
-					prefs.edit().putBoolean(CONTRIBUTION_VERSION_FLAG, true).commit();
-					enableLink(DashboardActivity.this, textVersion, (TextView)view);
-				}
-			}
-		});
 		ColorDrawable color = new ColorDrawable(getResources().getColor(R.color.actionbar_color));
 		getSupportActionBar().setBackgroundDrawable(color);
 		getSupportActionBar().setIcon(android.R.color.transparent);

From ea558e2a7627e0584fda599102cf1b7d2abed740 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Thu, 27 Nov 2014 22:38:50 +0100
Subject: [PATCH 066/138] Translated using Weblate (Dutch)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index cee85611ed..015d2fec7e 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2015,4 +2015,5 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="show_map">TOON KAART</string>
 	<string name="show_all">TOON ALLES</string>
 	<string name="coordinates">Coördinaten</string>
+	<string name="map_update">Kaarten</string>
 	</resources>

From 3f78702dbba00dabe240d770e19447ee85edb0e6 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 27 Nov 2014 22:49:38 +0100
Subject: [PATCH 067/138] Translated using Weblate (Danish)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-da/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 36146a26a6..8aaba9e254 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1851,4 +1851,5 @@
 	<string name="show_map">VIS KORT</string>
 	<string name="show_all">VIS ALLE</string>
 	<string name="coordinates">Koordinater</string>
+	<string name="map_update">Kort</string>
 	</resources>

From 239a4747673601fe3fe0d9518d483d6fbeac88b3 Mon Sep 17 00:00:00 2001
From: Ivan Gonzalez Martin <cain1986@gmail.com>
Date: Thu, 27 Nov 2014 22:55:59 +0100
Subject: [PATCH 068/138] Translated using Weblate (Spanish)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-es/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index b548935c5f..4b8f22828e 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1880,4 +1880,10 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="advanced_settings">Avanzado</string>
 	<string name="osmo_use_https_descr">Usar conexión segura con el servidor</string>
     <string name="osmo_use_https">Usar https</string>
+	<string name="home_button">Casa</string>
+    <string name="map_update">Mapas</string>
+	<string name="search_for">Buscar</string>
+	<string name="show_map">MOSTRAR MAPA</string>
+	<string name="show_all">MOSTRAR TODO</string>
+	<string name="coordinates">Coordenadas</string>
 	</resources>

From b027a6e53f85cb8bd92925ae37bed32b44c67c42 Mon Sep 17 00:00:00 2001
From: Lu Ca <lmelonimamo@yahoo.it>
Date: Thu, 27 Nov 2014 23:14:22 +0100
Subject: [PATCH 069/138] Translated using Weblate (Sardinian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-sc/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 4a12c207eb..d00ec97584 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1788,4 +1788,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_map">AMMUSTRA MAPA</string>
 	<string name="show_all">AMMUSTRA TOTU</string>
 	<string name="coordinates">Coordinatas</string>
+	<string name="map_update">Mapas</string>
 	</resources>

From 7cbd7226e498f5bbaf048b40e4461443a6c248a2 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Thu, 27 Nov 2014 23:26:42 +0100
Subject: [PATCH 070/138] Translated using Weblate (Italian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-it/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 928d752652..480109a780 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2031,4 +2031,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="osmo_use_https_descr">Usa la connessione sicura con il server</string>
     <string name="show_all">MOSTRA TUTTO</string>
 	<string name="coordinates">Coordinate</string>
+	<string name="home_button">Casa</string>
+    <string name="map_update">Mappe</string>
+	<string name="search_for">Cerca</string>
+	<string name="show_map">MOSTRA LA MAPPA</string>
 	</resources>

From 1f9799283e106ce1dc09899e712ac15a6a1019bd Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 27 Nov 2014 23:40:46 +0100
Subject: [PATCH 071/138] Translated using Weblate (French)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 3ecef59689..506f3c10ba 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1867,4 +1867,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="show_map">AFFICHER LA CARTE</string>
 	<string name="show_all">AFFICHER TOUT</string>
 	<string name="coordinates">Coordonnées</string>
+	<string name="map_update">Cartes</string>
 	</resources>

From 263a8cf025940f6bbdde3dd3148f43116966a211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Fri, 28 Nov 2014 00:17:02 +0100
Subject: [PATCH 072/138] Translated using Weblate (Korean)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-ko/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index c789a05b53..d7e1db798b 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2085,4 +2085,10 @@
     <string name="advanced_settings">고급</string>
 	<string name="osmo_use_https">Https를 사용하기</string>
 	<string name="osmo_use_https_descr">서버를 이용하여 보안 연결</string>
-    </resources>
+    <string name="home_button">집</string>
+    <string name="map_update">지도</string>
+	<string name="search_for">검색</string>
+	<string name="show_map">지도 보기</string>
+	<string name="show_all">모두 보기</string>
+	<string name="coordinates">좌표</string>
+	</resources>

From 9931d436b47eaa860b40d4bfa7a33e59e5469e99 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Fri, 28 Nov 2014 00:57:34 +0100
Subject: [PATCH 073/138] Fix routing with needles

---
 .../net/osmand/router/BinaryRoutePlanner.java | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
index 8d18346a0d..a5f47b7d45 100644
--- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
+++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
@@ -28,7 +28,7 @@ public class BinaryRoutePlanner {
 	protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class);
 	
 	private static final int ROUTE_POINTS = 11;
-	private static final boolean TRACE_ROUTING = false;
+	private static final boolean TRACE_ROUTING = true;
 	
 	
 	public static double squareRootDist(int x1, int y1, int x2, int y2) {
@@ -135,6 +135,7 @@ public class BinaryRoutePlanner {
 			checkIfGraphIsEmpty(ctx, ctx.getPlanRoadDirection() >= 0, graphDirectSegments, start, visitedDirectSegments,
 					"Route is not found from selected start point.");
 			if (ctx.planRouteIn2Directions()) {
+				if(!graphDirectSegments.isEmpty() && !graphReverseSegments.isEmpty())
 				forwardSearch = (nonHeuristicSegmentsComparator.compare(graphDirectSegments.peek(), graphReverseSegments.peek()) < 0);
 //				if (graphDirectSegments.size() * 2 > graphReverseSegments.size()) {
 //					forwardSearch = false;
@@ -206,14 +207,41 @@ public class BinaryRoutePlanner {
 			}
 		}
 	}
+	
+	public RouteSegment initRouteSegment(final RoutingContext ctx, RouteSegment segment, boolean positiveDirection) {
+		if(segment.getSegmentStart() == 0 && !positiveDirection && segment.getRoad().getPointsLength() > 0) {
+			segment = loadSameSegment(ctx, segment, 1);
+		} else if(segment.getSegmentStart() == segment.getRoad().getPointsLength() -1 && positiveDirection && segment.getSegmentStart() > 0) {
+			segment = loadSameSegment(ctx, segment, segment.getSegmentStart() -1);
+		}
+		if(segment == null) {
+			return null;
+		}
+		return segment.initRouteSegment(positiveDirection);
+	}
+
+
+	protected RouteSegment loadSameSegment(final RoutingContext ctx, RouteSegment segment, int ind) {
+		int x31 = segment.getRoad().getPoint31XTile(ind);
+		int y31 = segment.getRoad().getPoint31YTile(ind);
+		RouteSegment s = ctx.loadRouteSegment(x31, y31, 0);
+		while(s != null) {
+			if(s.getRoad().getId() == segment.getRoad().getId()) {
+				segment = s;
+				break;
+			}
+			s = s.getNext();
+		}
+		return segment;
+	}
 
 
 	private void initQueuesWithStartEnd(final RoutingContext ctx, RouteSegment start, RouteSegment end,
 			PriorityQueue<RouteSegment> graphDirectSegments, PriorityQueue<RouteSegment> graphReverseSegments) {
-		RouteSegment startPos = start.initRouteSegment(true);
-		RouteSegment startNeg = start.initRouteSegment(false);
-		RouteSegment endPos = end.initRouteSegment(true);
-		RouteSegment endNeg = end.initRouteSegment(false);
+		RouteSegment startPos = initRouteSegment(ctx, start, true);
+		RouteSegment startNeg = initRouteSegment(ctx, start, false);
+		RouteSegment endPos = initRouteSegment(ctx, end, true);
+		RouteSegment endNeg = initRouteSegment(ctx, end, false);
 		// for start : f(start) = g(start) + h(start) = 0 + h(start) = h(start)
 		if(ctx.config.initialDirection != null) {
 			// mark here as positive for further check

From da7f23b4acd89d3ed38b347d8271940123c05e26 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Fri, 28 Nov 2014 00:58:02 +0100
Subject: [PATCH 074/138] Fix routing with needles

---
 OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
index a5f47b7d45..fd5667f0a4 100644
--- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
+++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
@@ -28,7 +28,7 @@ public class BinaryRoutePlanner {
 	protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class);
 	
 	private static final int ROUTE_POINTS = 11;
-	private static final boolean TRACE_ROUTING = true;
+	private static final boolean TRACE_ROUTING = false;
 	
 	
 	public static double squareRootDist(int x1, int y1, int x2, int y2) {

From 078462297e3a26828da1b321b14d5b3bc1fb0c6e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 27 Nov 2014 22:53:17 +0100
Subject: [PATCH 075/138] Translated using Weblate (Danish)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-da/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 8aaba9e254..922797997d 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1846,7 +1846,7 @@
     <string name="advanced_settings">Avanceret</string>
 	<string name="osmo_use_https_descr">Brug sikker forbindelse med server</string>
     <string name="osmo_use_https">Brug https</string>
-	<string name="home_button">Hjem</string>
+	<string name="home_button">Start</string>
     <string name="search_for">Søg efter</string>
 	<string name="show_map">VIS KORT</string>
 	<string name="show_all">VIS ALLE</string>

From 57867d7ddf1e4225d777f46a9f3ce7ffc6343504 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Thu, 27 Nov 2014 22:41:45 +0100
Subject: [PATCH 076/138] Translated using Weblate (Dutch)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-nl/strings.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 015d2fec7e..5216dde306 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1610,9 +1610,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="guidance_preferences_descr">Navigatievoorkeuren</string>
     <string name="routing_preferences_descr">Routeberekening-voorkeuren</string>
     <string name="app_mode_truck">Vrachtauto</string>
-    <string name="android_19_location_disabled">Sinds Android KitKat kunnen kaarten niet meer worden opgeslagen in de huidige map(%s). Wil je deze wijzigen in een toegestane map en de bestanden daar naartoe kopiëren?
-\t\n Let op: oude bestanden blijven bestaan.
-\t\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+. </string>
+    <string name="android_19_location_disabled">Vanaf Android 4.4 (KitKat) kunnen kaarten niet meer worden opgeslagen in de bestaande map(%s). Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar naartoe kopiëren?\n Let op: oude bestanden blijven bestaan. U kunt ze zelf verwijderen.\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+.</string>
     <string name="application_dir_change_warning2">OsmAnd kan proberen de bestanden naar de nieuwe bestemming te verplaatsen. Wil je dat?</string>
     <string name="copying_osmand_one_file_descr">Bestand (%s) wordt gekopieerd naar de nieuwe locatie...</string>
     <string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)</string>

From b8894587839d034c7bd838d977516eb37ce84424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Fri, 28 Nov 2014 00:18:12 +0100
Subject: [PATCH 077/138] Translated using Weblate (Korean)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-ko/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index d7e1db798b..a365735e2d 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2088,7 +2088,7 @@
     <string name="home_button">집</string>
     <string name="map_update">지도</string>
 	<string name="search_for">검색</string>
-	<string name="show_map">지도 보기</string>
-	<string name="show_all">모두 보기</string>
+	<string name="show_map">지도 표시</string>
+	<string name="show_all">모두 표시</string>
 	<string name="coordinates">좌표</string>
 	</resources>

From f0b1692788752777449594137f2dc17075aeaa92 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 04:29:36 +0100
Subject: [PATCH 078/138] keep app version strings in sync

---
 OsmAnd/res/values/no_translate.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 12a50fb0ed..18e0198144 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name_ver">OsmAnd 1.9</string>
+    <string name="app_name_ver">OsmAnd 1.9.3</string>
     <string name="app_name">OsmAnd~</string>
-
     <!--
     When changing the following app_version string please remember to keep the version prefix for our apk in sync at
-    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.#${BUILD_NUMBER}D )
+    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}D )
     -->
-    <string name="app_version">1.9 alpha</string>
+    <string name="app_version">1.9.3</string>
 
     <!-- Not translatable -->
     <string name="ga_api_key">UA-28342846-2</string>

From fbee9b6a4d36555338b083a1c64982703510602d Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 05:16:41 +0100
Subject: [PATCH 079/138] correct characters

---
 OsmAnd/res/values/no_translate.xml                           | 4 ++--
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 18e0198144..efa2885a58 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -14,12 +14,12 @@
     <string name="ga_debug">true</string>
     <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
     <string name="next_tips_and_tricks_not_translate"></string>
-    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">@OpenStreetMap</a></string>
+    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">�OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMaps ODbL
     
 	\n\nAll rights belong to OsmAnd app.
 
-	\n\nCopyright (C) 2010-2014 OsmAnd Authors :
+	\n\nCopyright � 2010-2014 OsmAnd Authors :
 	\n\tVictor Shcherb - all parts of the project, originator
 	\n\tAlexey Pelykh - rendering and core parts
 	\n\tHardy Mueller - main parts of the project, mostly rendering, UI interaction design
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index a0e5c59a57..060a05a869 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "@OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "�OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From 967826f1824a1f234916f6fb893b63c1406ce586 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 05:31:11 +0100
Subject: [PATCH 080/138] use &copy;

---
 OsmAnd/res/values/no_translate.xml                           | 4 ++--
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index efa2885a58..a899c19290 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -14,12 +14,12 @@
     <string name="ga_debug">true</string>
     <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
     <string name="next_tips_and_tricks_not_translate"></string>
-    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">�OpenStreetMap</a></string>
+    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&copy;OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMaps ODbL
     
 	\n\nAll rights belong to OsmAnd app.
 
-	\n\nCopyright � 2010-2014 OsmAnd Authors :
+	\n\nCopyright &copy; 2010-2014 OsmAnd Authors :
 	\n\tVictor Shcherb - all parts of the project, originator
 	\n\tAlexey Pelykh - rendering and core parts
 	\n\tHardy Mueller - main parts of the project, mostly rendering, UI interaction design
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 060a05a869..a4c48dfae1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "�OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "&copy;OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From c0ac9c0398ea447c7e3eb5f2f3c126af96ab596c Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 05:49:16 +0100
Subject: [PATCH 081/138] Use unicode

---
 OsmAnd/res/values/no_translate.xml                           | 2 +-
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index a899c19290..10af09352c 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -19,7 +19,7 @@
     
 	\n\nAll rights belong to OsmAnd app.
 
-	\n\nCopyright &copy; 2010-2014 OsmAnd Authors :
+	\n\nCopyright &#169; 2010-2014 OsmAnd Authors :
 	\n\tVictor Shcherb - all parts of the project, originator
 	\n\tAlexey Pelykh - rendering and core parts
 	\n\tHardy Mueller - main parts of the project, mostly rendering, UI interaction design
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index a4c48dfae1..060a05a869 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "&copy;OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "�OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From 90f15251072a92aff92968e2a448d3c43206a6e5 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 05:56:50 +0100
Subject: [PATCH 082/138] correct coding

---
 OsmAnd/res/values/no_translate.xml                           | 2 +-
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 10af09352c..6571c9cb14 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -14,7 +14,7 @@
     <string name="ga_debug">true</string>
     <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
     <string name="next_tips_and_tricks_not_translate"></string>
-    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&copy;OpenStreetMap</a></string>
+    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169;OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMaps ODbL
     
 	\n\nAll rights belong to OsmAnd app.
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 060a05a869..61d49725d2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "�OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "\u169OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From e77e18a37c7822597f9e5e62cbd6aa3b4dee7fe6 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 06:06:50 +0100
Subject: [PATCH 083/138] corect to hex

---
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 61d49725d2..cc8157a8fa 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "\u169OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "\u00A9OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From 16237ff37e529eed2b93899b7f92d22be9ddabda Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Fri, 28 Nov 2014 06:06:36 +0100
Subject: [PATCH 084/138] Translated using Weblate (Russian)

Currently translated at 99.7% (1564 of 1568 strings)
---
 OsmAnd/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 9b4e3791f1..2b25c0c36b 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1818,4 +1818,6 @@
     <string name="wake_on_voice">Включать экран</string>
     <string name="wake_on_voice_descr">Включать экран телефона при приближении к повороту</string>
     <string name="advanced_settings">Расширенные</string>
+	<string name="map_update">Карты</string>
+	<string name="coordinates">Координаты</string>
 	</resources>

From f4c161f63540ffc1c6a682c6c71ba46efd435d6f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 06:20:19 +0100
Subject: [PATCH 085/138] use blanks as customary

---
 OsmAnd/res/values/no_translate.xml                           | 2 +-
 OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 6571c9cb14..1d83c5e74c 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -14,7 +14,7 @@
     <string name="ga_debug">true</string>
     <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
     <string name="next_tips_and_tricks_not_translate"></string>
-    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169;OpenStreetMap</a></string>
+    <string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
     <string name="about_content">Data is powered by OpenStreetMaps ODbL
     
 	\n\nAll rights belong to OsmAnd app.
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index cc8157a8fa..087d5f2139 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -113,7 +113,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		final TextView textVersionView = (TextView) findViewById(R.id.Copyright);
 		final Calendar inst = Calendar.getInstance();
 		inst.setTime(new Date());
-		final String textVersion = "\u00A9OsmAnd " + inst.get(Calendar.YEAR);
+		final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR);
 		textVersionView.setText(textVersion);
 		final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE);
 		textVersionView.setOnClickListener(new OnClickListener(){

From 0c573e3d0b0282fe2e2fe04259dc5945b4cc7187 Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Fri, 28 Nov 2014 06:18:48 +0100
Subject: [PATCH 086/138] Translated using Weblate (Russian)

Currently translated at 99.7% (1564 of 1568 strings)
---
 OsmAnd/res/values-ru/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 2b25c0c36b..425a52a4c0 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -363,7 +363,7 @@
   <string name="gpx_option_from_start_point">Пройти весь путь</string>
   <string name="switch_to_vector_map_to_see">Для этой позиции доступны локальные векторные карты.\n\t\n\tДля их использования выберите меню \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\".</string>
   <string name="binary_map_download_success">"Загрузка завершена.
-\n\t\n\tВы можете переключиться на использование локальных векторных карт через \"Меню\" → \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\". "</string>
+\n\t\n\tДля использование выберите в \"Меню\" → \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\". "</string>
   <string name="choose_audio_stream">Голосовые инструкции</string>
   <string name="choose_audio_stream_descr">Выберите канал для голосовых инструкций (зависит от системы)</string>
   <string name="voice_stream_voice_call">Поток голосовых звонков</string>
@@ -404,7 +404,7 @@
   <string name="tip_app_mode">Профиль приложения</string>
   
   <string name="tip_navigation">Навигация</string>
-  <string name="tip_navigation_t">Чтобы использовать навигацию, необходимо выбрать точку назначения. После этого нажмите \"Меню\" → \"Навигация\" на карте и выберите тип.</string>
+  <string name="tip_navigation_t">"Чтобы установить пункт назначения, необходимо долгое нажатие на карте (нажать на маркере описания и выбрать \'Пункт назначения\') или выбрать \'Пункт назначения\' после выбора мета в результате поиска или избранном.\n\nПункт назначения  будет отмечен флагом на карте и Osmand покажет расстояние и направления до него (оранжевый треугольник).\n\nТакже вы можете выбрать \'Начать навигацию\', это означает, что Osmand будет вести вас по маршруту давая голосовые инструкции (если включено) и т.д. Или вы можете выбрать \'Отобразить маршрут\' - результатом будет построение и отображение маршрута без учета движения по нему.\n\nДля построения маршрута к пункту назначения из любой точки (не текущее положение), выберите точку на карте и нажмите \'Пункт отправления\'.\n\nЕсли вы используете \'Пункт отправления\' совместно с \'Начать навигацию\', Osmand переключится на ваше настоящее положение как только определит его (можно использовать для начала поездки, до того как определено ваше положение). Если \'Пункт отправления\' использовать с \'Отобразить маршрут\' - будет показан маршрут без обновления действительного положения. "</string>
   <string name="tip_search">Поиск</string>
   <string name="tip_search_t">"Вы можете искать объект на карте, просто разглядывая карту, используя адресный, координатный, POI поиск или выбрать предопределенную избранную точку.\n\n\tНажатие поиск на карте открывает поиск. После поиска имеются 2 варианта : \"Идти к\" или \"Показать на карте\". "</string>
   <string name="tip_map_context_menu">Контекстное меню карты</string>
@@ -750,7 +750,7 @@
   <string name="save_track_interval_descr">Выберите интервал журналирования для записи трека во время навигации</string>
   <string name="save_track_interval">Интервал журналирования во время навигации</string>
   
-  <string name="save_track_to_gpx_descrp">Сохранять треки в папку track во время навигации</string>
+  <string name="save_track_to_gpx_descrp">Треки будут сохранены в папку для треков во время навигации</string>
   <string name="save_track_to_gpx">Журналирование трека в файл GPX во время навигации</string>
   <string name="update_tile">Обновить карту</string>
   <string name="reload_tile">Обновить часть карты</string>

From 78e170296019762830e89f4e8358b81b154ba76f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 06:42:23 +0100
Subject: [PATCH 087/138] try to make OSM copyright clickable

---
 OsmAnd/res/layout/dashboard.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index ff6081cb51..c4e0be2f6f 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -58,7 +58,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
                     android:layout_marginTop="5dp"
-                    android:autoLink="web"
                     android:gravity="right"
                     android:text="@string/openstreetmap_copyright"
                     android:textSize="14sp" />

From 662b745c9a5ffecb281fa3c252b5e051d5978077 Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Fri, 28 Nov 2014 06:28:04 +0100
Subject: [PATCH 088/138] Translated using Weblate (Russian)

Currently translated at 99.7% (1564 of 1568 strings)
---
 OsmAnd/res/values-ru/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 425a52a4c0..8a52dc359c 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -89,10 +89,10 @@
 	\n\t* На карту добавлен новый тип велосипедных дорог (Cycleway=track)
 	\n\t* Исправлены ошибки
 	</string>
-  <string name="tip_day_night_mode_t_v2">"Для векторных карт можно менять оформление между дневным (светлым) и ночным (тёмным). Ночное оформление безопаснее для использования в темноте.
-\n\nДля изменения оформления нажмите на значок настройки на экране карты и выберите \"Дневной/ночной режим\".
+  <string name="tip_day_night_mode_t_v2">"Для векторных карт можно менять оформление между дневным (светлым) и ночным (тёмным). Ночное оформление безопаснее и комфортнее для использования в темноте.
+\n\nВыбрать политику переключения дневного/ночного режима можно в \"Меню\" → \"Настройка карты\" →  \"Дневной/ночной режим\".
 \n\nДоступные варианты:
-\n\t* \"Восход/Закат\" - режим переключается в зависимости от положения солнца (используется по умолчанию)
+\n\t* \"Восход/Закат\" - автоматический режим, переключается в зависимости от положения солнца (используется по умолчанию)
 \n\t* \"Дневной\" - всегда использовать дневной режим
 \n\t* \"Ночной\" - всегда использовать ночной режим
 \n\t* \"Датчик освещённости\" - режим переключается в зависимости от показаний датчика освещённости Вашего устройства (при его наличии) "</string>  
@@ -361,7 +361,7 @@
   <string name="gpx_option_reverse_route">Выбрать обратное направление пути</string>
   <string name="gpx_option_destination_point">Использовать текущую точку назначения</string>
   <string name="gpx_option_from_start_point">Пройти весь путь</string>
-  <string name="switch_to_vector_map_to_see">Для этой позиции доступны локальные векторные карты.\n\t\n\tДля их использования выберите меню \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\".</string>
+  <string name="switch_to_vector_map_to_see">Для этой позиции доступны локальные векторные карты.\n\t\n\tДля их использования выберите в \"Меню\" → \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\".</string>
   <string name="binary_map_download_success">"Загрузка завершена.
 \n\t\n\tДля использование выберите в \"Меню\" → \"Настройка карты\" → \"Источник карты…\" → \"Векторные карты\". "</string>
   <string name="choose_audio_stream">Голосовые инструкции</string>
@@ -540,7 +540,7 @@
   <string name="voice">Голосовые данные</string>
   <string name="no_vector_map_loaded">Векторные карты не загружены в приложение</string>
   <string name="map_route_by_gpx">Навигация по GPX</string>
-  <string name="gpx_files_not_found">Файлы GPX не найдены в директории /osmand/tracks</string>
+  <string name="gpx_files_not_found">Файлы GPX не найдены в папке с треками</string>
   <string name="layer_gpx_layer">Трек GPX…</string>
   <string name="error_reading_gpx">Ошибка чтения данных GPX</string>
   <string name="vector_data">Локальные векторные карты</string>

From 0045d2eb174dae3da8b9d632687bcb7ab85f57d2 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 07:01:54 +0100
Subject: [PATCH 089/138] comment

---
 OsmAnd/res/values/no_translate.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 1d83c5e74c..1fa6171e58 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -3,8 +3,9 @@
     <string name="app_name_ver">OsmAnd 1.9.3</string>
     <string name="app_name">OsmAnd~</string>
     <!--
-    When changing the following app_version string please remember to keep the version prefix for our apk in sync at
+    When changing the following app_version string please remember to keep the version prefix for our dev apks in sync at
     http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}D )
+    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}D )
     -->
     <string name="app_version">1.9.3</string>
 

From 847823e88ee6a711686cd07d14924d7d8bf2e253 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 07:13:08 +0100
Subject: [PATCH 090/138] test automating dev build base version prefix

---
 OsmAnd/res/values/no_translate.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 1fa6171e58..92c94330c2 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -2,12 +2,11 @@
 <resources>
     <string name="app_name_ver">OsmAnd 1.9.3</string>
     <string name="app_name">OsmAnd~</string>
+    <string name="app_version">1.9.3a</string>
     <!--
-    When changing the following app_version string please remember to keep the version prefix for our dev apks in sync at
-    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}D )
-    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}D )
+    Note: The above APK base version display is provided as the build number prefix to our dev APKs via the builder configs, e.g.
+    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} $APK_VERSION#${BUILD_NUMBER}D )
     -->
-    <string name="app_version">1.9.3</string>
 
     <!-- Not translatable -->
     <string name="ga_api_key">UA-28342846-2</string>

From d9bdd7f2985fd6de9258dc8c2330d65d155e387d Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 07:32:53 +0100
Subject: [PATCH 091/138] comment for dev build base version prefix

---
 OsmAnd/res/values/no_translate.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 92c94330c2..06044c7042 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name_ver">OsmAnd 1.9.3</string>
     <string name="app_name">OsmAnd~</string>
-    <string name="app_version">1.9.3a</string>
+    <string name="app_name_ver">OsmAnd 1.9.3</string>
+    <string name="app_version">1.9.3</string>
     <!--
-    Note: The above APK base version display is provided as the build number prefix to our dev APKs via the builder configs, e.g.
-    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main-default/configure  ( Ant, Properties, build.version=${GIT_BRANCH} $APK_VERSION#${BUILD_NUMBER}D )
+    Note: The above app_version should also provided as the build number prefix ('based-on version') to our dev APKs via the builder configs, e.g.
+    http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}M )
+    MUST BE KEPT IN SYNC THERE MNUALLY!
     -->
 
     <!-- Not translatable -->

From 777986c9c91a92350f1660cd1bbd56ef0717437d Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 07:44:52 +0100
Subject: [PATCH 092/138] trigger build

---
 OsmAnd/res/values/no_translate.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 06044c7042..56e5518ab9 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -6,7 +6,7 @@
     <!--
     Note: The above app_version should also provided as the build number prefix ('based-on version') to our dev APKs via the builder configs, e.g.
     http://builder.osmand.net:8080/view/OsmAnd%20Builds/job/OsmAnd-main/configure  ( Ant, Properties, build.version=${GIT_BRANCH} 1.9.3#${BUILD_NUMBER}M )
-    MUST BE KEPT IN SYNC THERE MNUALLY!
+    MUST BE KEPT IN SYNC THERE MANUALLY!
     -->
 
     <!-- Not translatable -->

From 9035b895fb5aee83146f9b322aead854b0500b58 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@ovi.com>
Date: Fri, 28 Nov 2014 07:47:54 +0100
Subject: [PATCH 093/138] Translated using Weblate (Catalan)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-ca/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index ab52bff3c9..b33dd7675e 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1902,4 +1902,5 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
 	<string name="show_map">VEURE EL MAPA</string>
 	<string name="show_all">VEURE TOT</string>
 	<string name="coordinates">Coordenades</string>
+	<string name="map_update">Mapes</string>
 	</resources>

From 7cedd373fa12ef9f8b3048e0ef7b77ab33456d33 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 08:33:43 +0100
Subject: [PATCH 094/138] try automatically preserve app_version in build
 version

---
 OsmAnd/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 25fafdeee3..bfe5113369 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -200,7 +200,7 @@
 				<isset property="build.version" />
 			</condition>
 			<then>
-				<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;${build.version}&lt;' byline="true" />
+				<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;\1${build.version}&lt;' byline="true" />
 			</then>
 		</if>
 

From 266e51fdcb6f92d7f38176d0259924ed0ccc88fc Mon Sep 17 00:00:00 2001
From: Jurijus <atvejis@gmail.com>
Date: Fri, 28 Nov 2014 08:44:01 +0100
Subject: [PATCH 095/138] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-lt/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 12cda3fb42..9577ba6297 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -625,7 +625,7 @@
   <string name="voice">Balsas</string>
   <string name="no_vector_map_loaded">Vektoriniai žemėlapiai neįkelti</string>
   <string name="map_route_by_gpx">Vykdyti navigaciją naudojant GPX</string>
-  <string name="gpx_files_not_found">tracks segtuve nerasta jokių GPX failų</string>
+  <string name="gpx_files_not_found">Tracks segtuve nerasta jokių GPX failų</string>
   <string name="layer_gpx_layer">GPX maršrutas…</string>
   <string name="error_reading_gpx">Įvyko klaida skaitant GPX duomenis</string>
   <string name="vector_data">Parsiųsti vektoriniai žemėlapiai</string>
@@ -1846,4 +1846,10 @@
     <string name="osmo_use_https">Naudoti https</string>
 	<string name="osmo_use_https_descr">Prie serverio jungtis saugiu ryšiu</string>
     <string name="advanced_settings">Plačiau</string>
+	<string name="home_button">Pradžia</string>
+    <string name="map_update">Žemėlapiai</string>
+	<string name="search_for">Ieškoti (ko)</string>
+	<string name="show_map">RODYTI ŽEMĖLAPĮ</string>
+	<string name="show_all">RODYTI VISKĄ</string>
+	<string name="coordinates">Koordinatės</string>
 	</resources>

From 5349f508c5798c2d74738fba37faee5e1d4fdea4 Mon Sep 17 00:00:00 2001
From: xmd5a2 <lornaderek@mail.ru>
Date: Fri, 28 Nov 2014 10:46:55 +0300
Subject: [PATCH 096/138] Update de and ja translations

---
 OsmAnd/res/values-de/phrases.xml | 67 +++++++++++++++++++++++++++++++-
 OsmAnd/res/values-ja/phrases.xml | 24 ++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/res/values-ja/phrases.xml

diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 0764e9e788..6010f5f353 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -1,5 +1,70 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources><string name="poi_bakery">Bäckerei</string>
+<resources>
+	<string name="poi_bus_stop">Bushaltestelle</string>
+	<string name="poi_cafe">Café</string>
+	<string name="poi_car_rental">Autovermietung</string>
+	<string name="poi_car_parts_shop">Autoteilehändler</string>
+	<string name="poi_city_wall">Stadtmauer</string>
+	<string name="poi_club_art">Kunsthandlung</string>
+	<string name="poi_club_charity">Sozialkaufhaus</string>
+	<string name="poi_club_chess">Schach</string>
+	<string name="poi_club_cinema">Kino</string>
+	<string name="poi_club_computer">Computergeschäft</string>
+	<string name="poi_club_motorcycle">Motorradgeschäft</string>
+	<string name="poi_club_music">Musikladen</string>
+	<string name="poi_club_shooting">Sportschießen</string>
+	<string name="poi_club_theatre">Theater</string>
+	<string name="poi_doctors">Arzt</string>
+	<string name="poi_hospital">Krankenhaus</string>
+	<string name="poi_hostel">Jugendherberge</string>
+	<string name="poi_hotel">Hotel</string>
+	<string name="poi_mine_historic">Historisches bergwerk</string>
+	<string name="poi_monastery">Kloster</string>
+	<string name="poi_motel">Motel</string>
+	<string name="poi_monument">Monument</string>
+	<string name="poi_strait">Straße</string>
+	<string name="poi_theme_park">Vergnügungspark</string>
+	<string name="poi_traffic_calming_bump">Bodenwelle</string>
+	<string name="poi_traffic_calming_chicane">Schikane</string>
+	<string name="poi_traffic_calming_choker">Fahrbahnverengung</string>
+	<string name="poi_traffic_calming_cushion">Bodenwelle</string>
+	<string name="poi_traffic_calming_hump">Bodenwelle</string>
+	<string name="poi_traffic_calming_rumble_strip">Holperstreifen</string>
+	<string name="poi_traffic_calming_table">Bodenwelle</string>
+	<string name="poi_zoo">Zoo</string>
+	<string name="poi_beachvolleyball">Beachvolleyball</string>
+	<string name="poi_beach_resort">Badeort</string>
+	<string name="poi_beach">Strand</string>
+	<string name="poi_basketball">Basketball</string>
+	<string name="poi_battlefield">Schlachtfeld</string>
+	<string name="poi_bank">Bank</string>
+	<string name="poi_bar">Bar</string>
+	<string name="poi_baby_hatch">Babyklappe</string>
+	<string name="poi_attraction">Attraktion</string>
+	<string name="poi_architect_office">Architekt</string>
+	<string name="poi_archery">Bogenschießen</string>
+	<string name="poi_ambulance_station">Rettungswache</string>
+	<string name="poi_alpine_hut">Berghütte</string>
+	<string name="poi_alcohol">Spirituosenladen</string>
+	<string name="poi_airport">Flugfeld</string>
+	<string name="poi_aeroway_gate">Flughafen-Gate</string>
+	<string name="poi_runway">Start-/Landebahn</string>
+	<string name="poi_aerialway_cable_car">Seilbahn</string>
+	<string name="poi_aerialway_chair_lift">Sessellift</string>
+	<string name="poi_aerialway_drag_lift">Schlepplift</string>
+	<string name="poi_aerialway_gondola">Gondel</string>
+	<string name="poi_aerialway_goods">Güterseilbahn</string>
+	<string name="poi_aerialway_mixed_lift">Hybrid-Lift</string>
+	<string name="poi_aerialway_station">Seilbahnstation</string>
+	<string name="poi_hamlet">Weiler</string>
+	<string name="poi_village">Dorf</string>
+	<string name="poi_town">Kleinstadt</string>
+	<string name="poi_city">Stadt</string>
+	<string name="poi_adit">Stollen</string>
+	<string name="poi_10pin">Bowling</string>
+	<string name="poi_9pin">Kegeln</string>
+
+	<string name="poi_bakery">Bäckerei</string>
 	<string name="poi_mall">Einkaufszentrum</string>
 	<string name="poi_butcher">Fleischerei</string>
 	<string name="poi_supermarket">Supermarkt</string>
diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml
new file mode 100644
index 0000000000..38988efc3c
--- /dev/null
+++ b/OsmAnd/res/values-ja/phrases.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<resources>
+	<string name="poi_airport">空港</string>
+	<string name="poi_bank">銀行</string>
+	<string name="poi_bus_stop">バス停</string>
+	<string name="poi_car_rental">レンタカー</string>
+	<string name="poi_car_wash">洗車</string>
+	<string name="poi_casino">賭場</string>
+	<string name="poi_city">市</string>
+	<string name="poi_college">大学</string>
+	<string name="poi_dentist">歯科医</string>
+	<string name="poi_embassy">大使館</string>
+	<string name="poi_hotel">ホテル</string>
+	<string name="poi_kindergarten">幼稚園</string>
+	<string name="poi_library">図書館</string>
+	<string name="poi_pub">パブ（立ち吞み屋）</string>
+	<string name="poi_sauna">サウナ</string>
+	<string name="poi_school">学校</string>
+	<string name="poi_general_shop">店舗</string>
+	<string name="poi_taxi">タクシー乗り場</string>
+	<string name="poi_theme_park">テーマパーク</string>
+	<string name="poi_university">大学</string>
+	<string name="poi_zoo">動物園</string>
+</resources>
\ No newline at end of file

From 626a69a02e3b8ab9701717a46a551138c8a95221 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 08:47:12 +0100
Subject: [PATCH 097/138] This kept the old build number, not the original
 string value of app_version

---
 OsmAnd/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index bfe5113369..25fafdeee3 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -200,7 +200,7 @@
 				<isset property="build.version" />
 			</condition>
 			<then>
-				<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;\1${build.version}&lt;' byline="true" />
+				<replaceregexp file="res/values/no_translate.xml" match='"app_version"&gt;(.*)&lt;' replace='"app_version"&gt;${build.version}&lt;' byline="true" />
 			</then>
 		</if>
 

From 2d3fc7de9a9dbfbb7b6c79467ea7bfa1d6e09573 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Fri, 28 Nov 2014 08:34:53 +0100
Subject: [PATCH 098/138] Translated using Weblate (Italian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 480109a780..93d31d81c7 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -169,7 +169,7 @@
   <string name="show_more_map_detail_descr">Visualizza qualche dettaglio delle mappe vettoriali (strade ecc.) anche agli zoom piu\' bassi</string>
   <string name="favourites_delete_multiple_succesful">Punto/i preferito/i eliminati.</string>
   <string name="favorite_delete_multiple">Stai eliminando %1$d preferito/i e %2$d gruppo/i preferito/i. Sicuro?</string>
-  <string name="favorite_home_category">Casa</string>
+  <string name="favorite_home_category">Finestra iniziale</string>
   <string name="favorite_friends_category">Amici</string>
   <string name="favorite_places_category">Luoghi</string>
   <string name="favorite_default_category">Altro</string>

From 5e9a9d011008da7c1347cdcb16327099b078ebdf Mon Sep 17 00:00:00 2001
From: Jurijus <atvejis@gmail.com>
Date: Fri, 28 Nov 2014 08:48:04 +0100
Subject: [PATCH 099/138] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-lt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 9577ba6297..ba4bc15764 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1846,7 +1846,7 @@
     <string name="osmo_use_https">Naudoti https</string>
 	<string name="osmo_use_https_descr">Prie serverio jungtis saugiu ryšiu</string>
     <string name="advanced_settings">Plačiau</string>
-	<string name="home_button">Pradžia</string>
+	<string name="home_button">Namai</string>
     <string name="map_update">Žemėlapiai</string>
 	<string name="search_for">Ieškoti (ko)</string>
 	<string name="show_map">RODYTI ŽEMĖLAPĮ</string>

From 70efe8ff96bffed51f9e9d029029872e8b034486 Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Fri, 28 Nov 2014 09:31:27 +0100
Subject: [PATCH 100/138] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-be/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index f0573c5bee..f4e3e7f64a 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1955,4 +1955,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="advanced_settings">Дадатковыя</string>
 	<string name="osmo_use_https_descr">Выкарыстоўваць бясьпечнае злучэньне з серверам</string>
     <string name="osmo_use_https">Выкарыстоўваць HTTPS</string>
+	<string name="home_button">Дамоў</string>
+    <string name="map_update">Мапы</string>
+	<string name="search_for">Шукаць</string>
+	<string name="show_map">ПАКАЗАЦЬ МАПУ</string>
+	<string name="show_all">ПАКАЗАЦЬ УСЁ</string>
+	<string name="coordinates">Каардынаты</string>
 	</resources>

From 72eaca0152c8998d9fdab30ed0e45aea2c26df95 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Fri, 28 Nov 2014 09:40:14 +0100
Subject: [PATCH 101/138] Update no_translate.xml

---
 OsmAnd/res/values/no_translate.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 56e5518ab9..6d4db19d43 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -20,20 +20,19 @@
     
 	\n\nAll rights belong to OsmAnd app.
 
-	\n\nCopyright &#169; 2010-2014 OsmAnd Authors :
-	\n\tVictor Shcherb - all parts of the project, originator
-	\n\tAlexey Pelykh - rendering and core parts
-	\n\tHardy Mueller - main parts of the project, mostly rendering, UI interaction design
-
+	\n\nCopyright &#169; 2010-2014 OsmAnd
 	\n\nCredits to all major Contributors/Developers :
-	\n\tVictor Shcherb - project lead
-	\n\tPavol Zibrita - first contributor and developer of some utilities
+	\n\tVictor Shcherb - project lead.
+	\n\tDr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
+	\n\tAlexey Pelykh - C++ developer, created native library and made application much snappier.
+	\n\tLeonid (xmd5a) - co-author of main OsmAnd rendering, author of UniRS, LightRS styles.
 	\n\tDusan Kazik - one of the first contributors
 	\n\tAndre Van Atten - project supporter, active forum participant, one of the first users.
-	\n\tDr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
+	
 	\n\tYvecai - main contributor to Contour Lines and Hillshade maps
-	\n\tAlexey Pelykh - C++ developer, created native library and made application much snappier.
+	
 	\n\tMax (Zahnstocher) - Java contributor, active forum participant.
+	\n\tPavol Zibrita - first contributor and developer of some utilities
 	\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
     </string>
 </resources>

From 8c6f9c7509415786d8b531f87f164cccfd958f5a Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@gmail.com>
Date: Fri, 28 Nov 2014 09:13:35 +0100
Subject: [PATCH 102/138] Translated using Weblate (French)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-fr/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 506f3c10ba..52133e69bc 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1025,8 +1025,8 @@
 \n* Nombreuses corrections de bugs "</string>
 <string name="snap_to_road_descr">Coller à la route pendant la navigation</string>
 <string name="snap_to_road">Coller à la route</string>
-<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans un répertoire paramétrable) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. "</string>
-<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans un répertoire paramétrable) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse"</string>
+<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. "</string>
+<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse "</string>
 <string name="tip_map_switch_t_v2">"La source des cartes et des couches affichées est modifiable via \'Menu\' → \'Affichage de la carte\' → \'Source de la carte…\'.
 \n\tVous pouvez choisir entre les cartes vectorielles hors-ligne préchargées (choix par défaut, nécessaires pour la navigation hors-ligne), ou des sources prédéfinies de tuiles de carte en ligne ou en cache (activer le greffon \'Cartes en ligne\' pour cela), ou des cartes créées manuellement sur un PC grâce à OsmAndMapCreator.
 \n\tOsmAnd supporte également des sources personnalisées. "</string>

From 4c64aa8ec003e7437a61b3c587f52a491759e839 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Fri, 28 Nov 2014 09:40:26 +0100
Subject: [PATCH 103/138] Update no_translate.xml

---
 OsmAnd/res/values/no_translate.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 6d4db19d43..6bea8477b3 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -28,9 +28,7 @@
 	\n\tLeonid (xmd5a) - co-author of main OsmAnd rendering, author of UniRS, LightRS styles.
 	\n\tDusan Kazik - one of the first contributors
 	\n\tAndre Van Atten - project supporter, active forum participant, one of the first users.
-	
 	\n\tYvecai - main contributor to Contour Lines and Hillshade maps
-	
 	\n\tMax (Zahnstocher) - Java contributor, active forum participant.
 	\n\tPavol Zibrita - first contributor and developer of some utilities
 	\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.

From 4021f81d3ffeafa96ac320cb5fd0795c0b5d231c Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 28 Nov 2014 11:22:09 +0200
Subject: [PATCH 104/138] Fixed merge bugs

---
 .../plus/activities/DashboardActivity.java    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 087d5f2139..d9cbabe8b8 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -2,16 +2,20 @@ package net.osmand.plus.activities;
 
 
 import java.io.File;
+import java.lang.ref.WeakReference;
 import java.text.MessageFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Random;
 
+import android.support.v4.app.Fragment;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
+import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.dashboard.DashFavoritesFragment;
 import net.osmand.plus.dashboard.DashMapFragment;
 import net.osmand.plus.dashboard.DashPluginsFragment;
@@ -19,6 +23,7 @@ import net.osmand.plus.dashboard.DashSearchFragment;
 import net.osmand.plus.dashboard.DashUpdatesFragment;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.DownloadActivity;
+import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.render.MapRenderRepositories;
 import net.osmand.plus.sherpafy.TourViewActivity;
 import android.app.Activity;
@@ -460,4 +465,29 @@ public class DashboardActivity extends BaseDownloadActivity {
 		textVersionView.setText(content);
 		textVersionView.setMovementMethod(LinkMovementMethod.getInstance());
 	}
+
+	@Override
+	public void updateProgress(boolean updateOnlyProgress) {
+		BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask = BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask();
+		for(WeakReference<Fragment> ref : fragList) {
+			Fragment f = ref.get();
+			if(f instanceof DashUpdatesFragment) {
+				if(!f.isDetached()) {
+					((DashUpdatesFragment) f).updateProgress(basicProgressAsyncTask, updateOnlyProgress);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void updateDownloadList(List<IndexItem> list){
+		for(WeakReference<Fragment> ref : fragList) {
+			Fragment f = ref.get();
+			if(f instanceof DashUpdatesFragment) {
+				if(!f.isDetached()) {
+					((DashUpdatesFragment) f).updatedDownloadsList(list);
+				}
+			}
+		}
+	}
 }

From 1218f607fd11fb8c45aa4b426bec75974ea8f71e Mon Sep 17 00:00:00 2001
From: xmd5a2 <lornaderek@mail.ru>
Date: Fri, 28 Nov 2014 12:55:50 +0300
Subject: [PATCH 105/138] Add french phrases translations. Update phrases.

---
 OsmAnd/res/values-fr/phrases.xml | 388 +++++++++++++++++++++++++++++++
 OsmAnd/res/values/phrases.xml    |   8 +
 2 files changed, 396 insertions(+)
 create mode 100644 OsmAnd/res/values-fr/phrases.xml

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
new file mode 100644
index 0000000000..823c4f4cce
--- /dev/null
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -0,0 +1,388 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+	<string name="poi_10pin">Bowling américain</string>
+	<string name="poi_9pin">Bowling à 9 quilles</string>
+	<string name="poi_adit">Galerie de mine</string>
+	<string name="poi_aerialway_cable_car">Téléphérique</string>
+	<string name="poi_aerialway_chair_lift">Télésiège</string>
+	<string name="poi_aerialway_drag_lift">Téléski</string>
+	<string name="poi_aerialway_gondola">Télécabine</string>
+	<string name="poi_aerialway_goods">Transport de biens par câble aérien</string>
+	<string name="poi_aerialway_mixed_lift">Télécabines et télésièges</string>
+	<string name="poi_aerialway_station">Station de transport aérien par câble</string>
+	<string name="poi_aeroway_gate">Porte d\'embarquement</string>
+	<string name="poi_runway">Aérodrome : piste</string>
+	<string name="poi_airport">Aérodrome</string>
+	<string name="poi_alcohol">Magasin de boissons alcoolisées</string>
+	<string name="poi_alpine_hut">Refuge</string>
+	<string name="poi_ambulance_station">Station d\'ambulances</string>
+	<string name="poi_archaeological_site">Site archéologique</string>
+	<string name="poi_archery">Tir à l\'arc</string>
+	<string name="poi_architect_office">Architecte</string>
+	<string name="poi_arts_centre">Centre artistique</string>
+	<string name="poi_artwork">Œuvre d’art</string>
+	<string name="poi_athletics">Athlétisme</string>
+	<string name="poi_atm">Distributeur de billets</string>
+	<string name="poi_attraction">Attraction touristique</string>
+	<string name="poi_baby_hatch">Tour d\'abandon</string>
+	<string name="poi_bailiff">Administration publique</string>
+	<string name="poi_bakery">Boulangerie</string>
+	<string name="poi_bank">Banque</string>
+	<string name="poi_bar">Bar</string>
+	<string name="poi_military_barracks">Caserne</string>
+	<string name="poi_baseball">Baseball</string>
+	<string name="poi_basketball">Basket-ball</string>
+	<string name="poi_battlefield">Champ de bataille</string>
+	<string name="poi_beach">Plage</string>
+	<string name="poi_beach_resort">Station balnéaire</string>
+	<string name="poi_beachvolleyball">Beach-volley</string>
+	<string name="poi_beacon">Signal</string>
+	<string name="poi_seamark_beacon_cardinal">Marque cardinale (balise fixe)</string>
+	<string name="poi_seamark_beacon_lateral">Marque latérale (balise fixe)</string>
+	<string name="poi_seamark_beacon_safe_water">Marque d\'eaux saines (balise fixe)</string>
+	<string name="poi_seamark_beacon_special_purpose">Marque spéciale (balise fixe)</string>
+	<string name="poi_beauty_salon">Salon de beauté</string>
+	<string name="poi_beverages">Magasin de boissons</string>
+	<string name="poi_bicycle_shop">Magasin de vélos</string>
+	<string name="poi_bicycle_parking">Parking à vélos</string>
+	<string name="poi_bicycle_rental">Location de vélos</string>
+	<string name="poi_biergarten">Biergarten</string>
+	<string name="poi_bitcoin_yes">Paiement par bitcoins</string>
+	<string name="poi_boat_sharing">Partage de voiliers</string>
+	<string name="poi_boatyard">Cale sèche</string>
+	<string name="poi_bookshop">Librairie</string>
+	<string name="poi_boules">Jeu de boules</string>
+	<string name="poi_boundary_stone">Borne frontière</string>
+	<string name="poi_boutique">Boutique de mode</string>
+	<string name="poi_bowls">Boulingrin</string>
+	<string name="poi_brewery">Brasserie</string>
+	<string name="poi_bridge">Pont</string>
+	<string name="poi_brothel">Maison de prostitution</string>
+	<string name="poi_place_of_worship_buddhist">Bouddhisme</string>
+	<string name="poi_military_bunker">Casemate</string>
+	<string name="poi_seamark_buoy_cardinal">Marque cardinale (balise flottante)</string>
+	<string name="poi_seamark_buoy_installation">Bouée de chargement/déchargement</string>
+	<string name="poi_seamark_buoy_isolated_danger">Marque de danger isolé (balise flottante)</string>
+	<string name="poi_seamark_buoy_lateral">Marque latérale (balise flottante)</string>
+	<string name="poi_seamark_buoy_safe_water">Marque d\'eaux saines (balise flottante)</string>
+	<string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string>
+	<string name="poi_bus_station">Gare routière</string>
+	<string name="poi_bus_stop">Arrêt de bus</string>
+	<string name="poi_butcher">Boucherie - Charcuterie</string>
+	<string name="poi_cafe">Café</string>
+	<string name="poi_camp_site">Camping</string>
+	<string name="poi_canoe">Canoë-kayak</string>
+	<string name="poi_cape">Cap</string>
+	<string name="poi_car_shop">Magasin de voitures</string>
+	<string name="poi_car_parts_shop">Pièces d\'automobile</string>
+	<string name="poi_car_rental">Location de voitures</string>
+	<string name="poi_car_repair">Atelier de réparation automobile</string>
+	<string name="poi_car_sharing">Autopartage</string>
+	<string name="poi_car_wash">Lavage de voitures</string>
+	<string name="poi_caravan_site">Aire de camping-car</string>
+	<string name="poi_carpenter">Charpentier</string>
+	<string name="poi_casino">Casino</string>
+	<string name="poi_castle">Château</string>
+	<string name="poi_cave_entrance">Entrée de grotte</string>
+	<string name="poi_cemetery">Cimetière</string>
+	<string name="poi_chalet">Meublé de tourisme</string>
+	<string name="poi_charging_station">Station de recharge</string>
+	<string name="poi_chemist_shop">Magasin de produits d\'hygiène</string>
+	<string name="poi_city">Ville</string>
+	<string name="poi_city_wall">Remparts</string>
+	<string name="poi_climbing">Escalade</string>
+	<string name="poi_clinic">Clinique</string>
+	<string name="poi_clothes_shop">Magasin de vêtements</string>
+	<string name="poi_club_art">Boutique d\'art</string>
+	<string name="poi_club_charity">Magasin de bienfaisance</string>
+	<string name="poi_club_chess">Échecs</string>
+	<string name="poi_club_cinema">Cinéma</string>
+	<string name="poi_club_computer">Magasin informatique</string>
+	<string name="poi_club_motorcycle">Magasin de moto</string>
+	<string name="poi_club_music">Disquaire</string>
+	<string name="poi_club_shooting">Tir</string>
+	<string name="poi_club_theatre">Théâtre</string>
+	<string name="poi_college">Enseignement supérieur</string>
+	<string name="poi_communication_tower">Tour de télécommunication</string>
+	<string name="poi_compressed_air">Station de gonflage des pneumatiques</string>
+	<string name="poi_confectionery">Confiserie</string>
+	<string name="poi_construction">Voie ferrée en construction</string>
+	<string name="poi_convenience">Épicerie</string>
+	<string name="poi_copyshop">Magasin de photocopies</string>
+	<string name="poi_cosmetics_shop">Magasin de cosmétiques</string>
+	<string name="poi_courthouse">Palais de justice</string>
+	<string name="poi_crater">Cratère</string>
+	<string name="poi_crematorium">Crématorium</string>
+	<string name="poi_cricket">Cricket</string>
+	<string name="poi_cricket_nets">Cricket (filets d\'entraînement)</string>
+	<string name="poi_croquet">Croquet</string>
+	<string name="poi_currencyexchange">Bureau de change</string>
+	<string name="poi_dam">Barrage</string>
+	<string name="poi_dance_floor">Salle de danse</string>
+	<string name="poi_military_danger_area">Zone d\'exclusion</string>
+	<string name="poi_deli">Épicerie fine</string>
+	<string name="poi_dentist">Dentiste</string>
+	<string name="poi_department_store">Grand magasin</string>
+	<string name="poi_diving">Plongeon</string>
+	<string name="poi_doctors">Médecin</string>
+	<string name="poi_dog_park">Parc pour chiens</string>
+	<string name="poi_dog_racing">Courses de chiens</string>
+	<string name="poi_doityourself">Magasin de bricolage</string>
+	<string name="poi_drinking_water">Eau potable</string>
+	<string name="poi_driving_school">École de conduite</string>
+	<string name="poi_pharmacy">Pharmacie</string>
+	<string name="poi_dry_cleaning">Pressing</string>
+	<string name="poi_seamark_dyke">Digue</string>
+	<string name="poi_electrician">Électricien</string>
+	<string name="poi_electronics_shop">Magasin d\'électronique</string>
+	<string name="poi_embassy">Ambassade</string>
+	<string name="poi_emergency_access_point">Point d\'accès d\'urgence</string>
+	<string name="poi_emergency_phone">Téléphone de secours</string>
+	<string name="poi_employment_agency">Agence d\'emploi</string>
+	<string name="poi_equestrian">Sport équestre</string>
+	<string name="poi_estate_agent">Agence immobilière</string>
+	<string name="poi_fabric_shop">Magasin de tissus</string>
+	<string name="poi_fast_food">Restauration rapide</string>
+	<string name="poi_ferry_terminal">Terminal de ferry</string>
+	<string name="poi_fire_extinguisher">Extincteur</string>
+	<string name="poi_fire_hose">Tuyau d\'incendie</string>
+	<string name="poi_fire_hydrant">Bouche d\'incendie</string>
+	<string name="poi_fire_station">Caserne de pompiers</string>
+	<string name="poi_first_aid">Premiers secours</string>
+	<string name="poi_fishing_shop">Zone de pêche</string>
+	<string name="poi_florist">Fleuriste</string>
+	<string name="poi_seamark_fog_signal">Signal de brume</string>
+	<string name="poi_food_court">Aire de restauration</string>
+	<string name="poi_ford">Gué</string>
+	<string name="poi_fountain">Fontaine</string>
+	<string name="poi_fuel">Carburant</string>
+	<string name="poi_funeral_directors">Pompes funèbres</string>
+	<string name="poi_funicular">Voie de funiculaire</string>
+	<string name="poi_furniture_shop">Magasin d\'ameublement</string>
+	<string name="poi_garden_centre">Jardinerie</string>
+	<string name="poi_general_shop">Magasin généraliste</string>
+	<string name="poi_gift_shop">Boutique de cadeaux</string>
+	<string name="poi_glacier">Glacier</string>
+	<string name="poi_glaziery_shop">Vitrier</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_golf_course">Terrain de golf</string>
+	<string name="poi_grave_yard">Cimetière</string>
+	<string name="poi_greengrocer">Marchand de fruits et légumes</string>
+	<string name="poi_grit_bin">Bac à sel</string>
+	<string name="poi_guest_house">Chambre d\'hôtes</string>
+	<string name="poi_gymnastics">Gymnastique</string>
+	<string name="poi_hairdresser">Coiffeur</string>
+	<string name="poi_hamlet">Hameau</string>
+	<string name="poi_seamark_harbour">Port</string>
+	<string name="poi_seamark_harbour_basin">Bassin portuaire</string>
+	<string name="poi_hardware_shop">Quincaillerie</string>
+	<string name="poi_hearing_aids">Audioprothésiste</string>
+	<string name="poi_helipad">Hélisurface</string>
+	<string name="poi_hifi_shop">Magasin Hi-Fi</string>
+	<string name="poi_place_of_worship_hindu">Hindouisme</string>
+	<string name="poi_hockey">Hockey</string>
+	<string name="poi_horse_track">Courses hippiques</string>
+	<string name="poi_hospital">Hôpital</string>
+	<string name="poi_hostel">Auberge de jeunesse</string>
+	<string name="poi_hotel">Hôtel</string>
+	<string name="poi_hunting_stand">Affût surélevé</string>
+	<string name="poi_ice_cream">Crème glacée</string>
+	<string name="poi_ice_rink">Patinoire</string>
+	<string name="poi_ice_stock">Eisstock</string>
+	<string name="poi_tourism_information">Informations touristiques</string>
+	<string name="poi_insurance">Assurance</string>
+	<string name="poi_island">Île</string>
+	<string name="poi_islet">Îlot</string>
+	<string name="poi_isolated_dwelling">Habitation isolée</string>
+	<string name="poi_it_office">Technologies de l\'information et de la communication</string>
+	<string name="poi_jewelry_shop">Bijouterie</string>
+	<string name="poi_key_cutter">Reproduction de clefs</string>
+	<string name="poi_kindergarten">Petite enfance</string>
+	<string name="poi_kiosk">Kiosque</string>
+	<string name="poi_korfbal">Korfball</string>
+	<string name="poi_landfill">Décharge</string>
+	<string name="poi_seamark_landmark">Point de repère</string>
+	<string name="poi_laundry">Laverie</string>
+	<string name="poi_lawyer">Juriste</string>
+	<string name="poi_level_crossing">Passage à niveau</string>
+	<string name="poi_library">Bibliothèque</string>
+	<string name="poi_seamark_light">Feu</string>
+	<string name="poi_seamark_light_float">Bateau-feu (petit)</string>
+	<string name="poi_seamark_light_major">Feu majeur</string>
+	<string name="poi_seamark_light_minor">Feu mineur</string>
+	<string name="poi_seamark_light_vessel">Bateau-feu</string>
+	<string name="poi_lighthouse">Phare</string>
+	<string name="poi_locality">Lieu-dit</string>
+	<string name="poi_lock_gate">Porte d\'écluse</string>
+	<string name="poi_locksmith">Serrurier</string>
+	<string name="poi_mall">Galerie marchande</string>
+	<string name="poi_marina">Port de plaisance</string>
+	<string name="poi_marketplace">Marché</string>
+	<string name="poi_massage">Massage</string>
+	<string name="poi_memorial">Mémorial</string>
+	<string name="poi_military">Zone militaire</string>
+	<string name="poi_mine_historic">Mine abandonnée</string>
+	<string name="poi_mineshaft">Puits de mine</string>
+	<string name="poi_miniature_golf">Golf miniature</string>
+	<string name="poi_mobile_phone_shop">Magasin de téléphones mobiles</string>
+	<string name="poi_monastery">Monastère</string>
+	<string name="poi_money_lender">Usurier</string>
+	<string name="poi_monument">Monument commémoratif</string>
+	<string name="poi_motel">Motel</string>
+	<string name="poi_motorcycle_parking">Parking pour motos</string>
+	<string name="poi_motorway_junction">Jonction d\'autoroutes</string>
+	<string name="poi_multi_sport">Multisports</string>
+	<string name="poi_museum">Musée</string>
+	<string name="poi_musical_instrument_shop">Magasin d\'instruments de musique</string>
+	<string name="poi_nature_reserve">Réserve naturelle</string>
+	<string name="poi_military_naval_base">Base navale</string>
+	<string name="poi_neighbourhood">Quartier</string>
+	<string name="poi_newsagent_shop">Marchand de journaux</string>
+	<string name="poi_newspaper_office">Presse</string>
+	<string name="poi_ngo">ONG</string>
+	<string name="poi_nightclub">Boîte de nuit</string>
+	<string name="poi_optician_shop">Opticien</string>
+	<string name="poi_organic_shop">Magasin bio</string>
+	<string name="poi_orienteering">Course d\'orientation</string>
+	<string name="poi_outdoor_shop">Magasin d\'activités de plein air</string>
+	<string name="poi_paddle_tennis">Padel</string>
+	<string name="poi_parking">Parking</string>
+	<string name="poi_parking_entrance">Entrée de parking</string>
+	<string name="poi_pawnbroker">Mont-de-piété</string>
+	<string name="poi_peak">Sommet</string>
+	<string name="poi_pelota">Pelote basque</string>
+	<string name="poi_pet_shop">Magasin d\'animaux</string>
+	<string name="poi_petroleum_well">Puits de pétrole</string>
+	<string name="poi_pharmacy">Pharmacie</string>
+	<string name="poi_photo">Magasin de photographie</string>
+	<string name="poi_photographer">Photographe</string>
+	<string name="poi_picnic_site">Site de pique-nique</string>
+	<string name="poi_pitch">Terrain de sport</string>
+	<string name="poi_place_of_worship">Lieu de culte</string>
+	<string name="poi_place_of_worship_christian">Christianisme</string>
+	<string name="poi_place_of_worship_jewish">Judaïsme</string>
+	<string name="poi_place_of_worship_muslim">Islam</string>
+	<string name="poi_playground">Jeux pour enfants</string>
+	<string name="poi_plumber">Plombier</string>
+	<string name="poi_police">Police</string>
+	<string name="poi_post_box">Boîtes aux lettres</string>
+	<string name="poi_post_office">Bureau de poste</string>
+	<string name="poi_power_generator">Générateur électrique</string>
+	<string name="poi_power_substation">Poste électrique</string>
+	<string name="poi_prison">Prison</string>
+	<string name="poi_pub">Bar</string>
+	<string name="poi_public_transport_platform">Transport en commun (attente des voyageurs)</string>
+	<string name="poi_public_transport_station">Transport en commun (gare)</string>
+	<string name="poi_quarry">Carrière</string>
+	<string name="poi_raceway">Circuit</string>
+	<string name="poi_racquet">Sport de raquette</string>
+	<string name="poi_seamark_radar_transponder">Transpondeur radar</string>
+	<string name="poi_railway_halt">Gare ferroviaire (halte)</string>
+	<string name="poi_railway_platform">Quai de gare</string>
+	<string name="poi_railway_station">Gare ferroviaire</string>
+	<string name="poi_rapids">Rapides</string>
+	<string name="poi_recycling">Collecte sélective des déchets</string>
+	<string name="poi_reef">Récif</string>
+	<string name="poi_research_office">Centre de recherche</string>
+	<string name="poi_resort">Station touristique</string>
+	<string name="poi_restaurant">Restaurant</string>
+	<string name="poi_ridge">Crête</string>
+	<string name="poi_river">Rivière</string>
+	<string name="poi_rugby">Rugby</string>
+	<string name="poi_ruins_historic">Ruines</string>
+	<string name="poi_salt_pond">Marais salants</string>
+	<string name="poi_sanatorium">Sanatorium</string>
+	<string name="poi_sauna">Sauna</string>
+	<string name="poi_school">Établissement scolaire</string>
+	<string name="poi_scuba_diving">Plongée sous-marine</string>
+	<string name="poi_seafood">Poissonnerie</string>
+	<string name="poi_second_hand">Magasin de produits d\'occasion</string>
+	<string name="poi_ses_station">Association Australienne d\'aide d\'urgence (SES)</string>
+	<string name="poi_shelter">Abri</string>
+	<string name="poi_place_of_worship_shinto">Shintoïsme</string>
+	<string name="poi_shoemaker">Cordonnier</string>
+	<string name="poi_shoes">Magasin de chaussures</string>
+	<string name="poi_place_of_worship_sikh">Sikhisme</string>
+	<string name="poi_sinkhole">Doline</string>
+	<string name="poi_skateboard">Skateboard</string>
+	<string name="poi_skating">Patin à glace</string>
+	<string name="poi_skiing">Ski</string>
+	<string name="poi_slipway">Cale de lancement</string>
+	<string name="poi_soccer">Football</string>
+	<string name="poi_social_centre">Communauté</string>
+	<string name="poi_social_facility">Service social</string>
+	<string name="poi_speed_camera">Radar automatique</string>
+	<string name="poi_sports_shop">Magasin de sport</string>
+	<string name="poi_sports_centre">Centre sportif</string>
+	<string name="poi_spring">Source</string>
+	<string name="poi_stadium">Stade</string>
+	<string name="poi_stationery">Papeterie</string>
+	<string name="poi_stone">Rocher isolé</string>
+	<string name="poi_strait">Détroit</string>
+	<string name="poi_stream">Ruisseau</string>
+	<string name="poi_stripclub">Club de strip-tease</string>
+	<string name="poi_studio">Studio d\'enregistrement</string>
+	<string name="poi_suburb">Quartier</string>
+	<string name="poi_subway_entrance">Bouche de métro</string>
+	<string name="poi_supermarket">Supermarché</string>
+	<string name="poi_survey_point">Point géodésique</string>
+	<string name="poi_swimming">Natation</string>
+	<string name="poi_swimming_pool">Piscine</string>
+	<string name="poi_table_tennis">Tennis de table</string>
+	<string name="poi_tailor">Couturier</string>
+	<string name="poi_place_of_worship_taoist">Taoïsme</string>
+	<string name="poi_tattoo">Salon de tatouage</string>
+	<string name="poi_taxi">Taxi</string>
+	<string name="poi_team_handball">Handball</string>
+	<string name="poi_telecommunication_office">Entreprise de télécommunications</string>
+	<string name="poi_telephone">Téléphone public</string>
+	<string name="poi_tennis">Tennis</string>
+	<string name="poi_aeroway_terminal">Terminal aéroportuaire</string>
+	<string name="poi_theme_park">Parc à thème</string>
+	<string name="poi_tobacco_shop">Tabac</string>
+	<string name="poi_toboggan">Toboggan</string>
+	<string name="poi_toilets">Toilettes</string>
+	<string name="poi_seamark_topmark">Voyant</string>
+	<string name="poi_town">Ville</string>
+	<string name="poi_toys_shop">Magasin de jouets</string>
+	<string name="poi_leisure_track">Piste de sport</string>
+	<string name="poi_traffic_calming_bump">Ralentisseur (dos d\'âne)</string>
+	<string name="poi_traffic_calming_chicane">Ralentisseur (chicane)</string>
+	<string name="poi_traffic_calming_choker">Ralentisseur (écluse)</string>
+	<string name="poi_traffic_calming_cushion">Ralentisseur (coussin berlinois)</string>
+	<string name="poi_traffic_calming_hump">Ralentisseur (dos d\'âne arrondi)</string>
+	<string name="poi_traffic_calming_rumble_strip">Ralentisseur (bandes rugueuses)</string>
+	<string name="poi_tram_stop">Arrêt de tram</string>
+	<string name="poi_travel_agent">Agence de voyages</string>
+	<string name="poi_turning_circle">Rond-point interne</string>
+	<string name="poi_university">Université</string>
+	<string name="poi_variety_store">Bazar</string>
+	<string name="poi_vending_machine">Distributeur automatique</string>
+	<string name="poi_veterinary">Vétérinaire</string>
+	<string name="poi_video_shop">Magasin de vidéos</string>
+	<string name="poi_viewpoint">Point de vue</string>
+	<string name="poi_village">Village</string>
+	<string name="poi_vineyard">Vignoble</string>
+	<string name="poi_volcano">Volcan</string>
+	<string name="poi_volleyball">Volley-ball</string>
+	<string name="poi_waste_basket">Corbeille publique</string>
+	<string name="poi_waste_disposal">Bac à ordures ménagères</string>
+	<string name="poi_wastewater_plant">Station d\'épuration</string>
+	<string name="poi_watchmaker">Horloger</string>
+	<string name="poi_lock_gate">Porte d\'écluse</string>
+	<string name="poi_water_park">Parc aquatique</string>
+	<string name="poi_water_tower">Château d\'eau</string>
+	<string name="poi_waterway_turning_point">Point de retournement pour bateaux</string>
+	<string name="poi_weir">Seuil en rivière</string>
+	<string name="poi_water_well">Puits</string>
+	<string name="poi_water_works">Usine d\'eau potable</string>
+	<string name="poi_waterfall">Chute d\'eau</string>
+	<string name="poi_water_mill">Moulin à eau</string>
+	<string name="poi_wayside_cross">Calvaire</string>
+	<string name="poi_wayside_shrine">Oratoire</string>
+	<string name="poi_wetland">Zone humide</string>
+	<string name="poi_windmill">Moulin à vent</string>
+	<string name="poi_works">Usine</string>
+	<string name="poi_wreck">Épave</string>
+	<string name="poi_zoo">Zoo</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 088de5d17f..7c4a73ea0e 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -182,6 +182,7 @@
 
 	<string name="poi_speed_camera">Speed camera</string>
 	<string name="poi_turning_circle">Turning circle</string>
+	<string name="poi_motorway_junction">Motorway junction</string>
 
 	<string name="poi_water_well">Water well</string>
 	<string name="poi_standpipe">Standpipe</string>
@@ -211,6 +212,7 @@
 	<string name="poi_waste_disposal">Waste disposal</string>
 	<string name="poi_waste_basket">Waste basket</string>
 
+	<string name="poi_pier">Pier</string>
 	<string name="poi_surveillance">Surveillance</string>
 	<string name="poi_construction">Construction</string>
 	<string name="poi_works">Works</string>
@@ -299,6 +301,7 @@
 	<string name="poi_golf_course">Golf course</string>
 	<string name="poi_ice_rink">Ice rink</string>
 	<string name="poi_pitch">Pitch</string>
+	<string name="poi_leisure_track">Sports track</string>
 	<string name="poi_running_track">Running track</string>
 	<string name="poi_bicycle_track">Bicycle track</string>
 	<string name="poi_horse_track">Horse track</string>
@@ -545,8 +548,12 @@
 	<string name="poi_saddle">Saddle</string>
 	<string name="poi_volcano">Volcano</string>
 	<string name="poi_crater">Crater</string>
+	<string name="poi_ridge">Ridge</string>
+	<string name="poi_glacier">Glacier</string>
 	<string name="poi_sinkhole">Sinkhole</string>
 	<string name="poi_waterfall">Waterfall</string>
+	<string name="poi_river">River</string>
+	<string name="poi_stream">Stream</string>
 	<string name="poi_rapids">Rapids</string>
 	<string name="poi_stone">Remarkable stone</string>
 	<string name="poi_cape">Cape</string>
@@ -602,6 +609,7 @@
 	<string name="poi_seamark_rock">Rock, seamark</string>
 	<string name="poi_seamark_wreck">Wreck, seamark</string>
 
+	<string name="poi_military">Military zone</string>
 	<string name="poi_military_airfield">Military airfield</string>
 	<string name="poi_military_bunker">Military bunker</string>
 	<string name="poi_military_barracks">Barracks</string>

From 8aeb8ef38eacabb7a808a6d457cd250612c6fb71 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Fri, 28 Nov 2014 09:47:07 +0100
Subject: [PATCH 106/138] Translated using Weblate (Italian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-it/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 93d31d81c7..63d097dab9 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -195,7 +195,7 @@
   
   <string name="local_index_poi_data">Dati PDI</string>
   <string name="local_index_address_data">Dati indirizzi</string>
-  <string name="local_index_transport_data">Dati trasporti</string>
+  <string name="local_index_transport_data">Dati trasporti pubblici</string>
   <string name="local_index_map_data">Dati mappa</string>
   
   <string name="local_indexes_cat_backup">Disattivato</string>
@@ -346,7 +346,7 @@
   <string name="indexing_address">Indicizzazione indirizzi…</string>
   <string name="indexing_map">Indicizzazione mappa…</string>
   <string name="indexing_poi">Indicizzazione PDI…</string>
-  <string name="indexing_transport">Indicizzazione trasporti…</string>
+  <string name="indexing_transport">Indicizzazione trasporti pubblici…</string>
   <string name="input_output_error">Errore di I/O</string>
   <string name="km">km</string>
   <string name="km_h">km/h</string>
@@ -450,7 +450,7 @@
   <string name="none_region_found">Non è stata trovato nessuna dato per la regione nella scheda SD. Scarica una regione da internet.</string>
   <string name="poi_namefinder_query_empty">Inserisci i parametri di ricerca per trovare un PDI</string>
   <string name="any_poi">Tutti</string>
-  <string name="layer_transport_route">Percorso di trasporto pubblico</string>
+  <string name="layer_transport_route">Percorso su trasporto pubblico</string>
   <string name="thanks_yandex_traffic">Grazie a Yandex per le informazioni sul traffico.</string>
   <string name="layer_yandex_traffic">Yandex (traffico)</string>
   <string name="layer_route">Percorso</string>
@@ -2003,7 +2003,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="logged_as">Registrato come %1$s</string>
 	<string name="rendering_category_routes">Percorsi</string>
     <string name="rendering_category_details">Dettagli</string>
-    <string name="rendering_category_transport">Trasporto</string>
+    <string name="rendering_category_transport">Trasporto pubblico</string>
     <string name="rendering_category_others">Altri attributi della mappa</string>
     <string name="map_widget_right">Pannello di destra</string>
 	<string name="map_widget_left">Pannello di sinistra</string>

From 18f0331030f4044d456ed1cd5e96104ece54e0da Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 10:56:27 +0100
Subject: [PATCH 107/138] Translated using Weblate (Ukrainian)

Currently translated at 96.2% (1509 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 2d4cf00508..5a8d43da8b 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
 		\n\t* Більш точні маршрути (трохи повільніше)
 		\n\t* Розумний і швидкий перерахунок маршруту
@@ -1145,7 +1145,7 @@
 \nЗахід: %2$s</string>
 	<string name="day_night_info">Схід/Захід</string>
 	<string name="map_widget_day_night">Денний/нічний режим</string>
-	<string name="map_widget_vector_attributes">Налаштування рендерингу:</string>
+	<string name="map_widget_vector_attributes">Налаштування візуалізації</string>
 	<string name="map_widget_renderer">Стиль мапи (векторн.)</string>
 	<string name="layer_map_appearance">Налаштування екрану</string>
 	<string name="show_lanes">Відображати смуги руху</string>
@@ -1927,7 +1927,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="osmo_specify_tracker_id">Будь ласка, вкажіть id</string>
     <string name="continue_navigation">Продовжити навігацію</string>
     <string name="pause_navigation">Призупинити навігацію</string>
-    <string name="rendering_attr_subwayMode_name">Режим метро</string>
+    <string name="rendering_attr_subwayMode_name">Маршрути метро</string>
  	<string name="rendering_attr_alpineHiking_name">Піший гірський туризм (шкала SAC)</string>
     <string name="rendering_attr_alpineHiking_description">Візуалізація шляху за шкалою SAC</string>
     <string name="rendering_attr_osmcTraces_name">Шар символів для пішого туризму</string>
@@ -1951,7 +1951,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="save_track_to_gpx_globally">Писати трек у файл GPX</string>
 	<string name="save_track_to_gpx_globally_descr">Загальний запис місцезнаходження в файл GPX можна ввімкнути або вимкнути кнопкою запису GPX на екрані з мапою</string>
 	<string name="save_track_interval_globally">Інтервал записування</string>
-	<string name="rendering_attr_publicTransportMode_name">Режим громадського транспорту</string>
+	<string name="rendering_attr_publicTransportMode_name">Маршрути автобусів, тролейбусів та маршруток</string>
 	<string name="record_plugin_name">Запис власних подорожей</string>
     <string name="int_hour">г</string>
     <string name="duration">Тривалісьть</string>

From 296f63fbe67b349d28882d5f0759f32bcb3009ff Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 10:53:47 +0100
Subject: [PATCH 108/138] Translated using Weblate (Danish)

Currently translated at 100.0% (574 of 574 strings)
---
 OsmAnd/res/values-da/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 5a7f31be83..27b4e4d8dc 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -449,7 +449,7 @@
         <string name="poi_fast_food">Fastfood</string>
         <string name="poi_bar">Bar</string>
         <string name="poi_pub">Pub</string>
-        <string name="poi_food_court">Fødevaremarked</string>
+        <string name="poi_food_court">Madmarked</string>
         <string name="poi_drinking_water">Drikkevand</string>
         <string name="poi_barbecue">Barbecue</string>
 

From 5398d79c60ec9adc08b9b07554a9da9d7abe4c8c Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 11:00:00 +0100
Subject: [PATCH 109/138] Translated using Weblate (Ukrainian)

Currently translated at 96.2% (1509 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 5a8d43da8b..0cda883e6c 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1465,15 +1465,14 @@ OsmAnd має відкриті сирці і активно розвиваєть
        * Натисніть на масштабну лінійку, щоб побачити більше дій.</string>
     <string name="access_mark_final_location_first">Допоміжні можливості: будь ласка, спочатку оберіть пункт призначення</string> 
     <string name="use_magnetic_sensor_descr">Використовувати магнітометр для визначення сторін світу замість, датчику орієнтації</string>
-    <string name="tip_search_t">Ви можете шукати об’єкти безпосередньо на мапі через \'Контекстне меню\' → \'Шукати поруч\' або на екрані пошуку \'Меню\' → \'Пошук\'
-		\n\nНа пошуковому екрані наявні шаблони для пошуку
-		\n\t* за адресою
-		\n\t* координатами
-		\n\t* пошук POI (за типом чи назвою)
-		\n\t* використання результатів історії пошуку
-		\n\t* або обираючи із збережених точок.
-		\n\nУ допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Маршрут\' чи \'Показати на мапі\'
-	</string>
+    <string name="tip_search_t">"Ви можете шукати об’єкти безпосередньо на мапі через \'Контекстне меню\' → \'Шукати поруч\' або на екрані пошуку \'Меню\' → \'Пошук\'
+\n\nНа пошуковому екрані наявні шаблони для пошуку
+\n\t* за адресою
+\n\t* координатами
+\n\t* пошук POI (за типом чи назвою)
+\n\t* використання результатів історії пошуку
+\n\t* або обираючи із збережених точок.
+\n\nУ допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Маршрут до\' чи \'Показати на мапі\' "</string>
 	<string name="destination_point">Пункт призначення %1$s</string>
     
 	
@@ -1961,8 +1960,8 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="waypoints">Путьові точки</string>
     <string name="targets">Цілі</string>
     <string name="way_alarms">Перешкоди</string>
-    <string name="speak_favorites">Оголошувати улюблені</string>
-    <string name="speak_poi">Оголошувати POI</string>
+    <string name="speak_favorites">Оголошувати закладки, що є поруч</string>
+    <string name="speak_poi">Оголошувати POI, що є поруч</string>
     <string name="confirm_every_run">Завжди питати</string>
 	<string name="save_global_track_interval_descr">Оберіть інтервал періодичності запису треку (вмикається через віджет запису GPX)</string>
 	<string name="save_global_track_interval">Загальний інтервал запису</string>

From 9838d4422f068f077edfe1df71875dc7c882e344 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Fri, 28 Nov 2014 11:03:09 +0100
Subject: [PATCH 110/138] improve strings for Android 4.4 migration support (de
 + en)

---
 OsmAnd/res/values-de/strings.xml | 2 +-
 OsmAnd/res/values/strings.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 4d34e3c87d..38f205f302 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1538,7 +1538,7 @@
 	<string name="android_19_location_disabled">"Seit Android 4.4 (KitKat) können neue Karten-Downloads nicht mehr am Speicherort früherer Android-Versionen gespeichert werden (%s). Jetzt den zulässigen Speicherort wählen und alle OsmAnd Dateien dorthin kopieren?
 \n Hinweis 1: Die ursprünglichen Dateien bleiben hiervon unberührt, können aber nachfolgend manuell gelöscht werden.
 \n Hinweis 2: Die Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden."</string>
-	<string name="application_dir_change_warning2">Soll Osmand versuchen, die Dateien an den neuen Speicherort zu verschieben?</string>
+	<string name="application_dir_change_warning2">Soll Osmand auch die Dateien an den neuen Speicherort verschieben?</string>
 	<string name="copying_osmand_one_file_descr">Kopieren der Datei (%s) an den neuen Speicherort…</string>
 	<string name="copying_osmand_files_descr">Kopieren der Osmand-Dateien zum neuen Speicherort (%s)</string>
 	<string name="copying_osmand_files">Kopiere Osmand-Dateien</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 51fb617d8c..29b6e282b2 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -427,7 +427,7 @@
     <string name="android_19_location_disabled">Since Android version 4.4 (KitKat) you cannot download and update maps to the previous storage folder (%s). Do you want to change to the permitted storage location and copy all OsmAnd files there?
         \n Note 1: Your old files will remain untouched (but can be deleted manually).
         \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
-    <string name="application_dir_change_warning2">Do you want OsmAnd to try to copy its data files to the new destination?</string>
+    <string name="application_dir_change_warning2">Do you want OsmAnd to also copy its data files to the new destination?</string>
     <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination...</string>
     <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)</string>
     <string name="copying_osmand_files">Copying OsmAnd data files</string>

From 6041a31bdb57c682965f8dec6aaaa3bfb820fe84 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Fri, 28 Nov 2014 10:57:37 +0100
Subject: [PATCH 111/138] Translated using Weblate (Italian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 63d097dab9..c33f74214b 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1964,7 +1964,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="speak_poi">Annuncia PDI nelle vicinanze</string>
     <string name="index_tours">Itinerari</string>
     <string name="flat_list_waypoints">Tutto</string>
-    <string name="record_plugin_description">Registrate le vostre tracce con il pulsante dedicato nello schermo della mappa. Mostra le impostazioni per la registrazione dei vostri viaggi in file GPX localmente o online utilizzando un servizio web.</string>
+    <string name="record_plugin_description">Registra le tue tracce con il pulsante dedicato nello schermo della mappa. Mostra le impostazioni per la registrazione dei tuoi viaggi in file GPX localmente o online utilizzando un servizio web.</string>
     <string name="record_plugin_name">Registra i tuoi viaggi</string>
     <string name="int_hour">h</string>
     <string name="duration">Durata</string>

From 61f65a5949536178bd42240f78eec5543b9098ef Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 11:02:40 +0100
Subject: [PATCH 112/138] Translated using Weblate (Ukrainian)

Currently translated at 96.2% (1509 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 0cda883e6c..137cfbce45 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1086,7 +1086,7 @@
 \n\nДля кращого обчислення висоти використовується проекція EGM96.
 \n\nOsmAnd покаже висоту над рівнем моря в EGM96 після завантаження файлу \'World Altitide Correction\' (WW15MGH.DAC), використовуючи \'Налаштування\'-&gt;\'Управління мапами\' (http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC). "</string>
     <string name="monitoring_control_start">старт</string>
-    <string name="background_service_is_enabled_question">Фоновий режим запущений. Ви хочете його відключити?</string>
+    <string name="background_service_is_enabled_question">Фоновий режим запущений. Ви хочете зупинити його роботу також?</string>
     <string name="close_changeset">Закрити набір змін</string>
 	<string name="zxing_barcode_scanner_not_found">Програму \'Сканер штрих-кодів\' не знайдено. Шукати в Market?</string>
 	<string name="rendering_attr_roadColors_description">Виберіть кольорову схему доріг:</string>
@@ -1652,7 +1652,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="stop_navigation_service">Зупинити</string>
 	<string name="enable_sleep_mode">Ввімкнути режим сну GPS</string>
 	<string name="gps_wake_up_timer">Інтервал вмикання GPS</string>
-	<string name="sleep_mode_stop_dialog">Збудити зі сну GPS?</string>
+	<string name="sleep_mode_stop_dialog">Зупинити фоновий режим GPS?</string>
 	<string name="map_preferred_locale_descr">Бажана мова для етикеток на мапі (якщо вона недоступна будуть показані позначки англійською чи місцевою мовами)</string>
     <string name="map_preferred_locale">Бажана мова мапи</string>
     <string name="local_map_names">Назви місцевою мовою</string>

From 7d187577424dfe9836c3f2b2bcd63a578b9a45ff Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 11:06:49 +0100
Subject: [PATCH 113/138] Translated using Weblate (Danish)

Currently translated at 99.1% (577 of 582 strings)
---
 OsmAnd/res/values-da/phrases.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 27b4e4d8dc..7a97e7c66d 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -623,4 +623,8 @@
 
 	<string name="poi_palaeontological_site">Palæontologisk område</string>
 
+	<string name="poi_motorway_junction">Motorvejskryds</string>
+
+	<string name="poi_pier">Mole</string>
+	<string name="poi_leisure_track">Sportsbane</string>
 	</resources>

From 41c85ebf9fd630280147952f583ac187dc073747 Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 11:06:21 +0100
Subject: [PATCH 114/138] Translated using Weblate (Ukrainian)

Currently translated at 96.2% (1509 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 137cfbce45..35a565d10b 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -429,8 +429,8 @@
 		\n\nВікно маркеру приховується довгим натисканням на нього.
 	</string>
   <string name="tip_initial">Допомога</string>
-  <string name="tip_initial_t">"OsmAnd - навігаційна програма з великими можливостями.
-\n\nПочаткові відомості, як і деякі поради та детальна інструкція щодо використання знаходяться в \'Меню\'→\'Допомога\' на екрані з мапою. "</string>
+  <string name="tip_initial_t">"OsmAnd — навігаційна програма з великими можливостями.
+\n\nПочаткові відомості, як і деякі поради щодо використання знаходяться в \'Меню\'→\'Допомога\' на екрані з мапою. "</string>
   <string name="next_button">Наступний</string>
   <string name="previous_button">Попередній</string>
   <string name="unit_of_length_descr">Змінити одиниці вимірювання довжини і швидкості</string>
@@ -751,7 +751,7 @@
   <string name="save_current_track">Зберегти активний GPX трек</string>
   <string name="save_track_interval">Інтервал збереження під час навіґації</string>
   <string name="save_track_interval_descr">Вказати інтервал збереження точок треку під час навіґації</string>
-  <string name="save_track_to_gpx_descrp">Треки буде збережено в трекову директорію під час навіґації</string>
+  <string name="save_track_to_gpx_descrp">Треки будуть збережені в теку для треків під час навіґації</string>
   <string name="save_track_to_gpx">Записувати трек у файл GPX під час навіґації</string>
   <string name="update_tile">Оновити мапу</string>
   <string name="reload_tile">Оновити частину мапи</string>
@@ -1920,7 +1920,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="share_fav">Поділитись</string>
 	<string name="share_fav_subject">Закладки, якими поділились через OsmAnd</string>
 	<string name="navigation_intent_invalid">Невірний формат: %s</string>
-<string name="rendering_attr_coloredBuildings_name">Кольорові будівлі</string>
+<string name="rendering_attr_coloredBuildings_name">Кольорове маркування будівель за типом</string>
     <string name="osmo_invite">Запросити…</string>
     <string name="osmo_leave_confirmation_msg">Ви бажаєте вийти з групи %1$s?</string>
     <string name="osmo_specify_tracker_id">Будь ласка, вкажіть id</string>

From 3fbae1018a6f20aa8693fbd7f34fb1804dbcd140 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 11:07:56 +0100
Subject: [PATCH 115/138] Translated using Weblate (Danish)

Currently translated at 99.3% (578 of 582 strings)
---
 OsmAnd/res/values-da/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 7a97e7c66d..38b950c5a9 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -627,4 +627,5 @@
 
 	<string name="poi_pier">Mole</string>
 	<string name="poi_leisure_track">Sportsbane</string>
+	<string name="poi_ridge">Højderyg</string>
 	</resources>

From 14197afd9e43d7c98c10693741d0c1cd1d52ee79 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 11:11:16 +0100
Subject: [PATCH 116/138] Translated using Weblate (Danish)

Currently translated at 100.0% (582 of 582 strings)
---
 OsmAnd/res/values-da/phrases.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 38b950c5a9..3a94245413 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -628,4 +628,8 @@
 	<string name="poi_pier">Mole</string>
 	<string name="poi_leisure_track">Sportsbane</string>
 	<string name="poi_ridge">Højderyg</string>
+	<string name="poi_glacier">Gletscher</string>
+	<string name="poi_river">Flod</string>
+	<string name="poi_stream">Vandløb</string>
+	<string name="poi_military">Militærområde</string>
 	</resources>

From a2ddbbc4b3f0146b9856fc7c064c131de8795dc1 Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 11:10:57 +0100
Subject: [PATCH 117/138] Translated using Weblate (Ukrainian)

Currently translated at 96.2% (1509 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 35a565d10b..283678db14 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1850,13 +1850,13 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="routing_attr_avoid_motorway_description">Уникати автомагістралі</string>
 	<string name="routing_attr_weight_name">Максимальна вага</string>
 	<string name="routing_attr_weight_description">Задайте обмеження маси автівки</string>
-    <string name="android_19_location_disabled">"Починаючи з версії KitKat ви не в змозі завантажувати та оновлювати мапи у попередньому сховищі (%s). Чи бажаєте його змінити та скопіювати всі файли в нове місце?
-\n Примітка: старі фали залишаться недоторканими.
-\n Примітка: спільне користування фалами між OsmAnd та OsmAnd+ не можливе. "</string>
+    <string name="android_19_location_disabled">"Починаючи з версії  Android 4.4 (KitKat) ви не в змозі завантажувати та оновлювати мапи у попередню теку (%s). Чи бажаєте її змінити та скопіювати всі файли в нове місце?
+\n Примітка 1: ваші старі фали залишаться недоторканими (їх можна вилучити вручну).
+\n Примітка 2: в новій теці спільне користування фалами між OsmAnd та OsmAnd+ не можливе."</string>
     <string name="application_dir_change_warning2">OsmAnd намагається перенести дані до нового місця. Ви згодні?</string>
     <string name="copying_osmand_one_file_descr">Файл (%s) копіюється на нове місце…</string>
-    <string name="copying_osmand_files_descr">Копіювання файлів OsmAnd до нового місця (%s)</string>
-    <string name="copying_osmand_files">Копіювання файлів OsmAnd</string>
+    <string name="copying_osmand_files_descr">Копіювання файлів даних OsmAnd до нового місця (%s)</string>
+    <string name="copying_osmand_files">Копіювання файлів даних OsmAnd</string>
     <string name="calculate_osmand_route_gpx">Розрахувати офлайн маршрут в OsmAnd</string>
     <string name="app_mode_truck">Вантажівка</string>
     <string name="guidance_preferences_descr">Налаштування навігації</string>
@@ -1879,7 +1879,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="amenity_type_seamark">Навігаційний знак</string>
     <string name="app_modes_choose_descr">Виберіть профілі, видимі в застосунку</string>
     <string name="app_modes_choose">Профілі застосунку</string>
-	<string name="map_widget_map_rendering">Рендерінг мапи:</string>
+	<string name="map_widget_map_rendering">Візуалізація мапи</string>
     <string name="app_mode_hiking">Піший туризм</string>
     <string name="app_mode_motorcycle">Мотоцикл</string>
     <string name="app_mode_boat">Човен</string>

From d5357be3b3c3dcc6e0b1e433cfc625f5a8228eca Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 28 Nov 2014 12:28:57 +0200
Subject: [PATCH 118/138] Added loading indicator for map updates in dashboard

---
 OsmAnd/res/layout/dash_updates_fragment.xml            |  7 +++++++
 .../net/osmand/plus/dashboard/DashUpdatesFragment.java | 10 ++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
index 8e4d96408c..f0e6623b1c 100644
--- a/OsmAnd/res/layout/dash_updates_fragment.xml
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -20,9 +20,16 @@
 				  android:textSize="14sp"
 				  android:textColor="@color/dashboard_black"/>
 		<TextView android:id="@+id/update_count"
+				  android:layout_marginLeft="2dp"
 				  android:layout_width="wrap_content"
 				  android:textColor="@color/dashboard_blue"
 				  android:layout_height="wrap_content"/>
+		<ProgressBar android:id="@+id/main_progress"
+					 android:layout_marginLeft="2dp"
+					 android:indeterminate="true"
+					 android:indeterminateOnly="true"
+					 android:layout_width="wrap_content"
+					 android:layout_height="wrap_content"/>
 		<View android:layout_width="0dp"
 			  android:layout_weight="1"
 			  android:layout_height="wrap_content"/>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index dcb34cf862..850b771f1c 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -73,15 +73,12 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		progressBars.clear();
 		baseNames.clear();
 		downloadButtons.clear();
-		if (list.size() > 0) {
-			mainView.setVisibility(View.VISIBLE);
-		} else {
-			mainView.setVisibility(View.GONE);
+		mainView.findViewById(R.id.main_progress).setVisibility(View.GONE);
+		((TextView)mainView.findViewById(R.id.update_count)).setText(String.valueOf(list.size()));
+		if (list.size() < 1) {
 			return;
 		}
 
-		((TextView)mainView.findViewById(R.id.update_count)).setText(String.valueOf(list.size()));
-
 		LinearLayout updates = (LinearLayout) mainView.findViewById(R.id.updates_items);
 		updates.removeAllViews();
 
@@ -150,6 +147,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			});
 			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
 			currentProgress.setVisibility(intermediate ? View.GONE : View.VISIBLE);
+			getView().findViewById(R.id.main_progress).setVisibility(intermediate ? View.VISIBLE : View.GONE);
 			if (!intermediate) {
 				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}

From b27cdf09f8751cd500fe68c0d9071437171881b6 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Fri, 28 Nov 2014 11:52:36 +0100
Subject: [PATCH 119/138] Translated using Weblate (Traditional Chinese)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 57 ++++++++++------------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index eb856a62d6..1c5cf16a1f 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -51,32 +51,9 @@
 	<string name="snap_to_road_descr">導航過程中對齊道路位置</string>
 	<string name="snap_to_road">對齊道路</string>
 	<string name="osmand_short_description_80_chars">將離線與線上的 OSM 地圖，用在全球行動地圖檢視和導航</string>
-	<string name="osmand_long_description_1000_chars">
-		OsmAnd (OSM Automated Navigation Directions)
-
-		OsmAnd 是開放程式碼的導航應用程式，存取各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於手機的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。
-
-		主要功能：
-		- 完整的離線功能(存放下載的向量圖或地圖圖磚)
-		- 提供細致的全球離線向量圖資
-		- 直接從應用程式下載各國或區域圖資
-		- 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、公共運輸站
-		- 離線查尋地址、場所(POI)
-		- 短距離的離線使用路線(實驗性)
-		- 汽車、自行車、步行模式有下列選項：
-		- 可選的自動日夜模式切換
-		- 可選的依據速度自動地圖比例尺縮放
-		- 可選的地圖正北朝上或行進方向朝上
-		- 可選的車道引導、速限顯示、使用真人語音或 TTS 語音
-
-		OsmAnd 免費版限制:
-		- 地圖下載數量
-		- 無法使用離線維基百科的 POI
-
-		OsmAnd 正在積極開發我們的專案，並且它的更進一步發展依賴於提供資金的捐助，用以資助發展和新功能的駕駛測試。請考慮購買 OsmAnd +，或資助特定的新功能或在 osmand.net 網站上一般捐贈。
-	</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放程式碼的導航應用程式，存取各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於手機的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整的離線功能(存放下載的向量圖或地圖圖磚於裝置存儲器) - 提供細致的全球離線向量圖資 - 直接從應用程式下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、公共運輸站 - 離線查尋地址、場所(POI) - 短距離的離線使用路線(實驗性) - 汽車、自行車、步行模式有下列選項： - 可選的自動日夜模式切換 - 可選的依據速度自動地圖比例尺縮放 - 可選的地圖正北朝上或行進方向朝上 - 可選的車道引導、速限顯示、使用真人語音或 TTS 語音 OsmAnd 免費版限制: - 地圖下載數量 - 無法使用離線維基百科的 POI OsmAnd 正在積極開發我們的專案，並且它的更進一步發展依賴於提供資金的捐助，用以資助發展和新功能的駕駛測試。請考慮購買 OsmAnd +，或資助特定的新功能或在 osmand.net 網站上一般捐贈。 "</string>
 	<string name="osmand_plus_short_description_80_chars">將離線與線上的 OSM 地圖，用在全球行動地圖檢視和導航</string>
-	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放源碼導航應用程式，可以使用各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於裝置的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整離線功能 (存放下載的向量圖或地圖圖磚) - 全球離線向量圖資 - 直接由手機下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、等高線、大眾運輸停靠站 - 離線查尋地址、場所(POI) - 離線尋找導航路線 - 汽車、自行車、步行模式有下列選項： - 自動日/夜模式切換選項 - 取決於速度的地圖縮放選項 - 地圖正北朝上或行進方向朝上選項 - 車道引導、速限顯示、使用真人語音或 TTS 語音選項 "</string>
+	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ OsmAnd (OSM Automated Navigation Directions) OsmAnd 是開放源碼導航應用程式，可以使用各式各樣的全球性 OpenStreetMap (簡稱 OSM 開放街道地圖) 資料。所有圖資(向量圖或地圖圖磚)可存放於裝置的記憶卡上，可作離線與線上圖資導航，包含轉向建議(turn by turn)語音導航。 主要功能： - 完整離線功能 (存放下載的向量圖或地圖圖磚於裝置存儲器) - 全球離線向量圖資 - 直接由手機下載各國或區域圖資 - 可疊加不同的多種地圖層於自訂的透明度，如 GPX 或導航軌跡、興趣點、我的最愛、等高線、大眾運輸停靠站 - 離線查尋地址、場所(POI) - 離線尋找導航路線 - 汽車、自行車、步行模式有下列選項： - 自動日/夜模式切換選項 - 取決於速度的地圖縮放選項 - 地圖正北朝上或行進方向朝上選項 - 車道引導、速限顯示、使用真人語音或 TTS 語音選項 "</string>
 	<string name="tip_update_index">更新離線地圖</string>
 	<string name="tip_update_index_t">"離線地圖的查看與 POI/位址查尋，以及離線導航，有最新的圖資是不可或缺的。OsmAnd 提供了地圖檔案的管理用以下載那些離線圖資，並且檢查能用的更新。
 \n\n下載圖資更新由\'設定\' -&gt; \'管理地圖檔案\' -&gt; \'下載\'。
@@ -633,8 +610,8 @@
 	<string name="use_osmand_routing_service">OsmAnd 導航 &gt; 20公里</string>
 	<string name="use_osmand_routing_service_descr">使用 OsmAnd 離線導航僅適用于路線 &gt; 20 公里(實驗性的)</string>
 	<string name="osmand_routing_experimental">OsmAndd 離線導航是個實驗性的功能，它不能運作超過 20 公里的距離。\n\n導航服務暫時切為線上的 CloudMade。</string>
-	<string name="specified_dir_doesnt_exist">指定的目錄不存在。</string>
-	<string name="application_dir">存儲目錄</string>
+	<string name="specified_dir_doesnt_exist">找不到指定的資料夾。</string>
+	<string name="application_dir">資料存儲器資料夾</string>
 	
 	<string name="osmand_net_previously_installed">有前一版的 OsmAnd 存在，所有的離線資料將被新版引用。但我的最愛內的標點須以舊版程式匯出後再用新版程式匯入。</string>
 	<string name="build_installed">編譯 {0} 成功安裝({1})。</string>
@@ -690,7 +667,7 @@
 	<string name="voice">語音</string>
 	<string name="no_vector_map_loaded">向量地圖未載入</string>
 	<string name="map_route_by_gpx">以 GPX 導航</string>
-	<string name="gpx_files_not_found">在/tracks 目錄找不到 GPX 檔案</string>
+	<string name="gpx_files_not_found">在 /tracks 資料夾找不到 GPX 檔案</string>
 	<string name="layer_gpx_layer">GPX 軌跡…</string>
 	<string name="error_reading_gpx">讀取 GPX 資料錯誤</string>
 	<string name="vector_data">離線向量地圖</string>
@@ -825,7 +802,7 @@
 	<string name="route_general_information">總距離 %1$s、行駛時間 %2$d 小時 %3$d 分。</string>
 	<string name="router_service_descr">選擇線上或離線的導航服務</string>
 	<string name="router_service">導航服務</string>
-	<string name="sd_dir_not_accessible">SD卡上的儲存目錄不可存取</string>
+	<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取</string>
 	<string name="download_question">下載 {0} - {1}？</string>
 	<string name="download_question_exist">離線資料 {0}已存在 ({1})。您要更新 ({2})嗎 ?</string>
 	<string name="address">地址</string>
@@ -889,7 +866,7 @@
 	<string name="save_current_track">儲存目前的 GPX 軌跡</string>
 	<string name="save_track_interval">在導航期間的記錄間隔</string>
 	<string name="save_track_interval_descr">在導航整個期間，為軌跡記錄選取記錄間隔</string>
-	<string name="save_track_to_gpx_descrp">在導航的整個期間，軌跡將會儲存在 track 目錄</string>
+	<string name="save_track_to_gpx_descrp">在整個導航期間，軌跡將會儲存在 track 資料夾</string>
 	<string name="save_track_to_gpx">導航期間記錄軌跡成 GPX 檔案</string>
 	<string name="update_tile">更新地圖</string>
 	<string name="reload_tile">重新載入圖磚</string>
@@ -1465,14 +1442,14 @@
     <string name="guidance_preferences_descr">導航偏好</string>
     <string name="routing_preferences_descr">路線偏好</string>
     <string name="app_mode_truck">卡車</string>
-    <string name="application_dir_change_warning2">OsmAnd 可以試著將資料移到新的目的地。您想要移動嗎？</string>
+    <string name="application_dir_change_warning2">您想要將 OsmAnd 資料複製到新的目的地嗎？</string>
     <string name="copying_osmand_one_file_descr">複製檔案 (%s) 到新的目的地...</string>
-    <string name="copying_osmand_files_descr">複製 OsmAnd 檔案到新的目的地 (%s)</string>
-    <string name="copying_osmand_files">複製 OsmAnd 的檔案</string>
+    <string name="copying_osmand_files_descr">複製 OsmAnd 資料檔到新的目的地 (%s)</string>
+    <string name="copying_osmand_files">複製 OsmAnd 資料檔案</string>
     <string name="calculate_osmand_route_gpx">OsmAnd 預估離線路線</string>
-    <string name="android_19_location_disabled">由於 KitKat 版本，您無法下載和更新地圖於之前的存儲位置 (%s)。您是否想變更以允許複製所有檔案到那裡？
-        \n注意：舊的檔案將保持不變。
-        \n注意：它將不可能在 OsmAnd 和 OsmAnd + 兩者之間共用檔案。 </string>
+    <string name="android_19_location_disabled">由於 Android 4.4 (KitKat) 版本，您無法下載和更新地圖於之前的存儲檔案夾 (%s)。您是否想變更到允許的存儲位置並複製所有的 OsmAnd 檔案到那裡？
+\n注意 1：您舊的檔案將保持不變（但可以手動刪除）。
+\n注意 2：在新的存儲位置，它不可能在 OsmAnd 和 OsmAnd + 兩者之間共用檔案。</string>
     <string name="routing_attr_prefer_motorway_name">高速公路優先</string>
 	<string name="routing_attr_prefer_motorway_description">高速公路優先</string>
 	<string name="routing_attr_short_way_name">最短路線</string>
@@ -1857,4 +1834,10 @@
     <string name="advanced_settings">進階</string>
 	<string name="osmo_use_https_descr">使用安全協定連線於伺服器</string>
     <string name="osmo_use_https">使用 https</string>
-	</resources>
+	<string name="map_update">地圖</string>
+	<string name="search_for">查尋</string>
+	<string name="show_map">顯示地圖</string>
+	<string name="show_all">全部顯示</string>
+	<string name="coordinates">座標</string>
+	<string name="home_button">首頁</string>
+    </resources>

From 6284b2c2aed57ff3e2903fcada6ed8fd3cd8d0ab Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 11:59:49 +0100
Subject: [PATCH 120/138] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-uk/strings.xml | 160 +++++++++++++++++--------------
 1 file changed, 86 insertions(+), 74 deletions(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 283678db14..874a13060d 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -9,7 +9,7 @@
 		\n\t* Увімкнення/вимкнення віджету моніторингу
 	</string>
   <string name="asap">Швидко</string>
-  <string name="save_route_as_gpx">Зберегти маршрут в GPX файл</string>
+  <string name="save_route_as_gpx">Зберегти маршрут в файл GPX</string>
   <string name="route_roundabout">Круговий рух : %1$d з’їзд</string>
   <string name="route_kl">Тримайтесь ліворуч</string>
   <string name="route_kr">Тримайтесь праворуч</string>
@@ -52,7 +52,7 @@
   <string name="online_map_settings_descr">Налаштування онлнай або кешованих джерел (тайлів) мап</string>
   <string name="map_settings">Налаштування мапи</string>
   <string name="map_settings_descr">Налаштування відображення карти</string>
-  <string name="osmand_rastermaps_plugin_description">Втулок дозволяє використовувати різні джерела онлайн мап, а також підготовлені растрові мапи як базову мапу або підкладку. Мапи можуть бути підготовленими на комп’ютері і повинні бути скопійовані в теку osmand на SD-картку.</string>
+  <string name="osmand_rastermaps_plugin_description">Втулок дозволяє використовувати різні джерела онлайн мап, а також підготовлені растрові мапи як базову мапу або підкладку. Мапи можуть бути підготовленими на комп’ютері і скопійовані в теку з даними OsmAnd.</string>
   <string name="osmand_background_plugin_description">Налаштування для навігації і запису маршрутів в енергозберігаючому режимі. Втулок працює в фоновому режимі і періодично активує GPS для запису маршруту або відтворення голосових команд.</string>
   <string name="osmand_accessibility_description">Втулок містить налаштування допоміжних можливостей.</string>
   <string name="extra_settings">Розширені налаштування</string>
@@ -365,7 +365,7 @@
   <string name="gpx_option_reverse_route">Виберіть зворотній напрямок</string>
   <string name="gpx_option_destination_point">Використовувати поточний пункт призначення</string>
   <string name="gpx_option_from_start_point">Пройти увесь шлях спочатку</string>
-  <string name="switch_to_vector_map_to_see">Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \'Шари мапи\' → \'Джерело мапи…\' → \'Локальні векторні мапи\'.</string>
+  <string name="switch_to_vector_map_to_see">Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \'Налаштування Мапи\' → \'Джерело мапи…\' → \'Локальні векторні мапи\'.</string>
   <string name="choose_audio_stream">Голосові інструкції</string>
   <string name="choose_audio_stream_descr">Виберіть канал для голосових інструкцій (залежить від системи)</string>
   <string name="voice_stream_voice_call">Потік голосових дзвінків</string>
@@ -405,7 +405,7 @@
   <string name="tip_favorites_t">"Точки, що часто використовуються можуть бути додані в Закладки.
 \n\nДля додавання точки до Закладок, відкрийте контекстне меню мапи, виберіть пункт \'Додати в Закладки\' та додайте назву закладки.
 \n\nПісля додання до Закладок, вона буде доступна в \'Меню\' → \'Мої місця\'. Довге натискання на закладку в меню \'Закладки\' надасть можливість встановити її в якості місця призначення, редагувати її чи вилучити.
-\n\nДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Меню\' → \'Шари мапи\' "</string>
+\n\nДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Меню\' → \'Налаштування Мапи\' "</string>
   <string name="error_doing_search">Помилка автономного пошуку</string>
   <string name="search_offline_geo_error">Неможливо обробити запит \'%s\'</string>
   <string name="search_osm_offline">Пошук адреси в локальних мапах</string>
@@ -493,8 +493,8 @@
   <string name="use_osmand_routing_service">Автономна навігація &gt; 20км</string>
   <string name="use_osmand_routing_service_descr">Використовувати OsmAnd оффлайн навігацію на відстані &gt; 20 км (експериментально)</string>
   <string name="osmand_routing_experimental">OsmAnd оффлайн навігація є експериментальною і не працює на відстанях &gt; 20 км\n\nВ цьому випадку для прокладання маршруту використовуйте онлайн сервіс CloudMade.</string>
-  <string name="specified_dir_doesnt_exist">Неможливо знайти вказану папку.</string>
-  <string name="application_dir">Папка програми</string>
+  <string name="specified_dir_doesnt_exist">Неможливо знайти вказану теку.</string>
+  <string name="application_dir">Тека даних</string>
   
   <string name="build_installed">Збірка {0} успішно встановлена ({1}).</string>
   <string name="downloading_build">Завантажується збірка…</string>
@@ -549,7 +549,7 @@
   <string name="voice">Голос</string>
   <string name="no_vector_map_loaded">Векторні мапи не завантажено</string>
   <string name="map_route_by_gpx">Навігація по GPX</string>
-  <string name="gpx_files_not_found">GPX файли не знайдені в папці /tracks</string>
+  <string name="gpx_files_not_found">Файли GPX не знайдені в теці з треками</string>
   <string name="layer_gpx_layer">Трек GPX…</string>
   <string name="error_reading_gpx">Помилка читання GPX даних</string>
   <string name="vector_data">Оффлайн векторні мапи</string>
@@ -684,7 +684,7 @@
   <string name="route_general_information">Загальна відстань %1$s, Час в дорозі %2$d г %3$d хв.</string>
   <string name="router_service_descr">Виберіть сервіс для прокладання маршруту</string>
   <string name="router_service">Прокладання маршруту</string>
-  <string name="sd_dir_not_accessible">Папка на SD-карті не доступна для збереження</string>
+  <string name="sd_dir_not_accessible">Тека даних на SD-карті не доступна</string>
   <string name="download_question">Завантажити {0} - {1} ?</string>
   <string name="download_question_exist">Оффлайн мапа для {0} вже існує ({1}). Хочете її оновити ({2}) ?</string>
   <string name="address">Адрес</string>
@@ -1186,30 +1186,7 @@
 	\n\t* Доданий ще один типів доріг для велосипедів (Cycleway=track)
 	\n\t* Виправлені помилки
 	</string>
-	<string name="osmand_long_description_1000_chars">
-		OsmAnd (OSM Automated Navigation Directions)
-
-		OsmAnd — навігаційне програмне забезпечення  з відкритим кодом з доступом до різноманітних картографічних даних від OpenStreetMap (OSM). Всі картографічні дані (векторні та растрові) можуть бути збережені на карті пам’яті для подальшого автономного використання. OsmAnd також пропонує можливість прокладання маршруту як оффлайн, так і використовуючи онлайн-сервіси з покроковим голосовим супроводженням.
-
-		Кілька основних можливостей:
-		- Повноцінна робота без інтернет-з’єднання(просто збережіть векторні чи растрові дані до обраної теки), 
-		- Компактна векторна мапа всього світу,
-		- Завантаження мап країн чи регіону безпосередньо в програмі, 
-		- Можливість відображення додаткових даних на мапі, наприклад шар для прокладання маршруту чи шар із записом GPX-треку, з POI, закладками, ізолініями висот, громадським транспортом, додатковими мапами з можливістю налаштовування рівня прозорості,
-		- Автономний пошук адрес та POI, 
-		- Прокладання маршрутів оффлайн на короткі відстані (експериментальна функція),
-		- Режими для пішохідної, автомобільної та велонавігації: 
-		- можливість перемикання на денний/нічний режим відображення мапи, 
-		- автомасштабування мапи відповідно до швидкості руху, 
-		- можливість орієнтації мапи за компасом чи напрямком руху, 
-		- показ руху по смугах та обмежень швидкості, запис та голосове супроводження.
-
-		Обмеження безкоштовної версії: 
-		- кількість завантажених мап є обмеженою, 
-		- відсутній оффлайн доступ до інформації з Вікіпедії для POI. 
-
-		OsmAnd активно розвивається, його подальший розвиток забезпечується фінансовими надходженнями від його користувачів, за рахунок якої відбувається подальша розробка та впровадження нових функцій. Якщо вам подобається OsmAnd, розгляньте можливість придбання OsmAnd+ чи підтримайте впровадження нових функцій, або зробіть благодійний внесок на osmand.net.
-	</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd — навігаційне програмне забезпечення з відкритим кодом з доступом до різноманітних картографічних даних від OpenStreetMap (OSM). Всі картографічні дані (векторні та растрові) можуть бути збережені на карті пам’яті для подальшого автономного використання. OsmAnd також пропонує можливість прокладання маршруту як оффлайн, так і використовуючи онлайн-сервіси з покроковим голосовим супроводженням. Кілька основних можливостей: - Повноцінна робота без інтернет-з’єднання(просто збережіть векторні чи растрові дані на пристрій), - Компактна векторна мапа всього світу, - Завантаження мап країн чи регіону безпосередньо в програмі, - Можливість показу додаткових даних на мапі, наприклад шар для прокладання маршруту чи шар із записом GPX-треку, з POI, закладками, ізолініями висот, громадським транспортом, додатковими мапами з можливістю налаштовування рівня прозорості, - Автономний пошук адрес та POI, - Прокладання маршрутів оффлайн на короткі відстані (експериментальна функція), - Режими для пішохідної, автомобільної та велонавігації: - можливість перемикання на денний/нічний режим показу мапи, - автомасштабування мапи відповідно до швидкості руху, - можливість орієнтації мапи за компасом чи напрямком руху, - показ руху по смугах та обмежень швидкості, запис та голосове супроводження. Обмеження безкоштовної версії: - кількість завантажених мап є обмеженою, - відсутній оффлайн доступ до інформації з Вікіпедії для POI. OsmAnd активно розвивається, його подальший розвиток забезпечується фінансовими надходженнями від його користувачів, за рахунок якої відбувається подальша розробка та впровадження нових функцій. Якщо вам подобається OsmAnd, розгляньте можливість придбання OsmAnd+ чи підтримайте впровадження нових функцій, або зробіть благодійний внесок на osmand.net. "</string>
 	<string name="osmand_extended_description_4000_chars">
 OsmAnd (OSM Automated Navigation Directions) OsmAnd — навігаційне програмне забезпечення з доступом до вільних, доступних по всьому світу та високоякісних картографічних даних від OpenStreetMap (OSM). Всі картографічні дані можуть зберігатися на карті пам’яті для автономного використання. За допомогою GPS, доступному у вашому пристрої, OsmAnd пропонує вам маршрутизацію, з графічними та голосовими підказками, для автомобіля, велосипедів і пішоходів. Всі основні функції працюють як онлайн, так і в автономному режимі (немає потреби в інтернеті).
 
@@ -1281,27 +1258,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 Перелік підтримуваних країн (взагалі то увесь світ!):
 Афганістан, Австралія, Австрія,  Азербайджан, Албанія, Алжир, Ангілья, Ангола, Андорра, Антигуа і Барбуда, Аргентина, Аруба, Багамські острови, Бангладеш, Барбадос, Бахрейн, Беліз, Бельгія, Бенін, Бермудські острови, Білорусь, Болгарія, Болівія, Бонайре, Боснія і Герцеговина, Ботсвана, Бразилія, Британські Віргінські острови, Бруней, Буркіна-Фасо, Бурунді, Бутан, В’єтнам, Вануату, Ватикан, Венесуела, Вірменія, Габон, Гаїті, Гайана, Гамбія, Гана, Гваделупа, Гватемала, Гвінея, Гвінея-Бісау, Гернсі, Гібралтар, Гондурас, Гонконг, Гренада, Гренландія, Греція, Грузія, Гуам, Данія, Джерсі, Джібуті, Домініка, Домініканська Республіка, Еквадор, Екваторіальна Гвінея, Еритрея, Естонія, Ефіопія, Єгипет, Ємен, Замбія, Західна Сахара,, Зімбабве., Ізраїль, Індія , Індонезія, Ірак, Іран, Ірландія, Ісландія, Іспанія, Італія, Йорданія, Кабо-Верде, Казахстан, Камбоджа, Камерун, Канада, Катар, Кенія, Киргизстан, Китай, Кіпр, Кірибаті, Колумбія, Коморські Острови, Конго, Коста-Ріка , Кот-д’Івуар, Куба, Кувейт, Кюрасао, Лаос, Латвія, Лесото, Литва, Ліберія , Ліван, Лівія, Ліхтенштейн, Люксембург, М’янма, Маврикій, Мавританія, Мадагаскар, Майотта, Макао, Македонія, Малаві, Малайзія, Малі, Мальдіви, Мальта, Марокко, Мартініка, Мексика, Мікронезія, Мозамбік , Молдова, Монако, Монголія, Монтсеррат, Намібія, Науру, Непал, Нігер, Нігерія, Нідерланди, Нідерландські Антильські острови, Нікарагуа, Німеччина, Нова Зеландія, Нова Каледонія, Норвегія, Об’єднані Арабські Емірати, Оман, острів Мен, Острів Святої Єлени, Пакистан, Палау, Палестина, Панама, Папуа Нова Гвінея, Парагвай, Перу, Південна Африка, Південна Грузія, Південний Судан, Північна Корея і Південна Корея, Польща , Португалія, Пуерто-Ріко, Росія, Руанда, Румунія, Сальвадор, Самоа, Сан-Марино, Саудівська Аравія, Свазіленд, Сейшельські острови, Сен-Мартен, Сен-П’єр і Мікелон, Сенегал, Сент-Бартелемі, Сент-Вінсент і Гренадини, Сент-Кітс і Невіс, Сент-Люсія, Сербія, Сирія, Сінгапур, Словаччина, Словенія, Сомалі, Сполучене Королівство (Великобританія), Сполучені Штати Америки (США), Судан, Сурінам, Сьєрра-Леоне, Таджикистан, Таїланд , Тайвань, Танзанія, Тимор-Лешті, Того, Токелау, Тонга, Тринідад і Тобаго, Тувалу, Туніс, Туреччина, Туркменістан, Уганда, Угорщина, Узбекистан, Україна, Уолліс і Футуна, Уругвай, Фіджі, Філіппіни, Фінляндія, Франція, Французька Гвіана, Французька Полінезія, Хорватія, Центрально-Африканська Республіка, Чад, Чеська Республіка, Чилі, Чорногорія, Швейцарія, Швеція, Шрі-Ланка, Ямайка, Японія.
 	</string>
-	<string name="osmand_plus_long_description_1000_chars">
-		OsmAnd+ (OSM Automated Navigation Directions)
-
-		OsmAnd+ — навігаційне програмне забезпечення з відкритим кодом з доступом до різноманітних картографічних даних від OpenStreetMap (OSM). Всі картографічні дані (векторні та растрові) можуть бути збережені на карті пам’яті для подальшого автономного використання. OsmAnd також пропонує можливість прокладання маршруту як оффлайн, так і використовуючи онлайн-сервіси з покроковим голосовим супроводженням. 
-
-		OsmAnd+ — це платна версія, купуючи яку ви підтримуєте проект, фінансуючи розробку нових функцій, одержуючи останні оновлення. 
-
-		Кілька основних можливостей: 
-		- Повна оффлайн функціональність (збереження векторних чи растрових мап до обраної теки), 
-		- Компактна векторна мапа для всього світу, 
-		- Необмежена кількість завантажень мап окремої країни чи регіону безпосередньо в програмі, 
-		- Можливість автономної роботи із даними Вікіпедії (завантажте POI з Вікіпедії) є чудовим для інструментом для мандрівників, 
-		- Можливість відображення додаткових даних на мапі, наприклад шар для прокладання маршруту чи шар із записом GPX-треку, з POI, закладками, ізолініями висот, громадським транспортом, додатковими мапами з можливістю налаштовування рівня прозорості, 
-		- Автономний пошук адрес та POI, 
-		- Прокладання маршрутів оффлайн для коротких відстаней (експериментальна функція), 
-		- Режими для пішохідної, автомобільної та велонавігації: 
-		- можливість перемикання на денний/нічний режим показу, 
-		- мапи відповідно до швидкості руху, 
-		- можливість орієнтації мапи за компасом чи напрямком руху, 
-		- показ руху по смугах та обмежень швидкості, голосове супроводження (записане чи синтезоване).
-	</string>
+	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ — навігаційне програмне забезпечення з відкритим кодом з доступом до різноманітних картографічних даних від OpenStreetMap (OSM). Всі картографічні дані (векторні та растрові) можуть бути збережені на карті пам’яті для подальшого автономного використання. OsmAnd також пропонує можливість прокладання маршруту як оффлайн, так і використовуючи онлайн-сервіси з покроковим голосовим супроводженням. OsmAnd+ — це платна версія, купуючи яку ви підтримуєте проект, фінансуючи розробку нових функцій, одержуючи останні оновлення. Кілька основних можливостей: - Повна оффлайн функціональність (просто збережіть векторні чи растрові дані на пристрій), - Компактна векторна мапа для всього світу, - Необмежена кількість завантажень мап окремої країни чи регіону безпосередньо в програмі, - Можливість автономної роботи із даними Вікіпедії (завантажте POI з Вікіпедії) є чудовим для інструментом для мандрівників, - Можливість показу додаткових даних на мапі, наприклад шар для прокладання маршруту чи шар із записом GPX-треку, з POI, закладками, ізолініями висот, громадським транспортом, додатковими мапами з можливістю налаштовування рівня прозорості, - Автономний пошук адрес та POI, - Прокладання маршрутів оффлайн для коротких відстаней (експериментальна функція), - Режими для пішохідної, автомобільної та велонавігації: - можливість перемикання на денний/нічний режим показу, - мапи відповідно до швидкості руху, - можливість орієнтації мапи за компасом чи напрямком руху, - показ руху по смугах та обмежень швидкості, голосове супроводження (записане чи синтезоване). "</string>
 	
 	<string name="tip_rotation_switching_t_v2">Натиснувши на іконку компаса на екрані з мапою ви можете змінити режим повороту мапи
 		\n\nДоступні варіанти
@@ -1309,18 +1266,16 @@ OsmAnd має відкриті сирці і активно розвиваєть
 		\n\t \'За напрямком руху\' - Мапа буде обертатись у відповідності з напрямком вашого руху. Вгорі - напрямок руху
 		\n\t  \'За напрямком компаса\' - Мапа буде обертатись так, щоб сумістити північ мапи і північний напрямок (використовуються дані компаса з пристрою)
 	</string>
-	<string name="tip_day_night_mode_t_v2">Для локальних векторних мап можна змінювати вигляд залежно від часу доби: вдень (свтлі), вночі (темні). Нічний режим безпечніший для використання водіями в темряві
-		\n\nДля зміни денного/нічного режимів натисніть \'Меню\' → \'Налаштування екрану\' → \'Денний/нічний режим\'
-		\n\nМожливі варіанти:
-		\n\t \'Схід/Захід сонця\' - автоматичний режим, що керується даними про положення сонця (типовий)
-		\n\t \'Денний\' - завжди використовується денний режим
-		\n\t \'Нічний\' - завжди використовується нічний режим
-		\n\t \'Датчик освітленості\' - вигляд мапи змінюється автоматично в залежності від датчика освітленості (при його наявності) у вашому пристрої
-	</string>	
-	<string name="tip_map_switch_t_v2">Мапи і шари можна змінювати через \'\Меню\' → \'Шари мапи\'.
-		\n\nВ \'Джерела мап…\' можна вибрати попередньо завантажені векторі мапи (типово потрібні для навігації оффлайн), чи попередньо вказані (онлайнові чи кешовані) джерела квадратів мап (для використання потрібно увімкнути втулок \'Онлайн мапи\') або самостійно створені мапи (наприклад, за допомогою OsmAndMapCreator для ПК).
-		\n\nOsmAnd також підтримує джерела вказані користувачем.
-	</string>
+	<string name="tip_day_night_mode_t_v2">"Для локальних векторних мап можна змінювати вигляд залежно від часу доби: вдень (світлі), вночі (темні). Нічний режим безпечніший для використання водіями в темряві
+\n\nДля зміни денного/нічного режимів натисніть \'Меню\' → \'Налаштування Мапи\' → \'Денний/нічний режим\'
+\n\nМожливі варіанти:
+\n\t \'Схід/Захід сонця\' - автоматичний режим, що керується даними про положення сонця (типовий)
+\n\t \'Денний\' - завжди використовується денний режим
+\n\t \'Нічний\' - завжди використовується нічний режим
+\n\t \'Датчик освітленості\' - вигляд мапи змінюється автоматично в залежності від датчика освітленості (при його наявності) у вашому пристрої "</string>	
+	<string name="tip_map_switch_t_v2">"Мапи і шари можна змінювати через \'Меню\' → \'Налаштування Мапи\'.
+\n\nВ \'Джерела мап…\' можна вибрати попередньо завантажені векторі мапи (типово потрібні для навігації оффлайн), чи попередньо вказані (онлайнові чи кешовані) джерела квадратів мап (для використання потрібно увімкнути втулок \'Онлайн мапи\') або самостійно створені мапи (наприклад, за допомогою OsmAndMapCreator для ПК).
+\n\nOsmAnd також підтримує джерела вказані користувачем. "</string>
 	<string name="street_name">Вулиця</string>
 	<string name="hno">Номер будинку</string>
     <string name="tip_recent_changes_1_3_t">Зміни в 1.3:
@@ -1492,9 +1447,8 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="speak_speed_limit">Попереджати про обмеження швидкості</string>
     <string name="speak_cameras">Попереджати про камери фіксації швидкості</string>
 	<string name="speak_traffic_warnings">Попереджати про перешкоди на шляху</string>
-	<string name="binary_map_download_success">Завантаження закінчено.
-		\n\t\n\tДля використання мап скористайтесь \'Меню\' → \'Мапа\' → \'Джерело мапи…\' → \'Оффлайн векторні мапи\'.
-	</string>
+	<string name="binary_map_download_success">"Завантаження закінчено.
+\n\t\n\tДля використання мап скористайтесь \'Меню\' → \'Налаштування Мапи\' → \'Джерело мапи…\' → \'Оффлайн векторні мапи\'. "</string>
 	<string name="route_descr_map_location">Мапа: </string>
     <string name="osb_author_or_password_not_specified">Введіть OSM логін і пароль в налаштуваннях</string>
     <string name="clear_intermediate_points">Очистити проміжні точки</string>
@@ -1584,12 +1538,11 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="edit_tilesource_name">Назва</string>
     <string name="maps_define_edit">Визначити/змінити…</string>
 	<string name="tip_map_styles">Стилі мапи</string>
-	<string name="tip_map_styles_t">OsmAnd підтримує показ локальних векторних мап різними стилями, відповідно до ваших потреб:
-		\n\nНа відміну від збалансованого \'типового\' стилю, в \'Меню\' → \'Налаштування екрану\' → \'Стилі мап\' оберіть для прикладу
-		\n\t* \'Туристичний стиль\', якій містить більш докладну інформацію для туристичних подорожей, включаючи оптимізацію для професійних водіїв (більша контрастність, більш помітні дороги), налаштування для гірських походів (шкала SAC), велосипедні маршрути, підтримку символів для пішого туризму й т.і.
-		\n\t* \'Висока контрастність доріг\' показує дороги дуже помітними кольорами для того щоб вони були помітні навіть у сонячний день чи дуже яскравому освітленні
-		\n\t* \'Зимові та гірськолижні\' відтворює зимовий вигляд (все порито снігом), а також показує основні гірськолижні спуски та підйомники (якщо завантажено мапу \'World ski\')
-	</string>
+	<string name="tip_map_styles_t">"OsmAnd підтримує показ локальних векторних мап різними стилями, відповідно до ваших потреб:
+\n\nНа відміну від збалансованого \'типового\' стилю, в \'Меню\' → \'Налаштування мапи\' → \'Стилі мап\' оберіть для прикладу
+\n\t* \'Туристичний стиль\', якій містить більш докладну інформацію для туристичних подорожей, включаючи оптимізацію для професійних водіїв (більша контрастність, більш помітні дороги), налаштування для гірських походів (шкала SAC), велосипедні маршрути, підтримку символів для пішого туризму й т.і.
+\n\t* \'Висока контрастність доріг\' показує дороги дуже помітними кольорами для того щоб вони були помітні навіть у сонячний день чи дуже яскравому освітленні
+\n\t* \'Зимові та гірськолижні\' відтворює зимовий вигляд (все порито снігом), а також показує основні гірськолижні спуски та підйомники (якщо завантажено мапу \'World ski\') "</string>
     <string name="base_world_map">основна мапа світу</string>
 	
     
@@ -1965,4 +1918,63 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="confirm_every_run">Завжди питати</string>
 	<string name="save_global_track_interval_descr">Оберіть інтервал періодичності запису треку (вмикається через віджет запису GPX)</string>
 	<string name="save_global_track_interval">Загальний інтервал запису</string>
+	<string name="home_button">Додому</string>
+    <string name="show_map">Показати мапу</string>
+	<string name="osmo_use_https_descr">Використовувати захищене з’єднання з сервером</string>
+    <string name="osmo_use_https">Використовувати https</string>
+	<string name="advanced_settings">Додатково</string>
+	<string name="map_update">Мапи</string>
+	<string name="search_for">Шукати</string>
+	<string name="show_all">Показати все</string>
+	<string name="coordinates">Координати</string>
+	<string name="rendering_attr_tramTrainRoutes_name">Маршрути трамваїв та поїздів</string>
+	<string name="lock_screen_request_explanation">%1$s потрібен цей дозвіл, щоб вимкнути екран для економії енергії.</string>
+    <string name="wake_on_voice">Увімкнути екран</string>
+    <string name="wake_on_voice_descr">Вмикати екран телефону під час наближення до повороту</string>
+    <string name="wake_on_voice_never">Ніколи</string>
+    <string name="select_impassable_road">Вибрати на мапі</string>
+    <string name="impassable_road">Уникати дороги…</string>
+    <string name="tip_recent_changes_1_9_t">"Зміни в 1.9: * Оновлені стилі мап із зазначенням типу покриття доріг, маршрутів громадського транспорту та символів для пішого туризму * Пошук POI вздовж маршруту * Позначення доріг як непроїзних, в сеансі * Прості завантаження та оновлення мап * Візуальні та звукові сповіщення під час наближення до точки маршрути * Друк маршруту та інформації про повороти * Підтримка смуг рушу * Робота з Android Wear * Багато змін в інтерфейсі * Окреме збільшення для тексту на мапі * Спеціальні звукові повідомлення, якщо ви зійшли з маршруту * Авторизація на OsMo * Виправлення несумісностей з версією OsMo "</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Маршрути поїздів</string>
+    <string name="rendering_attr_tramRoutes_name">Маршрути трамваїів</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Маршрутне таксі</string>
+    <string name="rendering_attr_trolleybusRoutes_name">Маршрути тролейбусів</string>
+    <string name="rendering_attr_busRoutes_name">Маршрути автобусів</string>
+    <string name="rendering_category_hide">Сховати</string>
+    <string name="rendering_category_routes">Маршрути</string>
+    <string name="rendering_category_details">Деталі</string>
+    <string name="rendering_category_transport">Транспорт</string>
+    <string name="rendering_category_others">Інші властивості мапи</string>
+    <string name="map_widget_appearance_rem">Решта елементів</string>
+    <string name="map_widget_top">Рядок стану</string>
+	<string name="map_widget_right">Панель праворуч</string>
+	<string name="map_widget_left">Панель ліворуч</string>
+    <string name="layers_category_show">Показати</string>
+	<string name="configure_map">Налаштування Мапи</string>
+    <string name="search_radius_proximity">Поруч з</string>
+    <string name="osmo_device_not_found">Пристрій не знайдено</string>
+    <string name="osmo_no_connection_msg">Сервіс OsMo не доступний:\n- перевірте з’єднання;\n- перевірте налаштування;\n- перевірте наш Twitter: https://twitter.com/OsMomobi</string>
+    <string name="anonymous_user_hint">Анонімний користувач не в змозі:\n- створювати групи;\n- синхронізувати грипу та пристрої з сервером;\n- керувати групами та пристроями в особистому кабінеті.</string>
+    <string name="anonymous_user">Анонімний користувач</string>
+    <string name="logged_as">Ви увійшли як %1$s</string>
+	<string name="speed_limit_exceed">Допустиме перевищення швидкості</string>
+	<string name="speed_limit_exceed_message">Оберіть допустиме значення перевищення швидкості, після якого ви почуєте попередження.</string>
+	<string name="fav_point_emoticons_message">Назву закладки було змінено на %1$s, щоб мати можливість зберігати рядки зі смайликами в файл.</string>
+    <string name="print_route">Друк маршруту</string>
+    <string name="test_native_render">Перевірка вбудованої візуалізації</string>
+    <string name="test_native_render_msg">Розпочати роботу із вбудованою візуалізацією</string>
+    <string name="fav_point_dublicate">Дублювання назви закладки</string>
+    <string name="fav_point_dublicate_message">Назва закладки була змінена на %1$s, щоб уникнути дублікатів.</string>
+    <string name="use_native_render">Використовувати вбудовану візуалізацію</string>
+    <string name="use_native_render_descr">Використовувати візуалізацію C++ замість Java</string>
+    <string name="text_size_descr">Встановлення розміру тексту на мапі.</string>
+    <string name="text_size">Розмір тексту</string>
+    <string name="traffic_warning_speed_limit">Обмеження швидкості</string>
+    <string name="traffic_warning_border_control">Прикордонний контроль</string>
+    <string name="traffic_warning_payment">Збирання плати за проїзд</string>
+    <string name="traffic_warning_stop">Знак СТОП</string>
+    <string name="traffic_warning_calming">Зниження швидкості</string>
+    <string name="traffic_warning_speed_camera">Фото-радар</string>
+    <string name="traffic_warning">Попередження на дорозі</string>
+	<string name="local_index_description">Клацніть будь-який наявний елемент для перегляду додаткових відомостей, натисніть і утримуйте, щоб деактивувати або вилучити. Поточні дані на пристрої (%1$s вільно):</string>
 	</resources>

From d9539c422f98697cfc44385abd37e289167952d6 Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 12:01:15 +0100
Subject: [PATCH 121/138] Translated using Weblate (Ukrainian)

Currently translated at 100% (0 of 0 strings)

Created new translation.
---
 OsmAnd/res/values-uk/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 OsmAnd/res/values-uk/phrases.xml

diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 030c7112ea7801fe985f3541e10202224c9cb7ad Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Fri, 28 Nov 2014 11:20:02 +0100
Subject: [PATCH 122/138] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-be/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index f4e3e7f64a..49e58ecd1f 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1520,7 +1520,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="routing_attr_avoid_motorway_description">Пазьбягаць аўтамагістралі</string>
 	<string name="routing_attr_weight_name">Абмежаваньне вагі</string>
 	<string name="routing_attr_weight_description">Задайце вагу аўтамабіля для пракладаньня маршрутаў</string>
-    <string name="application_dir_change_warning2">Вы хочаце каб OsmAnd паспрабаваў скапіяваць свае зьвесткі ў новае месца?</string>
+    <string name="application_dir_change_warning2">Вы хочаце каб OsmAnd таксама скапіяваў свае зьвесткі ў новае месца?</string>
     <string name="copying_osmand_one_file_descr">Капіраваньне файла (%s) у новае месца...</string>
     <string name="copying_osmand_files_descr">Капіяваньне дадзеных OsmAnd у новае месца (%s)</string>
     <string name="copying_osmand_files">Капіяваньне дадзеных OsmAnd</string>

From bea933fd496b90b9bfebfbda24005d2da360015e Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 11:31:48 +0100
Subject: [PATCH 123/138] Translated using Weblate (Danish)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-da/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 922797997d..8342197de1 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1455,7 +1455,7 @@
     <string name="routing_preferences_descr">Indstillinger for ruteplanlægning</string>
     <string name="app_mode_truck">Lastbil</string>
     <string name="calculate_osmand_route_gpx">Beregn OsmAnd offline rute</string>
-    <string name="application_dir_change_warning2">OsmAnd kan forsøge at flytte data til ny destination . Vil du det?\n\nSkal OsmAnd forsøge at kopiere datafiler til den nye placering?</string>
+    <string name="application_dir_change_warning2">"Skal OsmAnd også  kopiere datafiler til den nye placering?"</string>
     <string name="copying_osmand_one_file_descr">Kopierer fil (%s) til den ny placering...</string>
     <string name="copying_osmand_files_descr">Kopierer OsmAnd datafiler til ny destination (%s)</string>
     <string name="copying_osmand_files">Kopierer OsmAnd datafiler</string>

From 2154b3f2b74100fc8cbd1395cab3114c8688d225 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Fri, 28 Nov 2014 11:52:41 +0100
Subject: [PATCH 124/138] Translated using Weblate (French)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 52133e69bc..6570fe58ed 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1466,7 +1466,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="routing_preferences_descr">Paramètres d\'itinéraire</string>
     <string name="android_19_location_disabled">Depuis Android 4.4 (KitKat), vous ne pouvez plus télécharger et mettre à jour les cartes dans le dossier (%s) utilisé jusqu\'à présent. Voulez-vous utiliser le nouveau dossier et y copier l\'ensemble des fichiers OsmAnd ?
 \n Note 1 : Les anciens fichiers seront conservés (mais vous pouvez les supprimer manuellement)\n Note 2 : En raison de ce nouveau dossier de stockage, il ne sera plus possible de partager des fichiers entre OsmAnd et OsmAnd+.</string>
-    <string name="application_dir_change_warning2">Souhaitez-vous qu\'OsmAnd copie les données vers la nouvelle destination ?</string>
+    <string name="application_dir_change_warning2">Souhaitez-vous qu\'OsmAnd copie aussi ses données vers la nouvelle destination ?</string>
     <string name="copying_osmand_one_file_descr">Copie des fichiers (%s) vers la nouvelle destination...</string>
     <string name="copying_osmand_files_descr">Copie des fichiers de données OsmAnd vers la nouvelle destination (%s)</string>
     <string name="copying_osmand_files">Copie des fichiers de données OsmAnd</string>

From f297dea7321482f902a826589293523814283a2d Mon Sep 17 00:00:00 2001
From: Jurijus <atvejis@gmail.com>
Date: Fri, 28 Nov 2014 11:12:53 +0100
Subject: [PATCH 125/138] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-lt/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index ba4bc15764..d984f7daa1 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1471,7 +1471,7 @@
     <string name="android_19_location_disabled">Pradedant Android 4.4 versija jūs nebegalėsite parsisųsti ir atnaujinti žemėlapių ankstesnėse saugojimo vietose (%s). Ar norite pakeisti saugyklos vietą ir į ją nukopijuoti visus failus?
 \n Pastaba: Seni failai išliks kur buvę (galima bus ištrinti rankiniu būdu).
 \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima.</string>
-    <string name="application_dir_change_warning2">OsmAnd gali pabandyti perkelti duomenis į naują saugyklą. Ar atlikti tai?</string>
+    <string name="application_dir_change_warning2">Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą?</string>
     <string name="copying_osmand_one_file_descr">Kopijuojami failai (%/s) į naują saugojimo vietą...</string>
     <string name="copying_osmand_files_descr">OsmAnd failai kopijuojami į naują vietą (%/s)</string>
     <string name="copying_osmand_files">Kopijuojami OsmAnd failai</string>

From 852871af3e831928e0cc2c1cf7a03ac1d1c31a85 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Fri, 28 Nov 2014 12:01:12 +0100
Subject: [PATCH 126/138] Translated using Weblate (French)

Currently translated at 67.0% (390 of 582 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 823c4f4cce..bdd3caa329 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -385,4 +385,21 @@
 	<string name="poi_works">Usine</string>
 	<string name="poi_wreck">Épave</string>
 	<string name="poi_zoo">Zoo</string>
-</resources>
\ No newline at end of file
+<string name="poi_shop_tea">Salon de thé</string>
+	<string name="poi_art_shop">Boutique d\'Art</string>
+	<string name="poi_carpet_shop">Magasin de tapis</string>
+	<string name="poi_computer_shop">Boutique informatique</string>
+	<string name="poi_dive_shop">Équipement de plongée sous-marine</string>
+	<string name="poi_ship_chandler">Magasin d\'accastillage</string>
+	<string name="poi_gate">Pont</string>
+	<string name="poi_traffic_signals">Feux tricolores</string>
+
+	<string name="poi_service_tyres">Pneus</string>
+	<string name="poi_public_transport_platform_bus">Arrêt de bus</string>
+	<string name="poi_subway_station">Station de métro</string>
+	<string name="poi_tunnel">Tunnel</string>
+	<string name="poi_register_office">Bureau d\'état civil</string>
+	<string name="poi_customs">Douanes</string>
+	<string name="poi_healthcare_centre">Centre médical</string>
+	<string name="poi_speech_therapist">Orthophoniste</string>
+	</resources>

From ee758dc0638fce1a6f9fdd174f8f5a7071496fa5 Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Fri, 28 Nov 2014 11:19:04 +0100
Subject: [PATCH 127/138] Translated using Weblate (Russian)

Currently translated at 93.1% (542 of 582 strings)
---
 OsmAnd/res/values-ru/phrases.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 7a2f2e5767..8ff939f3be 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -609,4 +609,10 @@
 
 	<string name="poi_palaeontological_site">Палеонтологический сайт</string>
 
+	<string name="poi_ridge">Горный хребет</string>
+	<string name="poi_glacier">Ледник</string>
+	<string name="poi_river">Река</string>
+	<string name="poi_stream">Ручей</string>
+	<string name="poi_military">Военная зона</string>
+	<string name="poi_pier">Пирс</string>
 	</resources>

From 40e66cf06007acfcec7f41997e60de175d9b025f Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Fri, 28 Nov 2014 12:02:04 +0100
Subject: [PATCH 128/138] Translated using Weblate (French)

Currently translated at 67.3% (392 of 582 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index bdd3caa329..c7b56d7d60 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -402,4 +402,6 @@
 	<string name="poi_customs">Douanes</string>
 	<string name="poi_healthcare_centre">Centre médical</string>
 	<string name="poi_speech_therapist">Orthophoniste</string>
+	<string name="poi_advertising_agency">Agence de publicité</string>
+	<string name="poi_chess">Échecs</string>
 	</resources>

From b2f8268ca8616fd23d430e68531d96f94c81a453 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Fri, 28 Nov 2014 12:05:19 +0100
Subject: [PATCH 129/138] Translated using Weblate (Italian)

Currently translated at 0.1% (1 of 582 strings)
---
 OsmAnd/res/values-it/phrases.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index a6b3daec93..84518aa124 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -1,2 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_mall">Centro commerciale</string>
+	</resources>

From bec817cd274acd5db0601c7a7a5331f54c6279df Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 12:05:16 +0100
Subject: [PATCH 130/138] Translated using Weblate (Ukrainian)

Currently translated at 0.5% (3 of 582 strings)
---
 OsmAnd/res/values-uk/phrases.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index a6b3daec93..c661a18939 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -1,2 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_palaeontological_site">Палеонтологічний місце</string>
+
+	<string name="poi_bakery">Булочна</string>
+	<string name="poi_alcohol">Спиртні напої</string>
+	</resources>

From 42f9971f1329fe98c2bdad6f3117b3e97ccb8ffa Mon Sep 17 00:00:00 2001
From: elPresidento <ludek.m@gmail.com>
Date: Fri, 28 Nov 2014 13:22:07 +0100
Subject: [PATCH 131/138] Translated using Weblate (Czech)

Currently translated at 100.0% (1568 of 1568 strings)
---
 OsmAnd/res/values-cs/strings.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index cb585696c5..0d96cc4e51 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1381,9 +1381,8 @@ s často kladenými otázkami.</string>
 	<string name="routing_attr_avoid_motorway_description">Vyhnout se dálnicím</string>
 	<string name="routing_attr_weight_name">Hmotnostní limit</string>
 	<string name="routing_attr_weight_description">Zadejte hmotnost vozidla, která musí být povolená na cestách</string>
-    <string name="android_19_location_disabled">Od verze KitKat není možné stahovat a aktualizovat mapy v předchozím úložišti (%s). Chcete ho změnit na vhodné nové a zkopírovat do něj všechny soubory.
-        \n Poznámka: původní soubory zůstanou nedotčeny.  
-        \n Poznámka: nebude možné sdílet soubory mezi OsmAnd a OsmAnd+. </string>
+    <string name="android_19_location_disabled">Od verze Androidu 4.4 (KitKat) není možné stahovat a aktualizovat mapy v předchozím úložišti (%s). Chcete ho změnit na vhodné nové úložiště a zkopírovat do něj všechny soubory?\n Poznámka 1: Původní soubory zůstanou nedotčeny a mohou být smazány ručně.
+\n Poznámka 2: V novém úložišti nebude možné sdílet soubory mezi OsmAnd a OsmAnd+.</string>
     <string name="application_dir_change_warning2">OsmAnd může zkusit přesunout data do nového cíle. Souhlasíte?</string>
     <string name="copying_osmand_one_file_descr">Kopírování souboru (%s) do nového umístění...</string>
     <string name="copying_osmand_files_descr">Kopírování souborů OsmAnd do nového umístění (%s)</string>
@@ -1774,4 +1773,12 @@ s často kladenými otázkami.</string>
 	<string name="lock_screen_request_explanation">%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.</string>
     <string name="wake_on_voice_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
+	<string name="home_button">Domov</string>
+    <string name="show_map">ZOBRAZIT MAPU</string>
+	<string name="osmo_use_https_descr">Použít zabezpečené spojení se serverem</string>
+    <string name="osmo_use_https">Použít HTTPS</string>
+	<string name="map_update">Mapy</string>
+	<string name="search_for">Hledat</string>
+	<string name="show_all">ZOBRAZIT VŠE</string>
+	<string name="coordinates">Souřadnice</string>
 	</resources>

From 9c60280b607898d7be5e16932cf4c3fd3b6ac336 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 28 Nov 2014 14:57:05 +0200
Subject: [PATCH 132/138] Added loading indicators and fixed rare bug with
 rotation

---
 OsmAnd/res/layout/dash_favorites_fragment.xml |  1 +
 OsmAnd/res/layout/dash_map_fragment.xml       | 29 +++++++++++-----
 OsmAnd/res/layout/dash_updates_fragment.xml   |  1 +
 .../plus/activities/DashboardActivity.java    |  2 +-
 .../plus/dashboard/DashUpdatesFragment.java   | 33 ++++++++++---------
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/res/layout/dash_favorites_fragment.xml b/OsmAnd/res/layout/dash_favorites_fragment.xml
index 1cf9e25484..7bd3f5c4c9 100644
--- a/OsmAnd/res/layout/dash_favorites_fragment.xml
+++ b/OsmAnd/res/layout/dash_favorites_fragment.xml
@@ -3,6 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:id="@+id/main_fav"
 			  android:background="@drawable/bg_cardui"
+			  android:layout_marginBottom="4dp"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
 			  android:orientation="vertical">
diff --git a/OsmAnd/res/layout/dash_map_fragment.xml b/OsmAnd/res/layout/dash_map_fragment.xml
index a140aee42b..898b274829 100644
--- a/OsmAnd/res/layout/dash_map_fragment.xml
+++ b/OsmAnd/res/layout/dash_map_fragment.xml
@@ -17,13 +17,24 @@
 				style="@style/DashboardGeneralButton"/>
 	</LinearLayout>
 
-	<net.osmand.plus.views.OsmAndMapSurfaceView
-			android:id="@+id/MapView"
-			android:layout_width="fill_parent"
-			android:layout_height="110dp"
-			android:layout_marginLeft="2dp"
-			android:layout_marginRight="2dp"
-			android:layout_marginBottom="2dp"
-			android:contentDescription="@string/map_view"
-			android:visibility="gone"/>
+	<RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
+		<ProgressBar android:id="@+id/map_progress"
+					 android:layout_width="wrap_content"
+					 android:layout_height="wrap_content"
+					 android:layout_centerInParent="true"
+					 style="@android:style/Widget.ProgressBar.Small"
+					 android:indeterminate="true"
+					 android:indeterminateOnly="true"/>
+
+		<net.osmand.plus.views.OsmAndMapSurfaceView
+				android:id="@+id/MapView"
+				android:layout_width="fill_parent"
+				android:layout_height="110dp"
+				android:layout_marginLeft="2dp"
+				android:layout_marginRight="2dp"
+				android:layout_marginBottom="2dp"
+				android:contentDescription="@string/map_view"
+				android:visibility="gone"/>
+	</RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_updates_fragment.xml b/OsmAnd/res/layout/dash_updates_fragment.xml
index f0e6623b1c..6680c3b211 100644
--- a/OsmAnd/res/layout/dash_updates_fragment.xml
+++ b/OsmAnd/res/layout/dash_updates_fragment.xml
@@ -25,6 +25,7 @@
 				  android:textColor="@color/dashboard_blue"
 				  android:layout_height="wrap_content"/>
 		<ProgressBar android:id="@+id/main_progress"
+					 android:visibility="visible"
 					 android:layout_marginLeft="2dp"
 					 android:indeterminate="true"
 					 android:indeterminateOnly="true"
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index d9cbabe8b8..e3fe3a9c59 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -387,7 +387,7 @@ public class DashboardActivity extends BaseDownloadActivity {
 		menu.add(0, 1, 0, R.string.settings).setIcon(R.drawable.ic_ac_settings)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 		menu.add(0, 2, 0, R.string.exit_Button).setIcon(R.drawable.ic_ac_close)
-				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		return true;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
index 850b771f1c..2f2abdbb37 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
@@ -57,11 +57,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		if (BaseDownloadActivity.downloadListIndexThread != null){
+		if (BaseDownloadActivity.downloadListIndexThread != null) {
 			currentProgress = null;
 			cancelButton = null;
-			updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate());
 		}
+		updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate());
 	}
 
 	public void updatedDownloadsList(List<IndexItem> list) {
@@ -74,7 +74,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		baseNames.clear();
 		downloadButtons.clear();
 		mainView.findViewById(R.id.main_progress).setVisibility(View.GONE);
-		((TextView)mainView.findViewById(R.id.update_count)).setText(String.valueOf(list.size()));
+		((TextView) mainView.findViewById(R.id.update_count)).setText(String.valueOf(list.size()));
 		if (list.size() < 1) {
 			return;
 		}
@@ -101,10 +101,10 @@ public class DashUpdatesFragment extends DashBaseFragment {
 				public void onClick(View view) {
 					getDownloadActivity().startDownload(item);
 					currentProgress = progressBar;
-					cancelButton = (ImageButton)view;
+					cancelButton = (ImageButton) view;
 				}
 			});
-			downloadButtons.add((ImageButton)downloadButton);
+			downloadButtons.add((ImageButton) downloadButton);
 			baseNames.add(item.getBasename());
 			progressBars.add(progressBar);
 			updates.addView(view);
@@ -112,24 +112,24 @@ public class DashUpdatesFragment extends DashBaseFragment {
 		updateProgress(BaseDownloadActivity.downloadListIndexThread.getCurrentRunningTask(), false);
 	}
 
-	private BaseDownloadActivity getDownloadActivity(){
-		return (BaseDownloadActivity)getActivity();
+	private BaseDownloadActivity getDownloadActivity() {
+		return (BaseDownloadActivity) getActivity();
 	}
 
 	public void updateProgress(BasicProgressAsyncTask<?, ?, ?> basicProgressAsyncTask, boolean updateOnlyProgress) {
-		if (basicProgressAsyncTask == null){
+		if (basicProgressAsyncTask == null) {
 			return;
 		}
 		//needed when rotation is performed and progress can be null
-		if (currentProgress == null){
+		if (currentProgress == null) {
 			getProgressIfPossible(basicProgressAsyncTask.getDescription());
-			if (currentProgress == null){
+			if (currentProgress == null) {
 				return;
 			}
 		}
 
-		if(updateOnlyProgress){
-			if(!basicProgressAsyncTask.isIndeterminate()){
+		if (updateOnlyProgress) {
+			if (!basicProgressAsyncTask.isIndeterminate()) {
 				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}
 		} else {
@@ -147,7 +147,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
 			});
 			boolean intermediate = basicProgressAsyncTask.isIndeterminate();
 			currentProgress.setVisibility(intermediate ? View.GONE : View.VISIBLE);
-			getView().findViewById(R.id.main_progress).setVisibility(intermediate ? View.VISIBLE : View.GONE);
+			//getView().findViewById(R.id.main_progress).setVisibility(intermediate ? View.VISIBLE : View.GONE);
 			if (!intermediate) {
 				currentProgress.setProgress(basicProgressAsyncTask.getProgressPercentage());
 			}
@@ -155,8 +155,11 @@ public class DashUpdatesFragment extends DashBaseFragment {
 	}
 
 	private void getProgressIfPossible(String message) {
-		for (int i =0; i<baseNames.size(); i++){
-			if (message.equals(getActivity().getString(R.string.downloading_file_new) + " " + baseNames.get(i))){
+		if (getActivity() == null){
+			return;
+		}
+		for (int i = 0; i < baseNames.size(); i++) {
+			if (message.equals(getActivity().getString(R.string.downloading_file_new) + " " + baseNames.get(i))) {
 				currentProgress = progressBars.get(i);
 				cancelButton = downloadButtons.get(i);
 				currentProgress.setVisibility(View.VISIBLE);

From 31bfe3b5c32dce63111962d53f65ef9f729ba132 Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@gmail.com>
Date: Fri, 28 Nov 2014 12:08:04 +0100
Subject: [PATCH 133/138] Translated using Weblate (French)

Currently translated at 67.6% (394 of 582 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index c7b56d7d60..5cecb8d683 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -404,4 +404,7 @@
 	<string name="poi_speech_therapist">Orthophoniste</string>
 	<string name="poi_advertising_agency">Agence de publicité</string>
 	<string name="poi_chess">Échecs</string>
+	<string name="poi_palaeontological_site">Site paléontologique</string>
+
+	<string name="poi_shop_farm">Commerce à la ferme</string>
 	</resources>

From 0b6a0f09ded7ed1559249b68a19b96ad4075f665 Mon Sep 17 00:00:00 2001
From: Aleksei Polkhirev <polkhirev@gmail.com>
Date: Fri, 28 Nov 2014 13:27:24 +0100
Subject: [PATCH 134/138] Translated using Weblate (Russian)

Currently translated at 99.8% (1566 of 1568 strings)
---
 OsmAnd/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 8a52dc359c..de3e4d8843 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1820,4 +1820,6 @@
     <string name="advanced_settings">Расширенные</string>
 	<string name="map_update">Карты</string>
 	<string name="coordinates">Координаты</string>
+	<string name="home_button">Дом</string>
+    <string name="search_for">Поиск</string>
 	</resources>

From 2f0dc203241f2ed0428e590541f58db919a7b060 Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Fri, 28 Nov 2014 13:25:30 +0100
Subject: [PATCH 135/138] Translated using Weblate (Danish)

Currently translated at 100.0% (582 of 582 strings)
---
 OsmAnd/res/values-da/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 3a94245413..cfeae9d0a0 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -118,7 +118,7 @@
         <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
         <string name="poi_traffic_calming_table">Trafikdæmpning, bord</string>
         <string name="poi_traffic_calming_choker">Indsnævring</string>
-        <string name="poi_traffic_signals">Trafiksignal</string>
+        <string name="poi_traffic_signals">Trafiklys</string>
 
         <string name="poi_car_repair">Autoværksted</string>
         <string name="poi_service_tyres">Dækservice</string>

From 0160a20825e00011db0daafd8f6c6be63c378029 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Fri, 28 Nov 2014 12:07:40 +0100
Subject: [PATCH 136/138] Translated using Weblate (Italian)

Currently translated at 1.0% (6 of 582 strings)
---
 OsmAnd/res/values-it/phrases.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index 84518aa124..cedc0ae1dd 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -1,3 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="poi_mall">Centro commerciale</string>
+	<string name="poi_seafood">Pescheria</string>
+	<string name="poi_supermarket">Supermercato</string>
+	<string name="poi_bicycle_shop">Negozio di biciclette</string>
+	<string name="poi_vending_machine">Distributore automatico</string>
+
+	<string name="poi_bookshop">Libreria</string>
 	</resources>

From 47d0661afab12071ff5ab095521b5d2bd6b239f5 Mon Sep 17 00:00:00 2001
From: Andriy Golovin <andygol@ua.fm>
Date: Fri, 28 Nov 2014 12:42:24 +0100
Subject: [PATCH 137/138] Translated using Weblate (Ukrainian)

Currently translated at 18.7% (109 of 582 strings)
---
 OsmAnd/res/values-uk/phrases.xml | 109 +++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index c661a18939..2191d62139 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -3,4 +3,113 @@
 
 	<string name="poi_bakery">Булочна</string>
 	<string name="poi_alcohol">Спиртні напої</string>
+	<string name="poi_convenience">Магазин</string>
+	<string name="poi_mall">Торговельний центр</string>
+	<string name="poi_beverages">Напої</string>
+	<string name="poi_butcher">М’ясо</string>
+	<string name="poi_deli">Делікатеси</string>
+	<string name="poi_shop_farm">Продукти з села</string>
+	<string name="poi_greengrocer">Овочі, фрукти</string>
+	<string name="poi_seafood">Морепродукти</string>
+	<string name="poi_confectionery">Кондитерські вироби</string>
+	<string name="poi_ice_cream">Кафе-морозиво</string>
+	<string name="poi_supermarket">Супермаркет</string>
+	<string name="poi_shop_tea">Чай</string>
+	<string name="poi_dairy">Молочний магазин</string>
+	<string name="poi_vending_machine">Торговий автомат</string>
+
+	<string name="poi_bookshop">Книжковий магазин</string>
+	<string name="poi_bicycle_shop">Веломагазин</string>
+	<string name="poi_anime_shop">Магазин аніме</string>
+	<string name="poi_antiques_shop">Антикваріат</string>
+	<string name="poi_art_shop">Витвори мистетства</string>
+	<string name="poi_baby_goods">Товари для дітей</string>
+	<string name="poi_bag_shop">Сумки, валізи</string>
+	<string name="poi_bathroom_furnishing_shop">Все для ванної кімнати</string>
+	<string name="poi_bed_shop">Все для спальні</string>
+	<string name="poi_boutique">Бутік</string>
+	<string name="poi_carpet_shop">Килими</string>
+	<string name="poi_chemist_shop">Аптека</string>
+	<string name="poi_clothes_shop">Магазин одягу</string>
+	<string name="poi_children_clothes_shop">Дитячий одяг</string>
+	<string name="poi_shoes">Магазин взуття</string>
+	<string name="poi_computer_shop">Комп’ютерний магазин</string>
+	<string name="poi_copyshop">Копіювальні послуги, полігрфафія</string>
+	<string name="poi_curtain_shop">Салон штор</string>
+	<string name="poi_fabric_shop">Тканини</string>
+	<string name="poi_bedding_shop">Постільна білизна</string>
+	<string name="poi_dive_shop">Спорядження для пірнання</string>
+	<string name="poi_doityourself_shop">Інструменти та будматеріали</string>
+	<string name="poi_erotic_shop">Секс-шоп</string>
+	<string name="poi_fishing_shop">Рибальські снасті</string>
+	<string name="poi_florist">Квітковий магазин</string>
+	<string name="poi_frame_shop">Рамки, багет</string>
+	<string name="poi_furniture_shop">Меблі</string>
+	<string name="poi_garden_centre">Сад та город</string>
+	<string name="poi_gas_shop">Зріджений газ</string>
+	<string name="poi_general_shop">Магазин</string>
+	<string name="poi_gift_shop">Подарунки та сувеніри</string>
+	<string name="poi_glaziery_shop">Вікна, скло</string>
+	<string name="poi_hardware_shop">Будівельний магазин</string>
+	<string name="poi_hearing_aids_shop">Слухові апарати</string>
+	<string name="poi_herbalist">Трави</string>
+	<string name="poi_hifi_shop">HiFi апаратура</string>
+	<string name="poi_houseware_shop">Господарські товари</string>
+	<string name="poi_hunting_shop">Мисливське спорядження</string>
+	<string name="poi_interior_decoration_shop">Внутрішнє оздоблення</string>
+	<string name="poi_jewelry_shop">Ювелірний магазин</string>
+	<string name="poi_kiosk">Кіоск</string>
+	<string name="poi_kitchen_shop">Кухонні приналежності</string>
+	<string name="poi_mobile_phone_shop">Мобільні телефони</string>
+	<string name="poi_motorcycle_shop">Мотоцикли</string>
+	<string name="poi_musical_instrument_shop">Музичні інструменти</string>
+	<string name="poi_newsagent_shop">Газети та журнали</string>
+	<string name="poi_optician_shop">Окуліст</string>
+	<string name="poi_organic_shop">Органічні продукти харчування</string>
+	<string name="poi_outdoor_shop">Товари для активного відпочинку</string>
+	<string name="poi_paint_shop">Фарби</string>
+	<string name="poi_pet_shop">Зоомагазин</string>
+	<string name="poi_radiotechnics_shop">Радіодеталі</string>
+	<string name="poi_second_hand">Секонд-хенд</string>
+	<string name="poi_ship_chandler">Яхти, запчастини, оснащення</string>
+	<string name="poi_sports_shop">Спорттовари</string>
+	<string name="poi_stationery_shop">Канцтовари</string>
+	<string name="poi_tableware_shop">Посуд</string>
+	<string name="poi_ticket_shop">Продаж квитків</string>
+	<string name="poi_tobacco_shop">Тютюн</string>
+	<string name="poi_toys_shop">Іграшки</string>
+	<string name="poi_trade_shop">Факторія</string>
+	<string name="poi_vacuum_cleaner_shop">Пилососи</string>
+	<string name="poi_variety_store">Універсальний магазин</string>
+	<string name="poi_video_shop">Відео-прокат</string>
+	<string name="poi_window_blind_shop">Жалюзі, віконниці, маркізи</string>
+	<string name="poi_department_store">Универмаг</string>
+	<string name="poi_electronics_shop">Електороніка</string>
+	<string name="poi_car_shop">Автосалон</string>
+	<string name="poi_car_parts_shop">Автозапчастини</string>
+	<string name="poi_atv_shop">Квадроцикли</string>
+	<string name="poi_cosmetics_shop">Косметика</string>
+	<string name="poi_marketplace">Ринок</string>
+	<string name="poi_sewing_shop">Галантерея</string>
+
+	<string name="poi_police">Міліція/Поліція</string>
+	<string name="poi_fire_station">Пожежна частиниа</string>
+	<string name="poi_emergency_phone">Аварійний телефон</string>
+	<string name="poi_fire_hydrant">Пожежний гідрант</string>
+	<string name="poi_fire_extinguisher">Вогнегасник</string>
+	<string name="poi_fire_flapper">Заслонка</string>
+	<string name="poi_fire_hose">Пожежний рукав</string>
+	<string name="poi_fire_water_pond">Пожежний ставок</string>
+	<string name="poi_grit_bin">Ящик з піском</string>
+	<string name="poi_ambulance_station">Станція швидкої медичної допомоги</string>
+	<string name="poi_ses_station">Санепідемстанція</string>
+	<string name="poi_emergency_access_point">Місце отримання невідкладної допомоги</string>
+
+	<string name="poi_ford">Брід</string>
+	<string name="poi_mountain_pass">Перевал</string>
+	<string name="poi_gate">Ворота</string>
+	<string name="poi_city_wall">Міська стіна</string>
+	<string name="poi_lift_gate">Шлагбаум</string>
+	<string name="poi_toll_booth">Збирання плати за проїзд</string>
+	<string name="poi_border_control">Прикордонний контроль</string>
 	</resources>

From 7edae44ddcc194ed5d61a1283ae739fe7aabb21f Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Fri, 28 Nov 2014 14:22:04 +0100
Subject: [PATCH 138/138] Translated using Weblate (French)

Currently translated at 67.6% (394 of 582 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 5cecb8d683..797bf3ba78 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -406,5 +406,5 @@
 	<string name="poi_chess">Échecs</string>
 	<string name="poi_palaeontological_site">Site paléontologique</string>
 
-	<string name="poi_shop_farm">Commerce à la ferme</string>
+	<string name="poi_shop_farm">Vente à la ferme</string>
 	</resources>