From f3979fef897f645e9df913dda44fdd1bee42cebb Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 5 Feb 2015 14:56:46 +0200
Subject: [PATCH] Plugins

---
 .gitignore                                    |   3 ++
 .../res/color/switch_ex_button_text_dark.xml  |   6 ++++
 .../res/color/switch_ex_button_text_light.xml |   5 +++
 OsmAnd/res/color/switch_ex_text_color.xml     |  19 ------------
 OsmAnd/res/drawable-large/Thumbs.db           | Bin 7680 -> 0 bytes
 .../drawable/bg_plugin_logo_disabled_dark.xml |   7 +++++
 .../bg_plugin_logo_disabled_light.xml         |   7 +++++
 ...in_logo.xml => bg_plugin_logo_enabled.xml} |   0
 OsmAnd/res/drawable/get_button_background.xml |  15 +++++++++
 .../res/drawable/ic_plugin_options_dark.xml   |   6 ++--
 .../res/drawable/ic_plugin_options_light.xml  |   6 ++--
 ...ound.xml => switch_ex_background_dark.xml} |   4 +--
 .../drawable/switch_ex_background_light.xml   |  29 ++++++++++++++++++
 OsmAnd/res/layout/dash_plugin_item.xml        |   6 ++--
 OsmAnd/res/layout/plugin.xml                  |  15 +++++----
 OsmAnd/res/layout/plugins_list_item.xml       |  14 ++++-----
 OsmAnd/res/values/attrs.xml                   |   3 ++
 OsmAnd/res/values/colors.xml                  |   2 ++
 OsmAnd/res/values/styles.xml                  |   6 ++++
 .../plus/activities/PluginsActivity.java      |  19 ++++++++++--
 .../plus/dashboard/DashPluginsFragment.java   |  13 +-------
 21 files changed, 123 insertions(+), 62 deletions(-)
 create mode 100644 OsmAnd/res/color/switch_ex_button_text_dark.xml
 create mode 100644 OsmAnd/res/color/switch_ex_button_text_light.xml
 delete mode 100644 OsmAnd/res/color/switch_ex_text_color.xml
 delete mode 100644 OsmAnd/res/drawable-large/Thumbs.db
 create mode 100644 OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
 rename OsmAnd/res/drawable/{bg_plugin_logo.xml => bg_plugin_logo_enabled.xml} (100%)
 create mode 100644 OsmAnd/res/drawable/get_button_background.xml
 rename OsmAnd/res/drawable/{switch_ex_background.xml => switch_ex_background_dark.xml} (84%)
 create mode 100644 OsmAnd/res/drawable/switch_ex_background_light.xml

diff --git a/.gitignore b/.gitignore
index 4f90608b8a..5fe2a52529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,8 @@ out/
 # MacOSX
 .DS_Store
 
+# Windows
+Thumbs.db
+
 # Output files
 /build
diff --git a/OsmAnd/res/color/switch_ex_button_text_dark.xml b/OsmAnd/res/color/switch_ex_button_text_dark.xml
new file mode 100644
index 0000000000..2f3ae3f24b
--- /dev/null
+++ b/OsmAnd/res/color/switch_ex_button_text_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:color="#ffffff" />
+	<item android:state_checked="true" android:state_pressed="false" android:color="#77848c" />
+	<item android:state_checked="false" android:state_pressed="true" android:color="#ffffff" />
+</selector>
diff --git a/OsmAnd/res/color/switch_ex_button_text_light.xml b/OsmAnd/res/color/switch_ex_button_text_light.xml
new file mode 100644
index 0000000000..c9eea81473
--- /dev/null
+++ b/OsmAnd/res/color/switch_ex_button_text_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:color="#ffffff" />
+	<item android:state_checked="true" android:color="#727272" />
+</selector>
diff --git a/OsmAnd/res/color/switch_ex_text_color.xml b/OsmAnd/res/color/switch_ex_text_color.xml
deleted file mode 100644
index fdba9c612f..0000000000
--- a/OsmAnd/res/color/switch_ex_text_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:state_checked="false"
-		android:state_pressed="false"
-		android:color="#ffffff"/>
-	<item
-		android:state_checked="false"
-		android:state_pressed="true"
-		android:color="#ffffff"/>
-	<item
-		android:state_checked="true"
-		android:state_pressed="false"
-		android:color="#ff8f00"/>
-	<item
-		android:state_checked="true"
-		android:state_pressed="true"
-		android:color="#ff8f00"/>
-</selector>
diff --git a/OsmAnd/res/drawable-large/Thumbs.db b/OsmAnd/res/drawable-large/Thumbs.db
deleted file mode 100644
index c3d48fe3570d53804d631317e00c7dd7e80dfdbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7680
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
Mp8qZVKbe950UH;O_W%F@

