From f3812b1653f99970e69d8c2bc78d07e4e793b290 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Thu, 6 Aug 2015 08:23:35 +0300
Subject: [PATCH] Swipe fix and Card for card options

---
 OsmAnd/res/layout-v14/check_item_rel.xml      |  7 +-
 OsmAnd/res/layout/check_item_rel.xml          |  7 +-
 OsmAnd/res/layout/dash_dash_options.xml       | 94 +++++++++++++++++++
 OsmAnd/res/layout/dash_rate_us_fragment.xml   |  1 -
 .../spinner_entries_numbers_from_1_to_10.xml  | 15 +++
 .../plus/dashboard/DashBaseFragment.java      | 13 ++-
 .../plus/widgets/InterceptorFrameLayout.java  |  9 +-
 .../tools/SwipeDismissTouchListener.java      |  2 -
 8 files changed, 123 insertions(+), 25 deletions(-)
 create mode 100644 OsmAnd/res/layout/dash_dash_options.xml
 create mode 100644 OsmAnd/res/values/spinner_entries_numbers_from_1_to_10.xml

diff --git a/OsmAnd/res/layout-v14/check_item_rel.xml b/OsmAnd/res/layout-v14/check_item_rel.xml
index 885024c20a..2962ada85e 100644
--- a/OsmAnd/res/layout-v14/check_item_rel.xml
+++ b/OsmAnd/res/layout-v14/check_item_rel.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical" >
+<merge  xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Switch
         android:id="@+id/check_item"
@@ -13,4 +10,4 @@
 		android:focusable="false"
         android:gravity="center_vertical"/>
 
-</RelativeLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/check_item_rel.xml b/OsmAnd/res/layout/check_item_rel.xml
index d646c5a9e3..1fb8a0085f 100644
--- a/OsmAnd/res/layout/check_item_rel.xml
+++ b/OsmAnd/res/layout/check_item_rel.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <CheckBox
         android:id="@+id/check_item"
@@ -16,4 +13,4 @@
         android:focusable="false"
         android:gravity="center_vertical" />
 
-</RelativeLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_dash_options.xml b/OsmAnd/res/layout/dash_dash_options.xml
new file mode 100644
index 0000000000..f931b2a0c9
--- /dev/null
+++ b/OsmAnd/res/layout/dash_dash_options.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/bg_card"
+    android:layout_marginTop="@dimen/dash_margin"
+    android:layout_marginBottom="@dimen/dash_margin"
+    android:layout_marginLeft="@dimen/dash_margin_h"
+    android:layout_marginRight="@dimen/dash_margin_h"
+    android:orientation="vertical">
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Options"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="20sp"
+        android:paddingBottom="10dp"
+        android:paddingLeft="@dimen/list_content_padding"
+        android:paddingRight="@dimen/list_content_padding"
+        android:paddingTop="8dp"
+        osmand:typeface="@string/font_roboto_medium"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/list_header_height"
+        android:orientation="horizontal">
+
+        <net.osmand.plus.widgets.TextViewEx
+            style="@style/DashboardSubHeader"
+            android:text="Remove permanently"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <include
+            layout="@layout/check_item_rel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/list_header_height"
+        android:orientation="horizontal">
+
+        <net.osmand.plus.widgets.TextViewEx
+            style="@style/DashboardSubHeader"
+            android:text="# of rows"
+            osmand:typeface="@string/font_roboto_medium"/>
+
+        <Spinner
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:entries="@array/numbers_from_1_to_10">
+
+        </Spinner>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/dashboard_divider" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="@dimen/list_header_height"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/positive_button"
+            style="@style/DashboardGeneralButton"
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_weight="1"
+            android:text="@string/shared_string_ok"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="?attr/dashboard_divider"/>
+
+        <Button
+            android:id="@+id/negative_button"
+            style="@style/DashboardGeneralButton"
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="UNDO" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OsmAnd/res/layout/dash_rate_us_fragment.xml b/OsmAnd/res/layout/dash_rate_us_fragment.xml
index 457d030fc1..3ebbe3273d 100644
--- a/OsmAnd/res/layout/dash_rate_us_fragment.xml
+++ b/OsmAnd/res/layout/dash_rate_us_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              android:id="@+id/search"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:background="?attr/bg_card"
diff --git a/OsmAnd/res/values/spinner_entries_numbers_from_1_to_10.xml b/OsmAnd/res/values/spinner_entries_numbers_from_1_to_10.xml
new file mode 100644
index 0000000000..d60ce08af7
--- /dev/null
+++ b/OsmAnd/res/values/spinner_entries_numbers_from_1_to_10.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="numbers_from_1_to_10">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
index ff3f54b674..894db9aee8 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
@@ -11,6 +11,7 @@ import android.support.v4.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmandApplication;
@@ -49,13 +50,17 @@ public abstract class DashBaseFragment extends Fragment {
 	final public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 								   @Nullable Bundle savedInstanceState) {
 		View childView = initView(inflater, container, savedInstanceState);
-		ViewGroup.LayoutParams layoutParams =
-				new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+		FrameLayout.LayoutParams layoutParams =
+				new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
 						ViewGroup.LayoutParams.WRAP_CONTENT);
