Fix ui glitches

OsmAnd/res/layout/application_loading.xml

@@ -18,6 +18,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:maxLines="1"
+			android:visibility="gone"
 			android:layout_gravity="center_vertical"
 			android:textColor="@color/dashboard_divider_light"
 			android:text="@string/loading_data"

OsmAnd/res/layout/expandable_list_item_category.xml

@@ -1,36 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-			  android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/list_header_height"
-			  android:paddingRight="@dimen/list_content_padding"
+    android:orientation="horizontal"
     android:paddingLeft="@dimen/list_header_padding" >
 
-	<ImageView
-		android:id="@+id/explist_indicator"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/list_header_top_margin"
-		android:src="@drawable/expandable_category_unpushed"/>
-
-	<TextView
-		android:id="@+id/category_name"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/list_header_text_left_margin"
-		android:layout_marginTop="@dimen/list_header_top_margin"
-		android:textSize="@dimen/list_header_text_size"
-		tools:text="@string/lorem_ipsum"/>
-
     <CheckBox
         android:id="@+id/check_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/list_header_settings_top_margin"
+        android:layout_gravity="center_vertical"
         android:background="?attr/options_button_background"
         android:focusable="false"
         android:visibility="gone" />
 
+    <ImageView
+        android:id="@+id/explist_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/expandable_category_unpushed" />
+
+    <TextView
+        android:id="@+id/category_name"
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/list_header_text_left_margin"
+        android:textSize="@dimen/list_header_text_size"
+        tools:text="@string/lorem_ipsum" />
+    
+    <ImageView
+		android:id="@+id/options"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_gravity="center_vertical"
+		android:focusable="false"
+		android:visibility="gone"
+		android:background="?attr/options_button_background"
+		android:src="?attr/list_settings_icon"/>
+    
+
 </LinearLayout>

OsmAnd/res/layout/expandable_list_item_category_btn.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  xmlns:tools="http://schemas.android.com/tools"
-			  android:orientation="horizontal"
-			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content"
-			  android:minHeight="@dimen/list_header_height"
-			  android:paddingLeft="@dimen/list_header_padding">
-
-	<ImageView
-		android:id="@+id/explist_indicator"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/list_header_top_margin"
-		android:src="@drawable/expandable_category_unpushed"/>
-
-	<TextView
-		android:id="@+id/category_name"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/list_header_text_left_margin"
-		android:layout_marginTop="@dimen/list_header_top_margin"
-		android:layout_weight="1"
-		android:maxLines="1"
-		android:textSize="@dimen/list_header_text_size"
-		tools:text="@string/lorem_ipsum"/>
-
-	<ImageView
-		android:id="@+id/check_item"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/list_header_settings_top_margin"
-		android:layout_marginRight="@dimen/list_header_settings_top_margin"
-		android:background="?attr/options_button_background"
-		android:focusable="false"
-		android:src="?attr/list_settings_icon"/>
-</LinearLayout>

OsmAnd/res/layout/favorites_tree.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/MainLayout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <ExpandableListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_marginLeft="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginTop="0dp"
+        android:layout_weight="1"
+        android:groupIndicator="@android:color/transparent" />
+
+</LinearLayout>

OsmAnd/res/layout/search_history_list_item.xml

@@ -6,8 +6,7 @@
 			  android:background="?attr/expandable_list_item_background"
 			  android:minHeight="@dimen/list_item_height"
 			  android:orientation="horizontal"
-			  android:paddingLeft="@dimen/list_content_padding"
+			  android:paddingLeft="@dimen/list_content_padding">
-			  android:paddingRight="@dimen/list_content_padding">
 
 	<ImageView
 		android:id="@+id/icon"

OsmAnd/res/layout/update_index.xml

@@ -9,12 +9,14 @@
 		android:id="@+id/header_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:minHeight="@dimen/list_header_height"
 		android:orientation="horizontal"
 		android:paddingLeft="@dimen/list_header_padding">
 
 		<CheckBox
 			android:id="@+id/select_all"
 			android:focusable="false"
+			android:layout_gravity="center_vertical"
 			android:layout_marginRight="@dimen/list_header_text_left_margin"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
@@ -23,6 +25,8 @@
 			android:id="@+id/header"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:gravity="center_vertical"
 			android:layout_marginBottom="@dimen/list_header_padding"
 			android:text="@string/download_tab_updates"/>
 	</LinearLayout>

OsmAnd/res/values/strings.xml

@@ -1262,7 +1262,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="rendering_attr_hmRendered_description">Increase amount of map detail shown</string>
 	<string name="rendering_attr_hmRendered_name">Show more map detail</string>
 	<string name="local_index_routing_data">Routing data</string>
-	<string name="navigate_point_format">Format:</string>
+	<string name="navigate_point_format">Format</string>
 	<string name="poi_search_desc">POI (Point of interest) search</string>
 	<string name="address_search_desc">Address search</string>
 	<string name="navpoint_search_desc">Coordinates</string>

OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java

@@ -1,14 +1,5 @@
 package net.osmand.plus.activities;
 