diff --git a/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml b/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
new file mode 100644
index 0000000000..2fe47ba973
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid
+		android:color="#525e66" />
+	<corners
+		android:radius="3dp" />
+</shape>
diff --git a/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml b/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
new file mode 100644
index 0000000000..5db5edda16
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid
+		android:color="#cccccc" />
+	<corners
+		android:radius="3dp" />
+</shape>
diff --git a/OsmAnd/res/drawable/bg_plugin_logo.xml b/OsmAnd/res/drawable/bg_plugin_logo_enabled.xml
similarity index 100%
rename from OsmAnd/res/drawable/bg_plugin_logo.xml
rename to OsmAnd/res/drawable/bg_plugin_logo_enabled.xml
diff --git a/OsmAnd/res/drawable/get_button_background.xml b/OsmAnd/res/drawable/get_button_background.xml
new file mode 100644
index 0000000000..0108b26e23
--- /dev/null
+++ b/OsmAnd/res/drawable/get_button_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#4caf50" />
+		</shape>
+	</item>
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#66bb6a" />
+		</shape>
+	</item>
+</selector>
diff --git a/OsmAnd/res/drawable/ic_plugin_options_dark.xml b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
index 0d038d3b4a..fe9d4f25d2 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_dark.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:top="6dp"
-		android:right="2dp">
+	<item>
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_dark"
-			android:gravity="top|end" />
+			android:gravity="center" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/drawable/ic_plugin_options_light.xml b/OsmAnd/res/drawable/ic_plugin_options_light.xml
index 44e717630a..3da3249d32 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_light.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_light.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:top="6dp"
-		android:right="2dp">
+	<item>
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_light"
-			android:gravity="top|end" />
+			android:gravity="center" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/drawable/switch_ex_background.xml b/OsmAnd/res/drawable/switch_ex_background_dark.xml
similarity index 84%
rename from OsmAnd/res/drawable/switch_ex_background.xml
rename to OsmAnd/res/drawable/switch_ex_background_dark.xml
index 0e0733261a..3964927081 100644
--- a/OsmAnd/res/drawable/switch_ex_background.xml
+++ b/OsmAnd/res/drawable/switch_ex_background_dark.xml
@@ -4,21 +4,19 @@
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ff8f00" />
-			<stroke android:width="1.5dp" android:color="#ff8f00" />
 		</shape>
 	</item>
 	<item android:state_checked="false" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ffb24c" />
-			<stroke android:width="1.5dp" android:color="#ffb24c" />
 		</shape>
 	</item>
 	<item android:state_checked="true" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="@null" />
-			<stroke android:width="1.5dp" android:color="#ff8f00" />
+			<stroke android:width="1.5dp" android:color="#77848c" />
 		</shape>
 	</item>
 	<item android:state_checked="true" android:state_pressed="true">
diff --git a/OsmAnd/res/drawable/switch_ex_background_light.xml b/OsmAnd/res/drawable/switch_ex_background_light.xml
new file mode 100644
index 0000000000..4c1034023e
--- /dev/null
+++ b/OsmAnd/res/drawable/switch_ex_background_light.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#ff8f00" />
+		</shape>
+	</item>
+	<item android:state_checked="false" android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#ffb24c" />
+		</shape>
+	</item>
+	<item android:state_checked="true" android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="@null" />
+			<stroke android:width="1.5dp" android:color="#727272" />
+		</shape>
+	</item>
+	<item android:state_checked="true" android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#66ff8f00" />
+			<stroke android:width="1.5dp" android:color="#ff8f00" />
+		</shape>
+	</item>
+</selector>
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index 24058a989a..a3470e2b21 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -22,7 +22,7 @@
 			android:layout_width="32dp"
 			android:layout_height="32dp"
 			android:layout_margin="11dp"
