Merge remote-tracking branch 'origin/master'

OsmAnd/res/layout/map_context_menu_fragment.xml

@@ -16,7 +16,7 @@
         <LinearLayout
             android:id="@+id/context_menu_top_shadow"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="@dimen/context_menu_top_shadow_h"
             android:orientation="horizontal">
 
         </LinearLayout>
@@ -32,22 +32,22 @@
                 android:id="@+id/context_menu_top_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/context_menu_first_line_bottom_margin"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
                 <LinearLayout
                     android:id="@+id/context_menu_icon_layout"
-                    android:layout_width="42dp"
+                    android:layout_width="52dp"
                     android:layout_height="match_parent">
 
                     <ImageView
                         android:id="@+id/context_menu_icon_view"
-                        android:layout_width="@dimen/standard_icon_size"
+                        android:layout_width="@dimen/map_widget_icon"
-                        android:layout_height="@dimen/standard_icon_size"
+                        android:layout_height="@dimen/map_widget_icon"
                         android:layout_marginLeft="16dp"
                         android:layout_marginStart="12dp"
-                        android:layout_marginTop="17dp"
+                        android:layout_marginTop="@dimen/context_menu_icon_top_padding"
                         android:src="@drawable/ic_action_building_number"/>
 
                 </LinearLayout>
@@ -60,13 +60,13 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginLeft="20dp"
                         android:orientation="horizontal">
 
                         <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="14dp"
+                            android:layout_marginTop="@dimen/context_menu_first_line_top_margin"
                             android:layout_weight="1">
 
                             <TextView
@@ -85,7 +85,7 @@
                             android:id="@+id/context_menu_close_btn_layout"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:minWidth="76dp"
+                            android:minWidth="@dimen/context_menu_top_right_button_min_width"
                             android:orientation="horizontal">
 
                             <Button
@@ -94,8 +94,8 @@
                                 android:layout_height="wrap_content"
                                 android:background="?android:selectableItemBackground"
                                 android:gravity="center"
-                                android:paddingLeft="10dp"
+                                android:paddingLeft="@dimen/context_menu_button_padding_x"
-                                android:paddingRight="10dp"
+                                android:paddingRight="@dimen/context_menu_button_padding_x"
                                 android:text="@string/shared_string_others"
                                 android:textColor="?attr/contextMenuButtonColor"
                                 android:textSize="@dimen/default_desc_text_size"/>
@@ -107,8 +107,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginLeft="20dp"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/context_menu_second_line_top_margin"
                         android:orientation="horizontal">
 
                         <LinearLayout
@@ -136,7 +136,7 @@
                                 android:id="@+id/compass_layout"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:minWidth="76dp"
+                                android:minWidth="@dimen/context_menu_top_right_button_min_width"
                                 android:orientation="horizontal">
 
                                 <ImageView
@@ -170,10 +170,10 @@
                 android:id="@+id/title_button_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-16dp"
+                android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
                 android:clickable="true"
                 android:orientation="horizontal"
-                android:paddingBottom="4dp"
+                android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
                 android:paddingLeft="62dp"
                 android:paddingRight="2dp"
                 android:visibility="gone"
@@ -185,8 +185,8 @@
                     android:layout_height="wrap_content"
                     android:background="?android:selectableItemBackground"
                     android:gravity="left|center_vertical"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="@dimen/context_menu_button_padding_x"
-                    android:paddingRight="10dp"
+                    android:paddingRight="@dimen/context_menu_button_padding_x"
                     android:text="@string/recording_context_menu_play"
                     android:textColor="?attr/contextMenuButtonColor"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -209,8 +209,8 @@
                     android:background="?android:selectableItemBackground"
                     android:drawableLeft="@drawable/ic_action_delete_dark"
                     android:gravity="center"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="@dimen/context_menu_button_padding_x"
-                    android:paddingRight="10dp"
+                    android:paddingRight="@dimen/context_menu_button_padding_x"
                     android:text="@string/shared_string_delete"
                     android:textColor="?attr/contextMenuButtonColor"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -221,12 +221,12 @@
                 android:id="@+id/title_progress_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="-16dp"
+                android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
                 android:clickable="true"
                 android:gravity="center_vertical"
-                android:minHeight="52dp"
+                android:minHeight="@dimen/context_menu_progress_min_height"
                 android:orientation="horizontal"
-                android:paddingBottom="4dp"
+                android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
                 android:paddingLeft="72dp"
                 android:paddingRight="2dp"
                 android:visibility="gone"
@@ -264,12 +264,12 @@
 
                     <ImageView
                         android:id="@+id/progressButton"
