Merge remote-tracking branch 'origin/master'

OsmAnd/build.gradle

@@ -8,8 +8,8 @@ apply plugin: 'com.android.application'
 // APP_EDITION - date stamp of builds
 // APP_FEATURES - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
 
-// TODO
+
-// 1. Filter fonts
+// 1. To be done Filter fonts
 // <unzip src="OsmAndCore_android.aar" dest=".">
 //            <patternset>
 //                <include name="assets/**/map/fonts/OpenSans/*"/>
@@ -17,9 +17,6 @@ apply plugin: 'com.android.application'
 //            </patternset>
 //        </unzip>
 // Less important
-// 2. fix_apostrophe_issues (replace match="[^=]([^\\])'" replace="\1\\\\'") res/**/strings.xml
-// 3. sherpafy/free/paid
-// 4. TARGET_APP_NAME, APP_EDITION uses flavor
 
 android {
 	compileSdkVersion 21

OsmAnd/res/layout/dash_gpx_track_item.xml

@@ -166,7 +166,7 @@
 			android:layout_height="@dimen/list_item_height"
 			android:background="?attr/options_button_background"
 			android:focusable="false"
-			android:src="?attr/ic_action_overflow"
+			android:src="@drawable/ic_overflow_menu_white"
 			android:visibility="gone"/>
 
 		<include android:layout_width="wrap_content"

OsmAnd/res/layout/expandable_list_item_category.xml

@@ -40,7 +40,7 @@
 		android:focusable="false"
 		android:visibility="gone"
 		android:background="?attr/options_button_background"
-		android:src="?attr/ic_action_overflow"/>
+		android:src="@drawable/ic_overflow_menu_white"/>
     
 
 </LinearLayout>

OsmAnd/res/layout/favorites_list_item.xml

@@ -110,7 +110,7 @@
             android:layout_gravity="center_vertical"
             android:visibility="gone"
             android:background="?attr/options_button_background"
-            android:src="?attr/ic_action_overflow" />
+            android:src="@drawable/ic_overflow_menu_white"/>
     </LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/local_index_list_item.xml

@@ -75,6 +75,6 @@
 		android:layout_height="@dimen/list_item_height"
 		android:background="?attr/options_button_background"
 		android:focusable="false"
-		android:src="?attr/ic_action_overflow"/>
+		android:src="@drawable/ic_overflow_menu_white"/>
 
 </LinearLayout>

OsmAnd/res/layout/note.xml

@@ -73,7 +73,7 @@
 			android:layout_gravity="center_vertical"
 			android:background="?attr/options_button_background"
 			android:focusable="false"
-			android:src="?attr/ic_action_overflow"/>
+			android:src="@drawable/ic_overflow_menu_white"/>
 
 		<ImageButton
 			android:id="@+id/play"

OsmAnd/res/layout/plugins_list_item.xml

@@ -59,7 +59,7 @@
         android:layout_width="@dimen/list_item_height"
         android:layout_height="@dimen/list_item_height"
         android:layout_gravity="center"
-        android:background="?attr/options_button_background"
+        android:background="?attr/dashboard_button"
-        android:src="?attr/ic_action_overflow" />
+        android:src="@drawable/ic_overflow_menu_white"/>
 
 </LinearLayout>

OsmAnd/res/layout/search_history_list_item.xml

@@ -91,7 +91,7 @@
             android:layout_gravity="center_vertical"
             android:background="?attr/options_button_background"
             android:focusable="false"
-            android:src="?attr/ic_action_overflow"
+            android:src="@drawable/ic_overflow_menu_white"
             android:visibility="gone" />
 
         <ImageButton

OsmAnd/res/layout/searchpoi.xml

@@ -49,7 +49,7 @@
             android:layout_gravity="center_vertical"
             android:background="?attr/dashboard_button"
             android:scaleType="center"
-            android:src="?attr/ic_action_overflow" />
+            android:src="@drawable/ic_overflow_menu_white" />
     </LinearLayout>
 
     <ListView

OsmAnd/res/layout/searchpoifolder_list.xml

@@ -35,5 +35,5 @@
         android:scaleType="center"
         android:visibility="gone"
         android:background="?attr/dashboard_button"
-        android:src="?attr/ic_action_overflow" />
+        android:src="@drawable/ic_overflow_menu_white"/>
 </LinearLayout>

OsmAnd/res/values/attrs.xml

@@ -11,8 +11,6 @@
 		<attr name="card_bg" format="reference" />
 		<attr name="btn_flat_bg" format="reference" />
 		<attr name="card_bg_color" format="reference" />
-		<attr name="ic_action_overflow" format="reference" />
-		<attr name="options_button_background" format="reference"/>
 		<attr name="spinnerItemTextColor" format="reference" />
 		<attr name="dashboard_divider" format="reference" />
 		<attr name="dashboard_button" format="reference" />

OsmAnd/res/values/styles.xml

@@ -51,8 +51,6 @@
 
 	<!-- Osmand themes styles -->
 	<style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
-	    <item name="ic_action_overflow">@drawable/ic_overflow_menu_light</item>
-		<item name="options_button_background">@drawable/dashboard_button_light</item>
 		<item name="list_divider">@color/list_divider_dark</item>
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_light</item>
@@ -98,8 +96,6 @@
 	</style>
 	
 	    <style name="OsmandDarkTheme" parent="Theme.AppCompat">
-        <item name="ic_action_overflow">@drawable/ic_overflow_menu_dark</item>
-		<item name="options_button_background">@drawable/dashboard_button_dark</item>
 		<item name="list_divider">@color/list_divider_light</item>
         <item name="expandable_category_color">?android:attr/colorBackground</item>
         <item name="bottomToolBarColor">@color/tool_bar_color_dark</item>

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

@@ -764,6 +764,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 			}
 			final View ch = row.findViewById(R.id.options);
 			if(!selectionMode) {
+				((ImageView) ch).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 				ch.setVisibility(View.VISIBLE);
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override

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

@@ -3,7 +3,6 @@ package net.osmand.plus.activities;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -15,6 +14,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 public class PluginsActivity extends OsmandListActivity {
@@ -120,7 +120,8 @@ public class PluginsActivity extends OsmandListActivity {
 			pluginDescription.setText(plugin.getDescription());
 
 
-			View pluginOptions = view.findViewById(R.id.plugin_options);
+			ImageView pluginOptions = (ImageView) view.findViewById(R.id.plugin_options);
+			pluginOptions.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 			pluginOptions.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java

@@ -226,6 +226,7 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
 			DashLocationFragment.updateLocationView(!searchAroundLocation, location, heading, direction, distanceText, 
 					historyEntry.getLat(), historyEntry.getLon(), screenOrientation, getMyApplication(), getActivity()); 
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
+			options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 			options.setVisibility(View.VISIBLE);
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override

OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java

@@ -250,7 +250,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		((EditText)findViewById(R.id.edit)).setHint(R.string.filter_poi_hint);
         ((ImageView)findViewById(R.id.search_icon)).setImageDrawable(
         		getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_filter_dark));
-		
+        ((ImageView) findViewById(R.id.options)).
+        	setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 		findViewById(R.id.options).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {

OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java

@@ -67,12 +67,13 @@ public class SearchPoiFilterFragment extends ListFragment implements SearchActiv
         		getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_search_dark));
         
         setupSearchEditText((EditText) v.findViewById(R.id.edit));
-        setupOptions(v.findViewById(R.id.options));
+        setupOptions((ImageView) v.findViewById(R.id.options));
         v.findViewById(R.id.poiSplitbar).setVisibility(View.GONE);
         return v;
     }
 	
-	private void setupOptions(View options) {
+	private void setupOptions(ImageView options) {
+		options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 		options.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {

OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java

@@ -100,6 +100,7 @@ public class NotesFragment extends ListFragment {
 					.getContentIcon(R.drawable.ic_play_dark));
 			row.findViewById(R.id.play).setVisibility(View.GONE);
 			ImageButton options = (ImageButton) row.findViewById(R.id.options);
+			options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java

@@ -924,6 +924,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 			}
 			TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
 			ImageButton options = (ImageButton) v.findViewById(R.id.options);
+			options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java

@@ -776,6 +776,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 
 			ImageView icon = (ImageView) v.findViewById(R.id.icon);
 			ImageButton options = (ImageButton) v.findViewById(R.id.options);
+			options.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
 			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {

OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java

@@ -411,7 +411,8 @@ public class OsmEditsFragment extends ListFragment implements OsmEditsUploadList
 				ch.setVisibility(View.GONE);
 			}
 
-			v.findViewById(R.id.options).setOnClickListener(new View.OnClickListener() {
+			((ImageView) options).setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_overflow_menu_white));
+			options.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					openPopUpMenu(v, child);