From f04f0512dc39ddf426c5922561e313c233cf5763 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sun, 17 Jan 2016 11:03:09 +0300
Subject: [PATCH]  Fix https://github.com/osmandapp/Osmand/issues/2145

---
 OsmAnd/AndroidManifest.xml                    |   2 +-
 OsmAnd/res/layout/point_editor_fragment.xml   | 486 ++++++++++--------
 .../editors/PointEditorFragment.java          |  39 +-
 3 files changed, 283 insertions(+), 244 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 28ed7841a6..c0aa8be30f 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -71,7 +71,7 @@
         </provider>
 
 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
-			android:screenOrientation="unspecified" android:launchMode="singleTop">
+			android:screenOrientation="unspecified" android:launchMode="singleTop" android:windowSoftInputMode="adjustResize">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<action android:name="android.intent.action.SEND" />
diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml
index 1bd5b38da1..3c64d72930 100644
--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@@ -1,262 +1,292 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:id="@+id/point_edit_layout"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:background="@android:color/transparent">
+<FrameLayout
+    android:id="@+id/point_edit_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="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:background="@android:color/transparent">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="fill_parent"
-        android:layout_height="@dimen/dashboard_map_toolbar"
-        android:background="@drawable/gradient_toolbar"
-        android:minHeight="@dimen/dashboard_map_toolbar"
-        android:theme="?attr/toolbar_theme"
-        app:contentInsetLeft="72dp"
-        app:contentInsetStart="72dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <ImageButton
-            android:id="@+id/delete_button"
-            android:layout_width="?attr/actionBarSize"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_delete_dark"/>
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="fill_parent"
+            android:layout_height="@dimen/dashboard_map_toolbar"
+            android:background="@drawable/gradient_toolbar"
+            android:minHeight="@dimen/dashboard_map_toolbar"
+            android:theme="?attr/toolbar_theme"
+            app:contentInsetLeft="72dp"
+            app:contentInsetStart="72dp">
 
-        <ImageButton
-            android:id="@+id/ok_button"
-            android:layout_width="?attr/actionBarSize"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_action_done"/>
+            <ImageButton
+                android:id="@+id/delete_button"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_action_delete_dark"/>
 
-        <Button
-            android:id="@+id/save_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:drawableLeft="@drawable/ic_action_done"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:background="@android:color/transparent"
-            android:text="@string/shared_string_save"/>
+            <ImageButton
+                android:id="@+id/ok_button"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_action_done"/>
+
+            <Button
+                android:id="@+id/save_button"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:background="@android:color/transparent"
+                android:drawableLeft="@drawable/ic_action_done"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/shared_string_save"/>
 
 
         </android.support.v7.widget.Toolbar>
 
-    <LinearLayout
-        android:id="@+id/main_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:clickable="true"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/title_view"
+        <ScrollView
+            android:id="@+id/editor_scroll_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/bg_point_editor_view"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dp">
-
-                <TextView
-                    android:id="@+id/header_caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_gravity="center_vertical"
-                    tools:text="Point info"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/default_list_text_size"/>
-
-                <Button
-                    android:id="@+id/button_replace"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:textColor="?attr/contextMenuButtonColor"
-                    android:text="@string/update_existing"
-                    android:visibility="gone"/>
-
-            </LinearLayout>
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="42dp"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/name_image"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_action_building_number"/>
+                    android:id="@+id/editor_scroll_view_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="550dp"
+                    android:orientation="vertical">
 
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:id="@+id/main_view"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
-                    android:layout_weight="1"
+                    android:layout_gravity="bottom"
                     android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/name_caption"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginRight="12dp"