-                        android:layout_width="44dp"
+                        android:layout_width="@dimen/context_menu_progress_cancel_button_size"
-                        android:layout_height="44dp"
+                        android:layout_height="@dimen/context_menu_progress_cancel_button_size"
                         android:layout_gravity="center_vertical"
                         android:background="?android:selectableItemBackground"
                         android:scaleType="center"
-                        tools:src="@drawable/ic_action_remove_dark"/>
+                        tools:src="@drawable/map_action_cancel"/>
 
                 </LinearLayout>
 
@@ -285,7 +285,7 @@
                 android:id="@+id/context_menu_buttons"
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
-                android:layout_height="54dp">
+                android:layout_height="@dimen/context_menu_action_buttons_h">
 
                 <ImageButton
                     android:id="@+id/context_menu_fav_button"
@@ -295,7 +295,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_fav_dark"/>
+                    android:src="@drawable/map_action_fav_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -310,7 +310,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/map_action_waypoints"/>
+                    android:src="@drawable/map_action_flag_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -325,7 +325,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/abc_ic_menu_share_mtrl_alpha"/>
+                    android:src="@drawable/map_action_gshare_dark"/>
 
                 <View
                     android:layout_width="1dp"
@@ -340,7 +340,7 @@
                     android:layout_weight="1"
                     android:background="?attr/dashboard_button"
                     android:scaleType="center"
-                    android:src="@drawable/ic_overflow_menu_white"/>
+                    android:src="@drawable/map_overflow_menu_white"/>
 
             </LinearLayout>
 
@@ -382,7 +382,7 @@
             android:layout_width="@dimen/fab_size_with_shadow"
             android:layout_height="@dimen/fab_size_with_shadow"
             android:layout_gravity="right"
-            android:layout_marginRight="12dp"
+            android:layout_marginRight="@dimen/fab_margin_right"
             android:background="@drawable/fab_background_style"
             android:scaleType="center"
             android:src="@drawable/map_directions"/>

OsmAnd/res/values-large/sizes.xml

@@ -41,6 +41,25 @@
 	
 
 	<dimen name="map_widget_icon_margin">6dp</dimen>
+
+
+	<!-- ContextMenu -->
+	<dimen name="context_menu_top_shadow_h">30dp</dimen>
+	<dimen name="context_menu_icon_top_padding">25dp</dimen>
+	<dimen name="context_menu_first_line_top_margin">21dp</dimen>
+	<dimen name="context_menu_first_line_bottom_margin">24dp</dimen>
+	<dimen name="context_menu_second_line_top_margin">6dp</dimen>
+	<dimen name="context_menu_top_right_button_min_width">114dp</dimen>
+	<dimen name="context_menu_button_padding_x">15dp</dimen>
+	<dimen name="context_menu_buttons_top_margin">-24dp</dimen>
+	<dimen name="context_menu_buttons_padding_bottom">6dp</dimen>
+	<dimen name="context_menu_progress_min_height">78dp</dimen>
+	<dimen name="context_menu_progress_cancel_button_size">66dp</dimen>
+	<dimen name="context_menu_action_buttons_h">80dp</dimen>
+
+	<dimen name="fab_size_with_shadow">90dp</dimen>
+	<dimen name="fab_margin_right">18dp</dimen>
+
 	<!-- General -->
 	
 	<dimen name="list_item_height">65dp</dimen>

OsmAnd/res/values/sizes.xml

@@ -101,7 +101,23 @@
 	<dimen name="dash_margin">2dp</dimen>
 	<dimen name="dash_margin_h">6dp</dimen>
 
+
+	<!-- ContextMenu -->
+	<dimen name="context_menu_top_shadow_h">20dp</dimen>
+    <dimen name="context_menu_icon_top_padding">17dp</dimen>
+    <dimen name="context_menu_first_line_top_margin">14dp</dimen>
+    <dimen name="context_menu_first_line_bottom_margin">16dp</dimen>
+    <dimen name="context_menu_second_line_top_margin">4dp</dimen>
+    <dimen name="context_menu_top_right_button_min_width">76dp</dimen>
+    <dimen name="context_menu_button_padding_x">10dp</dimen>
+    <dimen name="context_menu_buttons_top_margin">-16dp</dimen>
+    <dimen name="context_menu_buttons_padding_bottom">4dp</dimen>
+    <dimen name="context_menu_progress_min_height">52dp</dimen>
+    <dimen name="context_menu_progress_cancel_button_size">44dp</dimen>
+    <dimen name="context_menu_action_buttons_h">54dp</dimen>
+
 	<dimen name="fab_size_with_shadow">62dp</dimen>