-
 		InterceptorFrameLayout frameLayout = new InterceptorFrameLayout(getActivity());
 		frameLayout.setLayoutParams(layoutParams);
-		frameLayout.addView(childView);
+
+		FrameLayout.LayoutParams childLayoutParams =
+				new FrameLayout.LayoutParams(
+						(ViewGroup.MarginLayoutParams) childView.getLayoutParams());
+		frameLayout.addView(childView, childLayoutParams);
+
 		if (isDismissAllowed()) {
 			SwipeDismissTouchListener listener = new SwipeDismissTouchListener(childView, null,
 					new SwipeDismissTouchListener.DismissCallbacks() {
diff --git a/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java b/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
index 7d96b73aca..d8e490223f 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.os.Build;
 import android.support.v4.view.MotionEventCompat;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
@@ -16,11 +15,9 @@ import net.osmand.plus.widgets.tools.SwipeDismissTouchListener;
  * Created by GaidamakUA on 8/5/15.
  */
 public class InterceptorFrameLayout extends FrameLayout {
-	private static final String TAG = "InterceptorFrameLayout";
 	private int mTouchSlop;
 	private boolean mIsScrolling;
 	private float mDownX;
-	private boolean mShown;
 	private SwipeDismissTouchListener listener;
 
 	public InterceptorFrameLayout(Context context) {
@@ -52,19 +49,15 @@ public class InterceptorFrameLayout extends FrameLayout {
 
 	@Override
 	public boolean onInterceptTouchEvent(MotionEvent ev) {
-		Log.v(TAG, "onInterceptTouchEvent(" + "ev=" + ev + ")");
 		final int action = MotionEventCompat.getActionMasked(ev);
 
-		// Always handle the case of the touch gesture being complete.
 		if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
-			// Release the scroll.
 			mIsScrolling = false;
-			return false; // Do not intercept touch event, let the child handle it
+			return false;
 		}
 
 		switch (action) {
 			case MotionEvent.ACTION_DOWN:
-				mShown = false;
 				mDownX = ev.getRawX();
 				listener.onTouch(this, ev);
 				return false;
diff --git a/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java b/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
index 281991d4a4..cb3b1910b8 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
@@ -4,7 +4,6 @@ import android.app.ListActivity;
 import android.app.ListFragment;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPropertyAnimatorListener;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
@@ -102,7 +101,6 @@ public class SwipeDismissTouchListener implements View.OnTouchListener {
 
 	@Override
 	public boolean onTouch(View view, MotionEvent motionEvent) {
-		Log.v(TAG, "onTouch(" + "view=" + view + ", motionEvent=" + motionEvent + ")");
 		// offset because the view is translated during swipe
 		motionEvent.offsetLocation(mTranslationX, 0);