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 @@
-
+
-
\ No newline at end of file
+
\ 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 @@
-
+
-
\ No newline at end of file
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+ - 1
+ - 2
+ - 3
+ - 4
+ - 5
+ - 6
+ - 7
+ - 8
+ - 9
+ - 10
+
+
\ 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);
diff --git a/eclipse-compile/design/AndroidManifest.xml b/eclipse-compile/design/AndroidManifest.xml
deleted file mode 120000
index ca5aa004cc..0000000000
--- a/eclipse-compile/design/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-src/main/AndroidManifest.xml
\ No newline at end of file
diff --git a/eclipse-compile/design/AndroidManifest.xml b/eclipse-compile/design/AndroidManifest.xml
new file mode 100644
index 0000000000..012c7bf894
--- /dev/null
+++ b/eclipse-compile/design/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/eclipse-compile/design/res b/eclipse-compile/design/res
deleted file mode 120000
index 607712c41d..0000000000
--- a/eclipse-compile/design/res
+++ /dev/null
@@ -1 +0,0 @@
-src/main/res/
\ No newline at end of file
diff --git a/eclipse-compile/design/res/anim/fab_in.xml b/eclipse-compile/design/res/anim/fab_in.xml
new file mode 100644
index 0000000000..294050f549
--- /dev/null
+++ b/eclipse-compile/design/res/anim/fab_in.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/anim/fab_out.xml b/eclipse-compile/design/res/anim/fab_out.xml
new file mode 100644
index 0000000000..0f80a9ab0b
--- /dev/null
+++ b/eclipse-compile/design/res/anim/fab_out.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/anim/snackbar_in.xml b/eclipse-compile/design/res/anim/snackbar_in.xml
new file mode 100644
index 0000000000..a40524c2bd
--- /dev/null
+++ b/eclipse-compile/design/res/anim/snackbar_in.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/eclipse-compile/design/res/anim/snackbar_out.xml b/eclipse-compile/design/res/anim/snackbar_out.xml
new file mode 100644
index 0000000000..eb55cc0e5e
--- /dev/null
+++ b/eclipse-compile/design/res/anim/snackbar_out.xml
@@ -0,0 +1,20 @@
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/drawable/fab_background.xml b/eclipse-compile/design/res/drawable/fab_background.xml
new file mode 100644
index 0000000000..43afd5c9ac
--- /dev/null
+++ b/eclipse-compile/design/res/drawable/fab_background.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/drawable/snackbar_background.xml b/eclipse-compile/design/res/drawable/snackbar_background.xml
new file mode 100644
index 0000000000..739b516713
--- /dev/null
+++ b/eclipse-compile/design/res/drawable/snackbar_background.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/layout-sw600dp/layout_snackbar.xml b/eclipse-compile/design/res/layout-sw600dp/layout_snackbar.xml
new file mode 100644
index 0000000000..b68395ab65
--- /dev/null
+++ b/eclipse-compile/design/res/layout-sw600dp/layout_snackbar.xml
@@ -0,0 +1,23 @@
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/layout/design_navigation_item.xml b/eclipse-compile/design/res/layout/design_navigation_item.xml
new file mode 100644
index 0000000000..59ee05c95d
--- /dev/null
+++ b/eclipse-compile/design/res/layout/design_navigation_item.xml
@@ -0,0 +1,26 @@
+
+
+
diff --git a/eclipse-compile/design/res/layout/design_navigation_item_header.xml b/eclipse-compile/design/res/layout/design_navigation_item_header.xml
new file mode 100644
index 0000000000..988600766c
--- /dev/null
+++ b/eclipse-compile/design/res/layout/design_navigation_item_header.xml
@@ -0,0 +1,21 @@
+
+
+
diff --git a/eclipse-compile/design/res/layout/design_navigation_item_separator.xml b/eclipse-compile/design/res/layout/design_navigation_item_separator.xml
new file mode 100644
index 0000000000..938a3fbdd2
--- /dev/null
+++ b/eclipse-compile/design/res/layout/design_navigation_item_separator.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/layout/design_navigation_item_subheader.xml b/eclipse-compile/design/res/layout/design_navigation_item_subheader.xml
new file mode 100644
index 0000000000..707ec6aea3
--- /dev/null
+++ b/eclipse-compile/design/res/layout/design_navigation_item_subheader.xml
@@ -0,0 +1,25 @@
+
+
+
diff --git a/eclipse-compile/design/res/layout/design_navigation_menu.xml b/eclipse-compile/design/res/layout/design_navigation_menu.xml
new file mode 100644
index 0000000000..a40f2eb536
--- /dev/null
+++ b/eclipse-compile/design/res/layout/design_navigation_menu.xml
@@ -0,0 +1,25 @@
+
+
+
diff --git a/eclipse-compile/design/res/layout/layout_snackbar.xml b/eclipse-compile/design/res/layout/layout_snackbar.xml
new file mode 100644
index 0000000000..604aafc037
--- /dev/null
+++ b/eclipse-compile/design/res/layout/layout_snackbar.xml
@@ -0,0 +1,23 @@
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/layout/layout_snackbar_include.xml b/eclipse-compile/design/res/layout/layout_snackbar_include.xml
new file mode 100644
index 0000000000..0cf2002d88
--- /dev/null
+++ b/eclipse-compile/design/res/layout/layout_snackbar_include.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/layout/layout_tab_icon.xml b/eclipse-compile/design/res/layout/layout_tab_icon.xml
new file mode 100644
index 0000000000..6464d1fcd2
--- /dev/null
+++ b/eclipse-compile/design/res/layout/layout_tab_icon.xml
@@ -0,0 +1,21 @@
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/layout/layout_tab_text.xml b/eclipse-compile/design/res/layout/layout_tab_text.xml
new file mode 100644
index 0000000000..a83bb3d107
--- /dev/null
+++ b/eclipse-compile/design/res/layout/layout_tab_text.xml
@@ -0,0 +1,23 @@
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/values-land/styles.xml b/eclipse-compile/design/res/values-land/styles.xml
new file mode 100644
index 0000000000..622a5e361e
--- /dev/null
+++ b/eclipse-compile/design/res/values-land/styles.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/values-sw600dp/config.xml b/eclipse-compile/design/res/values-sw600dp/config.xml
new file mode 100644
index 0000000000..baac13bf28
--- /dev/null
+++ b/eclipse-compile/design/res/values-sw600dp/config.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ 1
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/values-sw600dp/dimens.xml b/eclipse-compile/design/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000000..37c3ff5a29
--- /dev/null
+++ b/eclipse-compile/design/res/values-sw600dp/dimens.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+ 160dp
+
+ 320dp
+ 576dp
+ @dimen/snackbar_padding_vertical
+ 24dp
+ 2dp
+ 0dp
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/values-sw600dp/styles.xml b/eclipse-compile/design/res/values-sw600dp/styles.xml
new file mode 100644
index 0000000000..622a5e361e
--- /dev/null
+++ b/eclipse-compile/design/res/values-sw600dp/styles.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/values-v21/dimens.xml b/eclipse-compile/design/res/values-v21/dimens.xml
new file mode 100644
index 0000000000..2a67937bb1
--- /dev/null
+++ b/eclipse-compile/design/res/values-v21/dimens.xml
@@ -0,0 +1,19 @@
+
+
+
+ 24dp
+
diff --git a/eclipse-compile/design/res/values/attrs.xml b/eclipse-compile/design/res/values/attrs.xml
new file mode 100644
index 0000000000..e4c1bf02c8
--- /dev/null
+++ b/eclipse-compile/design/res/values/attrs.xml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/values/colors.xml b/eclipse-compile/design/res/values/colors.xml
new file mode 100644
index 0000000000..216ad79930
--- /dev/null
+++ b/eclipse-compile/design/res/values/colors.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ #2EFFFFFF
+
+ #1AFFFFFF
+
+ #0F000000
+
+ #0A000000
+
+
+ #44000000
+
+ #14000000
+
+ @android:color/transparent
+
+ #FFDD2C00
+
+ #323232
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/values/config.xml b/eclipse-compile/design/res/values/config.xml
new file mode 100644
index 0000000000..2ff276a217
--- /dev/null
+++ b/eclipse-compile/design/res/values/config.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ 2
+
+
\ No newline at end of file
diff --git a/eclipse-compile/design/res/values/dimens.xml b/eclipse-compile/design/res/values/dimens.xml
new file mode 100644
index 0000000000..45e83e6088
--- /dev/null
+++ b/eclipse-compile/design/res/values/dimens.xml
@@ -0,0 +1,56 @@
+
+
+
+
+ 8dp
+ 6dp
+ 24dp
+ 56dp
+ 40dp
+ 0.5dp
+
+ 320dp
+ 12dp
+ 32dp
+ 24dp
+ 8dp
+ 0dp
+ 8dp
+
+ 72dp
+ 264dp
+
+ -1px
+ -1px
+ 2dp
+ 0dp
+
+ 12dp
+ 14dp
+ 24dp
+
+
+ 0dp
+
+ 128dp
+
+ 14sp
+
+ 4dp
+
+
diff --git a/eclipse-compile/design/res/values/ids.xml b/eclipse-compile/design/res/values/ids.xml
new file mode 100644
index 0000000000..91acfd033f
--- /dev/null
+++ b/eclipse-compile/design/res/values/ids.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/design/res/values/strings.xml b/eclipse-compile/design/res/values/strings.xml
new file mode 100644
index 0000000000..4c02de1609
--- /dev/null
+++ b/eclipse-compile/design/res/values/strings.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ android.support.design.widget.AppBarLayout$ScrollingViewBehavior
+
+
diff --git a/eclipse-compile/design/res/values/styles.xml b/eclipse-compile/design/res/values/styles.xml
new file mode 100644
index 0000000000..067846c0b1
--- /dev/null
+++ b/eclipse-compile/design/res/values/styles.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index f3187f5fa4..0bf8c486e5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':OsmAnd-java', ':design'
+include ':OsmAnd-java', ':eclipse-compile:design'
include ':OsmAnd'
include ':eclipse-compile:appcompat'
include ':plugins:OsmAnd-AddressPlugin'