-                        android:text="@string/favourites_edit_dialog_name"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_list_text_size"/>
-
-                    <EditText
-                        android:id="@+id/name_edit"
+                    <LinearLayout
+                        android:id="@+id/title_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginLeft="8dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textColorHint="?android:textColorSecondary"
-                        tools:text="Name"
-                        android:imeOptions="actionDone"
-                        android:inputType="text"/>
+                        android:background="?attr/bg_point_editor_view"
+                        android:orientation="vertical">
 
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp">
+
+                            <TextView
+                                android:id="@+id/header_caption"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginLeft="16dp"
+                                android:layout_marginRight="16dp"
+                                android:layout_weight="1"
+                                android:textColor="?android:textColorPrimary"
+                                android:textSize="@dimen/default_list_text_size"
+                                tools:text="Point info"/>
+
+                            <Button
+                                android:id="@+id/button_replace"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="?attr/selectableItemBackground"
+                                android:text="@string/update_existing"
+                                android:textColor="?attr/contextMenuButtonColor"
+                                android:visibility="gone"/>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:baselineAligned="false"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="42dp"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/name_image"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginStart="12dp"
+                                    android:layout_marginTop="2dp"
+                                    android:scaleType="center"
+                                    android:src="@drawable/ic_action_building_number"/>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="16dp"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/name_caption"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginRight="12dp"
+                                    android:text="@string/favourites_edit_dialog_name"
+                                    android:textColor="?android:textColorSecondary"
+                                    android:textSize="@dimen/default_list_text_size"/>
+
+                                <EditText
+                                    android:id="@+id/name_edit"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="8dp"
+                                    android:layout_marginRight="16dp"
+                                    android:layout_marginTop="8dp"
+                                    android:imeOptions="actionDone"
+                                    android:inputType="text"
+                                    android:textColor="?android:textColorPrimary"
+                                    android:textColorHint="?android:textColorSecondary"
+                                    tools:text="Name"/>
+
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:baselineAligned="false"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="42dp"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/category_image"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginStart="12dp"
+                                    android:layout_marginTop="2dp"
+                                    android:scaleType="center"
+                                    android:src="@drawable/ic_action_building_number"/>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="16dp"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/category_caption"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginRight="12dp"
+                                    android:text="@string/favourites_edit_dialog_name"
+                                    android:textColor="?android:textColorSecondary"
+                                    android:textSize="@dimen/default_list_text_size"/>
+
+                                <net.osmand.plus.widgets.AutoCompleteTextViewEx
+                                    android:id="@+id/category_edit"
+                                    android:layout_width="fill_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="8dp"
+                                    android:layout_marginRight="16dp"
+                                    android:layout_marginTop="8dp"
+                                    android:drawableRight="@drawable/ic_action_arrow_drop_down"
+                                    android:editable="false"/>
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <LinearLayout
+                            android:id="@+id/description_info_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/ctx_menu_info_view_bg"
+                            android:baselineAligned="false"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="42dp"
+                                android:layout_height="match_parent"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/description_image"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="12dp"
+                                    android:layout_marginStart="12dp"
+                                    android:layout_marginTop="10dp"
+                                    android:scaleType="center"
+                                    android:src="@drawable/ic_action_note_dark"/>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="8dp"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <EditText
+                                    android:id="@+id/description_edit"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginLeft="8dp"
+                                    android:layout_marginRight="16dp"
+                                    android:inputType="textMultiLine"
+                                    android:maxLines="8"
+                                    android:textColor="?android:textColorPrimary"
+                                    android:textColorHint="?android:textColorSecondary"/>
+
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                    </FrameLayout>
 
                 </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="42dp"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/category_image"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_action_building_number"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/category_caption"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginRight="12dp"