+    <dimen name="fab_margin_right">12dp</dimen>
 
     <!-- TextSizes -->
     <dimen name="default_list_text_size_large">19sp</dimen>

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -53,6 +53,7 @@ public class MapContextMenu extends MenuTitleController {
 	private LatLon myLocation;
 	private Float heading;
 	private boolean inLocationUpdate = false;
+	private long locationUpdateTime;
 
 	private int favActionIconId;
 
@@ -348,7 +349,7 @@ public class MapContextMenu extends MenuTitleController {
 		if (menuController != null) {
 			favActionIconId = menuController.getFavActionIconId();
 		} else {
-			favActionIconId = R.drawable.ic_action_fav_dark;
+			favActionIconId = R.drawable.map_action_fav_dark;
 		}
 	}
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java

@@ -360,13 +360,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 
 		final ImageButton buttonWaypoint = (ImageButton) view.findViewById(R.id.context_menu_route_button);
-		if (getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
+		buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_flag_dark,
-			buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_flag_dark,
 				light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
-		} else {
-			buttonWaypoint.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_waypoints,
-				light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
-		}
 		buttonWaypoint.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -375,7 +370,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 
 		final ImageButton buttonShare = (ImageButton) view.findViewById(R.id.context_menu_share_button);
-		buttonShare.setImageDrawable(iconsCache.getIcon(R.drawable.abc_ic_menu_share_mtrl_alpha,
+		buttonShare.setImageDrawable(iconsCache.getIcon(R.drawable.map_action_gshare_dark,
 				light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
 		buttonShare.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -385,7 +380,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 
 		final ImageButton buttonMore = (ImageButton) view.findViewById(R.id.context_menu_more_button);
-		buttonMore.setImageDrawable(iconsCache.getIcon(R.drawable.ic_overflow_menu_white,
+		buttonMore.setImageDrawable(iconsCache.getIcon(R.drawable.map_overflow_menu_white,
 				light ? R.color.icon_color : R.color.dashboard_subheader_text_dark));
 		buttonMore.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -758,7 +753,8 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 
 	private void updateCompassVisibility() {
 		View compassView = view.findViewById(R.id.compass_layout);
-		if (menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN) {
+		boolean gpsFixed = getMyApplication().getLocationProvider().getGPSInfo().fixed;
+		if (gpsFixed && menu.displayDistanceDirection() && menu.getCurrentMenuState() != MenuState.FULL_SCREEN) {
 			updateDistanceDirection();
 			compassView.setVisibility(View.VISIBLE);
 		} else {

OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java

@@ -138,7 +138,7 @@ public abstract class MenuController extends BaseMenuController {
 
 	protected void addMyLocationToPlainItems(PointDescription pointDescription, LatLon latLon) {
 		if (pointDescription != null) {
-			addPlainMenuItem(R.drawable.map_my_location, PointDescription.getLocationName(getMapActivity(),
+			addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(),
 					latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false);
 		}
 	}

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/FavouritePointMenuController.java

@@ -67,12 +67,12 @@ public class FavouritePointMenuController extends MenuController {
 
 	@Override
 	public Drawable getSecondLineTypeIcon() {
-		return getIcon(R.drawable.ic_small_group);
+		return getIcon(R.drawable.map_small_group);
 	}
 
 	@Override
 	public int getFavActionIconId() {
-		return R.drawable.ic_action_edit_dark;
+		return R.drawable.map_action_edit_dark;
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/WptPtMenuController.java

@@ -66,7 +66,7 @@ public class WptPtMenuController extends MenuController {
 		if (Algorithms.isEmpty(getTypeStr())) {
 			return null;
 		} else {
-			return getIcon(R.drawable.ic_small_group);
+			return getIcon(R.drawable.map_small_group);
 		}
 	}
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java

@@ -120,7 +120,7 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
 				Algorithms.stringsEqual(favorite.getDescription(), point.getDescription())) {
 
 			if (needDismiss) {
-				dismiss(true);
+				dismiss(false);
 			}
 			return;
 		}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java

@@ -161,9 +161,9 @@ public abstract class PointEditorFragment extends Fragment {
 
 	@Override
 	public void onDestroyView() {
-//		if (!wasSaved() && !getEditor().isNew()) {
+		if (!wasSaved() && !getEditor().isNew()) {
-//			save(false);
+			save(false);
-//		}
+		}
 		super.onDestroyView();
 		getActivity().findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
 	}