From 7c67e911ba4372ed8e8f45dedc714cb0da5fbc5f Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Mon, 3 Feb 2020 15:35:10 +0200
Subject: [PATCH 1/3] Fix #6669 OSM Editing screen: show Save button above
 keyboard.

---
 OsmAnd/res/layout/fragment_edit_poi.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index 47907d2cbc..b9b3f0e2d8 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -19,7 +19,7 @@
         app:contentInsetLeft="72dp"
         app:contentInsetStart="72dp"/>
 
-    <android.support.design.widget.CoordinatorLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -39,8 +39,6 @@
                 <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/shared_string_name"
-                    android:importantForAutofill="noExcludeDescendants"
                     android:layout_marginLeft="72dp"
                     android:layout_marginRight="16dp">
 
@@ -64,7 +62,6 @@
                 <!--android:layout_marginLeft="72dp"-->
                 <ImageButton
                     android:id="@+id/poiTypeButton"
-                    android:contentDescription="@string/poi_dialog_poi_type"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:layout_gravity="bottom"
@@ -114,14 +111,17 @@
                 app:tabTextColor="@android:color/darker_gray"/>
         </android.support.design.widget.AppBarLayout>
 
+        <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true">
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewpager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    </android.support.design.widget.CoordinatorLayout>
+            <android.support.v4.view.ViewPager
+                android:id="@+id/viewpager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </ScrollView>
+    </LinearLayout>
 
     <View
         android:id="@+id/buttonDivider"

From f14b39e8ad23094d37a6c54fb5b404ff19a459f5 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 25 Feb 2020 11:44:45 +0200
Subject: [PATCH 2/3] Fix #6669 OSM Editing screen: show Save button above
 keyboard.

---
 OsmAnd/res/layout/fragment_edit_poi.xml       | 16 +++---
 .../plus/osmedit/EditPoiDialogFragment.java   |  4 +-
 .../osmand/plus/osmedit/EditPoiViewPager.java | 52 +++++++++++++++++++
 3 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/osmedit/EditPoiViewPager.java

diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index b9b3f0e2d8..fdd799b7d5 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -19,10 +19,15 @@
         app:contentInsetLeft="72dp"
         app:contentInsetStart="72dp"/>
 
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
         android:orientation="vertical">
 
         <android.support.design.widget.AppBarLayout
@@ -111,17 +116,12 @@
                 app:tabTextColor="@android:color/darker_gray"/>
         </android.support.design.widget.AppBarLayout>
 
-        <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:fillViewport="true">
-
-            <android.support.v4.view.ViewPager
+            <net.osmand.plus.osmedit.EditPoiViewPager
                 android:id="@+id/viewpager"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-        </ScrollView>
     </LinearLayout>
+</ScrollView>
 
     <View
         android:id="@+id/buttonDivider"
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index 052fdef553..0fc0e7085b 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -104,7 +104,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 	}
 
 	private EditPoiData editPoiData;
-	private ViewPager viewPager;
+	private EditPoiViewPager viewPager;
 	private AutoCompleteTextView poiTypeEditText;
 
 	private OpenstreetmapUtil mOpenstreetmapUtil;
@@ -153,7 +153,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 			}
 		});
 
-		viewPager = (ViewPager) view.findViewById(R.id.viewpager);
+		viewPager = (EditPoiViewPager) view.findViewById(R.id.viewpager);
 		String basicTitle = getResources().getString(R.string.tab_title_basic);
 		String extendedTitle = getResources().getString(R.string.tab_title_advanced);
 		final MyAdapter pagerAdapter = new MyAdapter(getChildFragmentManager(), basicTitle, extendedTitle);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiViewPager.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiViewPager.java
new file mode 100644
index 0000000000..908873050a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiViewPager.java
@@ -0,0 +1,52 @@
+package net.osmand.plus.osmedit;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class EditPoiViewPager extends ViewPager {
+	public EditPoiViewPager(Context context) {
+		super(context);
+	}
+
+	public EditPoiViewPager(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		int height = 0;
+		View view = null;
+		for (int i = 0; i < getChildCount(); i++) {
+			view = getChildAt(i);
+			view.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+			int h = view.getMeasuredHeight();
+			if (h > height) height = h;
+		}
+
+		if (height != 0) {
+			heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
+		}
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		setMeasuredDimension(getMeasuredWidth(), measureHeight(heightMeasureSpec, view));
+	}
+
+	private int measureHeight(int measureSpec, View view) {
+		int result = 0;
+		int specMode = MeasureSpec.getMode(measureSpec);
+		int specSize = MeasureSpec.getSize(measureSpec);
+
+		if (specMode == MeasureSpec.EXACTLY) {
+			result = specSize;
+		} else {
+			if (view != null) {
+				result = view.getMeasuredHeight();
+			}
+			if (specMode == MeasureSpec.AT_MOST) {
+				result = Math.min(result, specSize);
+			}
+		}
+		return result;
+	}
+}

From c02d1be6f6bec37b98e9ce0a5e384dc20a5d2351 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 25 Feb 2020 12:15:01 +0200
Subject: [PATCH 3/3] Fix formatting

---
 OsmAnd/res/layout/fragment_edit_poi.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index 4ffd4fbb3e..6a6cd6d9ad 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -48,8 +48,8 @@
                     android:importantForAutofill="noExcludeDescendants"
                     android:layout_marginLeft="@dimen/settings_divider_margin_start"
                     android:layout_marginRight="@dimen/content_padding"
-	                android:layout_marginStart="@dimen/settings_divider_margin_start"
-	                android:layout_marginEnd="@dimen/content_padding">
+                    android:layout_marginStart="@dimen/settings_divider_margin_start"
+                    android:layout_marginEnd="@dimen/content_padding">
 
                     <EditText
                         android:id="@+id/poiNameEditText"
@@ -86,7 +86,7 @@
                     android:importantForAutofill="noExcludeDescendants"
                     android:layout_marginLeft="24dp"
                     android:layout_weight="1"
-	                android:layout_marginStart="24dp">
+                    android:layout_marginStart="24dp">
 
                     <AutoCompleteTextView
                         android:id="@+id/poiTypeEditText"
@@ -98,7 +98,7 @@
                         android:imeOptions="actionSend"
                         android:inputType="text"
                         tools:text="@string/lorem_ipsum"
-	                    android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
+                        android:drawableEnd="@drawable/ic_action_arrow_drop_down" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -152,7 +152,7 @@
             android:visibility="gone"
             app:textAllCapsCompat="true"
             tools:visibility="visible"
-	        android:layout_marginStart="@dimen/showAllButtonMarginRight" />
+            android:layout_marginStart="@dimen/showAllButtonMarginRight" />
 
         <Space
             android:layout_width="0dp"