-                        android:text="@string/favourites_edit_dialog_name"
-                        android:textColor="?android:textColorSecondary"
-                        android:textSize="@dimen/default_list_text_size"/>
-
-                    <net.osmand.plus.widgets.AutoCompleteTextViewEx
-                        android:id="@+id/category_edit"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginLeft="8dp"
-                        android:editable="false"
-                        android:drawableRight="@drawable/ic_action_arrow_drop_down"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/description_info_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:background="?attr/ctx_menu_info_view_bg"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="42dp"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/description_image"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:layout_marginTop="10dp"
-                        android:scaleType="center"
-                        android:src="@drawable/ic_action_note_dark"/>
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <EditText
-                        android:id="@+id/description_edit"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginLeft="8dp"
-                        android:maxLines="8"
-                        android:layout_gravity="center_vertical"
-                        android:textColor="?android:textColorPrimary"
-                        android:textColorHint="?android:textColorSecondary"
-                        android:inputType="textMultiLine"/>
-
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </FrameLayout>
+        </ScrollView>
 
     </LinearLayout>
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index 25853c2b0a..a52aa4a29d 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -3,7 +3,6 @@ package net.osmand.plus.mapcontextmenu.editors;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -39,8 +38,6 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.widgets.AutoCompleteTextViewEx;
 import net.osmand.util.Algorithms;
 
-import static android.util.TypedValue.COMPLEX_UNIT_DIP;
-
 public abstract class PointEditorFragment extends Fragment {
 
 	private View view;
@@ -68,7 +65,7 @@ public abstract class PointEditorFragment extends Fragment {
 		}
 
 		View editorScrollView = view.findViewById(R.id.editor_scroll_view);
-		if (editorScrollView != null) {
+		if (editorScrollView != null && getEditor().isLandscapeLayout()) {
 			if (getEditor().isLight()) {
 				editorScrollView.setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_light));
 			} else {
@@ -95,6 +92,16 @@ public abstract class PointEditorFragment extends Fragment {
 			}
 		});
 
+		View scrollViewHeader = view.findViewById(R.id.editor_scroll_view_header);
+		if (scrollViewHeader != null) {
+			scrollViewHeader.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					dismiss();
+				}
+			});
+		}
+
 		Button saveButton = (Button) toolbar.findViewById(R.id.save_button);
 		saveButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -224,7 +231,7 @@ public abstract class PointEditorFragment extends Fragment {
 		RotatedTileBox box = map.getCurrentRotatedTileBox();
 		int origMarkerY = (int)box.getPixYFromLatLon(markerLat, markerLon);
 
-		int markerPaddingPx = dpToPx(MapContextMenuFragment.MARKER_PADDING_DP);
+		int markerPaddingPx = AndroidUtils.dpToPx(getMapActivity(), MapContextMenuFragment.MARKER_PADDING_DP);
 
 		int y = view.getHeight() - mainViewHeight;
 
@@ -272,12 +279,24 @@ public abstract class PointEditorFragment extends Fragment {
 				} else {
 					obs.removeGlobalOnLayoutListener(this);
 				}
+				updateScrollHeaderHeight();
 				adjustMapPosition(true);
 			}
 
 		});
 	}
 
+	private void updateScrollHeaderHeight() {
+		View scrollViewHeader = view.findViewById(R.id.editor_scroll_view_header);
+		if (scrollViewHeader != null) {
+			View scrollView = view.findViewById(R.id.editor_scroll_view);
+			int headerHeight = scrollView.getHeight() - mainViewHeight;
+			ViewGroup.LayoutParams p = scrollViewHeader.getLayoutParams();
+			p.height = headerHeight;
+			scrollViewHeader.setLayoutParams(p);
+		}
+	}
+
 	private void hideKeyboard() {
 		InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
 		if (inputMethodManager != null) {
@@ -385,16 +404,6 @@ public abstract class PointEditorFragment extends Fragment {
 		return Algorithms.isEmpty(res) ? null : res;
 	}
 
-	// Utils
-	private int dpToPx(float dp) {
-		Resources r = getActivity().getResources();
-		return (int) TypedValue.applyDimension(
-				COMPLEX_UNIT_DIP,
-				dp,
-				r.getDisplayMetrics()
-		);
-	}
-
 	protected Drawable getPaintedIcon(int iconId, int color) {
 		IconsCache iconsCache = getMapActivity().getMyApplication().getIconsCache();
 		return iconsCache.getPaintedContentIcon(iconId, color);