From 15cf60c8dc4a5ab669750f36340b25859df53db2 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 5 Feb 2015 18:58:41 +0200
Subject: [PATCH] Fixes

---
 OsmAnd/res/layout/plugin.xml  | 34 +++++++++++++++++++++++++++++++---
 OsmAnd/res/values/attrs.xml   |  3 +++
 OsmAnd/res/values/colors.xml  |  6 ++++++
 OsmAnd/res/values/strings.xml |  1 +
 OsmAnd/res/values/styles.xml  |  6 ++++++
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 6da9611e0d..85b18837b8 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -15,15 +15,17 @@
 		<ImageView
 			android:layout_width="match_parent"
 			android:layout_height="144dp"
-			android:background="@drawable/bg_plugin_logo_enabled"
+			android:background="#ff8f00"
 			android:scaleType="center"
 			android:src="@drawable/ic_extension_dark"/>
 
 		<FrameLayout
+			android:id="@+id/plugin_header"
 			android:layout_width="match_parent"
 			android:layout_height="66dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp">
+			android:paddingLeft="16dp"
+			android:paddingRight="16dp"
+			android:background="?attr/plugin_details_header_bg">
 
 			<net.osmand.plus.widgets.ButtonEx
 				android:id="@+id/plugin_settings"
@@ -64,6 +66,32 @@
 				osmand:typeface="@string/font_roboto_medium"/>
 		</FrameLayout>
 
+		<LinearLayout
+			android:id="@+id/plugin_header2"
+			android:layout_width="match_parent"
+			android:layout_height="66dp"
+			android:gravity="center_vertical"
+			android:paddingLeft="16dp"
+			android:paddingRight="16dp"
+			android:orientation="horizontal"
+			android:background="?attr/plugin_details_header2_bg"
+			android:visibility="gone"
+			tools:visibility="visible">
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="?attr/ic_world_globe"/>
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:text="@string/plugin_install_needs_network"
+				osmand:typeface="@string/font_roboto_regular"/>
+		</LinearLayout>
+
 		<net.osmand.plus.widgets.TextViewEx
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 925e7940a8..22bda9d145 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -26,6 +26,9 @@
 		<attr name="switch_ex_background" format="reference" />
 		<attr name="switch_ex_text_color" format="color|reference" />
 		<attr name="bg_plugin_logo_disabled" format="reference" />
+		<attr name="plugin_details_header_bg" format="color|reference" />
+		<attr name="plugin_details_header2_bg" format="color|reference" />
+		<attr name="ic_world_globe" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index c36424128a..33fd1cf392 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -103,4 +103,10 @@
 	<color name="card_bg_color_dark">#333b40</color>
 
 	<color name="get_button_text">#ffffff</color>
+
+	<color name="plugin_details_header_bg_light">#ffffff</color>
+	<color name="plugin_details_header_bg_dark">#333b40</color>
+
+	<color name="plugin_details_header2_bg_light">#dbdbdb</color>
+	<color name="plugin_details_header2_bg_dark">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9e12894a29..4680e9986a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2089,4 +2089,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="disable_plugin">Disable</string>
 	<string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Settings</string>
+	<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 1194cfef17..51f75d6dd1 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -161,6 +161,9 @@
 		<item name="switch_ex_background">@drawable/switch_ex_background_light</item>
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_light</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
+		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_light</item>
+		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_light</item>
+		<item name="ic_world_globe">@drawable/ic_world_globe_light</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -194,6 +197,9 @@
 		<item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
+		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_dark</item>
+		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_dark</item>
+		<item name="ic_world_globe">@drawable/ic_world_globe_dark</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">