-			android:background="@drawable/bg_plugin_logo"
+			android:background="@drawable/bg_plugin_logo_enabled"
 			android:scaleType="center"
 			tools:src="@drawable/ic_extension_dark"/>
 
@@ -52,7 +52,7 @@
 			android:layout_marginStart="6dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginEnd="16dp"
-			android:background="@drawable/switch_ex_background"
+			android:background="?attr/switch_ex_background"
 			android:minHeight="0dp"
 			android:minWidth="0dp"
 			android:paddingTop="8dp"
@@ -60,7 +60,7 @@
 			android:paddingLeft="9.5dp"
 			android:paddingRight="9.5dp"
 			osmand:textAllCapsCompat="true"
-			android:textColor="@color/switch_ex_text_color"
+			android:textColor="?attr/switch_ex_text_color"
 			android:textOff="@string/enable_plugin"
 			android:textOn="@string/disable_plugin"
 			android:textSize="12sp"
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 9d806bac2c..6da9611e0d 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -4,8 +4,7 @@
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:layout_marginTop="?attr/actionBarSize">
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -16,7 +15,9 @@
 		<ImageView
 			android:layout_width="match_parent"
 			android:layout_height="144dp"
-			android:visibility="gone"/>
+			android:background="@drawable/bg_plugin_logo_enabled"
+			android:scaleType="center"
+			android:src="@drawable/ic_extension_dark"/>
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -45,20 +46,18 @@
 
 			<net.osmand.plus.widgets.SwitchEx
 				android:id="@+id/plugin_enable_disable"
-				android:layout_width="wrap_content"
+				android:layout_width="139dp"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical|end"
 				android:layout_marginBottom="16dp"
 				android:layout_marginTop="16dp"
-				android:background="@drawable/switch_ex_background"
-				android:minHeight="0dp"
-				android:minWidth="0dp"
+				android:background="?attr/switch_ex_background"
 				android:paddingBottom="8dp"
 				android:paddingLeft="9.5dp"
 				android:paddingRight="9.5dp"
 				android:paddingTop="8dp"
 				osmand:textAllCapsCompat="true"
-				android:textColor="@color/switch_ex_text_color"
+				android:textColor="?attr/switch_ex_text_color"
 				android:textOff="@string/enable_plugin"
 				android:textOn="@string/disable_plugin"
 				android:textSize="12sp"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index cf368f2fbd..5b71d4b8b1 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -14,12 +14,12 @@
 		android:layout_height="match_parent"
 		android:orientation="horizontal">
 
-		<ImageView
+		<ImageButton
 			android:id="@+id/plugin_logo"
 			android:layout_width="64dp"
 			android:layout_height="64dp"
 			android:layout_margin="8dp"
-			android:background="@drawable/bg_plugin_logo"
+			android:background="@drawable/bg_plugin_logo_enabled"
 			android:scaleType="center"
 			tools:src="@drawable/ic_extension_dark"/>
 
@@ -29,8 +29,8 @@
 			android:layout_marginBottom="8dp"
 			android:layout_marginLeft="6dp"
 			android:layout_marginStart="6dp"
-			android:layout_marginRight="16dp"
-			android:layout_marginEnd="16dp"
+			android:layout_marginRight="36dp"
+			android:layout_marginEnd="36dp"
 			android:layout_marginTop="8dp"
 			android:layout_weight="1"
 			android:orientation="vertical">
@@ -40,8 +40,6 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="4dp"
-				android:layout_marginRight="50dp"
-				android:layout_marginEnd="50dp"
 				android:ellipsize="end"
 				android:lines="1"
 				android:maxLines="1"
