Merge branch 'acl-ui'

1 files changed, 14 insertions, 6 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
index 002a0e6ae..e8f076cb6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java
@@ -14,6 +14,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import butterknife.BindInt;
+import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
@@ -30,22 +32,28 @@ public class CrossTabDragAndDrop {
 
     private final Activity activity;
     private final float pxToReact;
-    private final long msToReact;
-    private final long msToReactOnMove;
     private long lastSwap = 0;
     private long lastMove = 0;
 
+    @BindInt(R.integer.drag_n_drop_dp_to_react)
+    int dragAndDropDPtoReact;
+    @BindInt(R.integer.drag_n_drop_dp_to_react_top_bottom)
+    int dragAndDropDPtoReactTopBottom;
+    @BindInt(R.integer.drag_n_drop_ms_to_react)
+    int msToReact;
+    @BindInt(R.integer.drag_n_drop_dp_to_react_top_bottom)
+    int msToReactOnMove;
+
     private final float pxToReactTopBottom;
 
     private final Set<CardMovedByDragListener> moveListenerList = new HashSet<>(1);
 
     public CrossTabDragAndDrop(Activity activity) {
         this.activity = activity;
+        ButterKnife.bind(this, activity);
         final float density = activity.getResources().getDisplayMetrics().density;
-        this.pxToReact = activity.getResources().getInteger(R.integer.drag_n_drop_dp_to_react) * density;
-        this.pxToReactTopBottom = activity.getResources().getInteger(R.integer.drag_n_drop_dp_to_react_top_bottom) * density;
-        this.msToReact = activity.getResources().getInteger(R.integer.drag_n_drop_ms_to_react);
-        this.msToReactOnMove = activity.getResources().getInteger(R.integer.drag_n_drop_ms_to_react_on_move);
+        this.pxToReact = dragAndDropDPtoReact * density;
+        this.pxToReactTopBottom = dragAndDropDPtoReactTopBottom * density;
     }
 
     public void register(final ViewPager viewPager) {