-import android.content.pm.ActivityInfo;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.SearchView;
-import android.view.*;
 import gnu.trove.list.array.TIntArrayList;
 
 import java.io.File;
@@ -36,6 +27,8 @@ import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.dialogs.DirectionsDialogs;
+import net.osmand.plus.download.DownloadIndexAdapter;
+import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.ColorDialogs;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
@@ -45,11 +38,28 @@ import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.SearchView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.CheckBox;
@@ -57,6 +67,7 @@ import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.Filter;
 import android.widget.Filterable;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -74,7 +85,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 	public static final int SELECT_DESTINATIONS_ID = 5;
 	public static final int SELECT_DESTINATIONS_ACTION_MODE_ID = 6;
 
-	private FavouritesAdapter favouritesAdapter;
+	private FavouritesAdapter favouritesAdapter = new FavouritesAdapter();;
 	private FavouritesDbHelper helper;
 
 	private boolean selectionMode = false;
@@ -89,7 +100,6 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		super.onAttach(activity);
 
 		helper = getMyApplication().getFavorites();
-		favouritesAdapter = new FavouritesAdapter();
 		favouritesAdapter.synchronizeGroups();
 		setAdapter(favouritesAdapter);
 
@@ -129,6 +139,16 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 
 	}
 	
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.favorites_tree, container, false);
+		ExpandableListView listView = (ExpandableListView)view.findViewById(android.R.id.list);
+		favouritesAdapter.synchronizeGroups();
+		listView.setAdapter(favouritesAdapter);
+		setListView(listView);
+		return view;
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();
@@ -711,9 +731,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			boolean same = (selectionMode && checkBox) || (!selectionMode && !checkBox);
 			if (row == null || !same) {
 				LayoutInflater inflater = getActivity().getLayoutInflater();
-				row = inflater.inflate(
+				row = inflater.inflate(R.layout.expandable_list_item_category, parent, false);
-						selectionMode ? R.layout.expandable_list_item_category :
-							R.layout.expandable_list_item_category_btn, parent, false);
 				fixBackgroundRepeat(row);
 			}
 			adjustIndicator(groupPosition, isExpanded, row, getMyApplication().getSettings().isLightContent());
@@ -743,7 +761,11 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 					}
 				});
 			} else {
-				final ImageView ch = (ImageView) row.findViewById(R.id.check_item);
+				final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item);
+				ch.setVisibility(View.GONE);
+			}
+			final View ch = row.findViewById(R.id.options);
+			if(!selectionMode) {
 				ch.setVisibility(View.VISIBLE);
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
@@ -752,6 +774,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 					}
 
 				});
+			} else {
+				ch.setVisibility(View.GONE);
 			}
 			return row;
 		}

OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java

@@ -32,20 +32,6 @@ public class DashPluginsFragment extends DashBaseFragment {
 
 	public static final String TAG = "DASH_PLUGINS_FRAGMENT";
 
-	private final CompoundButton.OnCheckedChangeListener enableDisableListener =
-			new CompoundButton.OnCheckedChangeListener() {
-		@Override
-		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-			View pluginView = AndroidUtils.findParentViewById(buttonView, R.id.dash_plugin_item);
-			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
-			if (plugin.isActive() == isChecked || plugin.needsInstallation()) {
-				return;
-			}
-			if (OsmandPlugin.enablePlugin(getActivity(), getMyApplication(), plugin, isChecked)) {
-				updatePluginState(pluginView);
-			}
-		}
-	};
 
 
 	private final View.OnClickListener getListener = new View.OnClickListener() {
@@ -148,7 +134,7 @@ public class DashPluginsFragment extends DashBaseFragment {
 	}
 
 	private void inflatePluginView(LayoutInflater inflater, ViewGroup container,
-								   OsmandPlugin plugin) {
+								   final OsmandPlugin plugin) {
 		View view = inflater.inflate(R.layout.dash_plugin_item, container, false);
 		view.setTag(plugin);
 
@@ -166,7 +152,19 @@ public class DashPluginsFragment extends DashBaseFragment {
 		getButton.setOnClickListener(getListener);
 		enableDisableButton.setOnCheckedChangeListener(null);
 		updatePluginState(view);
-		enableDisableButton.setOnCheckedChangeListener(enableDisableListener);
+		final View pluginView = view;
+		enableDisableButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				if (plugin.isActive() == isChecked || plugin.needsInstallation()) {
+					return;
+				}
+				if (OsmandPlugin.enablePlugin(getActivity(), getMyApplication(), plugin, isChecked)) {
+					
+					updatePluginState(pluginView);
+				}
+			}
+		});
 		container.addView(view);
 	}
 }

OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java

@@ -75,9 +75,6 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
 
 	@Override
 	public boolean init(final OsmandApplication app, Activity activity) {
-		if(true) {
-			throw new IllegalStateException("Don't enable !!!");
-		}
 		if (service == null) {
 			service = new OsMoService(app, this);
 			tracker = new OsMoTracker(service, app.getSettings().OSMO_SAVE_TRACK_INTERVAL,