@@ -68,12 +66,13 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="top|end"
-		android:orientation="horizontal">
+		android:orientation="vertical">
 
 		<ImageView
 			android:id="@+id/plugin_is_enabled"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
 			android:layout_marginTop="6dp"
 			android:src="?attr/ic_action_check"
 			android:visibility="invisible"
@@ -83,6 +82,7 @@
 			android:id="@+id/plugin_options"
 			android:layout_width="36dp"
 			android:layout_height="36dp"
+			android:layout_marginTop="6dp"
 			android:background="?attr/ic_plugin_options"/>
 	</LinearLayout>
 </FrameLayout>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index fd3cbb783a..925e7940a8 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -23,6 +23,9 @@
 		<attr name="ic_action_marker2" format="reference" />
 		<attr name="search_background" format="reference" />
 		<attr name="ic_action_settings" format="reference" />
+		<attr name="switch_ex_background" format="reference" />
+		<attr name="switch_ex_text_color" format="color|reference" />
+		<attr name="bg_plugin_logo_disabled" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 9e7d0e14b0..c36424128a 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -101,4 +101,6 @@
 
 	<color name="card_bg_color_light">#ffffff</color>
 	<color name="card_bg_color_dark">#333b40</color>
+
+	<color name="get_button_text">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index cad2190d54..1194cfef17 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -158,6 +158,9 @@
         <item name="actionModeStyle">@style/WhiteActionMode</item>
         <item name="android:actionMenuTextColor">@color/color_white</item>
         <item name="actionMenuTextColor">@color/color_white</item>
+		<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>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -188,6 +191,9 @@
 		<item name="ic_action_marker2">@drawable/ic_action_marker2_dark</item>
 		<item name="search_background">@color/color_white</item>
 		<item name="ic_action_settings">@drawable/ic_action_settings_dark</item>
+		<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>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index 91b90ac77a..70f5087abf 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -6,6 +6,7 @@ import net.osmand.plus.R;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v7.widget.PopupMenu;
 import android.view.MenuItem;
@@ -13,7 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 public class PluginsActivity extends OsmandListActivity {
@@ -80,8 +81,22 @@ public class PluginsActivity extends OsmandListActivity {
 
 			view.setTag(plugin);
 
-			ImageView pluginLogo = (ImageView)view.findViewById(R.id.plugin_logo);
+			ImageButton pluginLogo = (ImageButton)view.findViewById(R.id.plugin_logo);
 			pluginLogo.setImageResource(plugin.getLogoResourceId());
+			if (plugin.isActive()) {
+				pluginLogo.setBackgroundResource(R.drawable.bg_plugin_logo_enabled);
+			} else {
+				TypedArray attributes =  getTheme().obtainStyledAttributes(
+						new int[] {R.attr.bg_plugin_logo_disabled});
+				pluginLogo.setBackgroundDrawable(attributes.getDrawable(0));
+				attributes.recycle();
+			}
+			pluginLogo.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					enableDisablePlugin(plugin, !plugin.isActive());
+				}
+			});
 
 			TextView pluginName = (TextView)view.findViewById(R.id.plugin_name);
 			pluginName.setText(plugin.getName());
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index 2ac1dfcbe5..08df3dc3d8 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -6,7 +6,6 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.PluginActivity;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -34,16 +33,6 @@ public class DashPluginsFragment extends DashBaseFragment {
 		}
 	};
 
-	private final View.OnClickListener pluginSettingsListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			OsmandPlugin plugin = (OsmandPlugin)view.getTag();
-
-			Class<? extends Activity> settingsActivity = plugin.getSettingsActivity();
-			startActivity(new Intent(getActivity(), settingsActivity));
-		}
-	};
-
 	private final View.OnClickListener pluginDetailsListener = new View.OnClickListener() {
 		@Override
 		public void onClick(View view) {
@@ -80,7 +69,7 @@ public class DashPluginsFragment extends DashBaseFragment {
 			if (pluginsContainer.getChildCount() > 2) {
 				break;
 			}
-			if (plugin instanceof  OsmandDevelopmentPlugin) {
+			if (plugin instanceof OsmandDevelopmentPlugin) {
 				continue;
 			}
 			if (enabledPlugins.contains(plugin)) {