resolution bug drag n drop : scene2 ok

aarnaude
1 parent 713264a5
Showing 2 changed files with 38 additions and 65 deletions Show diff stats
app/src/main/java/tonio/noa/TutorialScene2Activity.java
app/src/main/res/layout/tutorial2_display.xml
@@ -6,17 +6,13 @@ import android.os.Bundle;
 import android.view.DragEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
+import android.widget.ImageView;
 /**
  * Created by psyk on 09/01/18.
  */
-public class TutorialScene2Activity extends MyPlayActivity implements View.OnTouchListener,View.OnDragListener{
-
+public class TutorialScene2Activity extends MyPlayActivity implements View.OnTouchListener, View.OnDragListener {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,16 +21,15 @@ public class TutorialScene2Activity extends MyPlayActivity implements View.OnTou
         setContentView(R.layout.tutorial2_display);
         findViewById(R.id.blue_rectangle).setOnTouchListener(this);
-
-        findViewById(R.id.ts2l1).setOnDragListener(this);
-        findViewById(R.id.ts2r1).setOnDragListener(this);
+        findViewById(R.id.blue_rectangle).setOnDragListener(this);
+        findViewById(R.id.red_rectangle).setOnDragListener(this);
     }
     @Override
     public boolean onTouch(View view, MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
+            View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(view);
             ClipData data = ClipData.newPlainText("id", view.getResources().getResourceEntryName(view.getId()));
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -42,11 +37,9 @@ public class TutorialScene2Activity extends MyPlayActivity implements View.OnTou
             } else {
                 view.startDrag(data, shadowBuilder, view, 0);
             }
-
-            view.setVisibility(View.INVISIBLE);
             return true;
-        }
-        return false;
+        } else
+            return false;
     }
     @Override
@@ -69,28 +62,22 @@ public class TutorialScene2Activity extends MyPlayActivity implements View.OnTou
             // the drag and drop operation has concluded
             case DragEvent.ACTION_DRAG_ENDED:
-                this.next();
                 break;
             //drag shadow has been released,the drag point is within the bounding box of the View
             case DragEvent.ACTION_DROP:
+                //handle the dragged view being dropped over a target view
                 View view = (View) event.getLocalState();
-                // we want to make sure it is dropped only to left and right parent view
-                if (v.getId() == R.id.ts2l1 || v.getId() == R.id.ts2r1) {
-
-                    ViewGroup source = (ViewGroup) view.getParent();
-                    source.removeView(view);
-
-                    RelativeLayout target = (RelativeLayout) v;
-                    target.addView(view);
-
-                    String id = event.getClipData().getItemAt(0).getText().toString();
-                    Toast.makeText(this, id + " dropped!", Toast.LENGTH_SHORT).show();
-
-                    bravoPage(view);
+                if(v==findViewById(R.id.red_rectangle)) {
+                    //stop displaying the view where it was before it was dragged
+                    view.setVisibility(View.INVISIBLE);
+                    //view dragged item is being dropped on
+                    ImageView dropTarget = (ImageView) v;
+                    //view being dragged and dropped
+                    ImageView dropped = (ImageView) view;
+                    dropTarget.setBackgroundColor(dropped.getSolidColor());
+                    bravoPage(v);
                 }
-                // make view visible as we set visibility to invisible while starting drag
-                view.setVisibility(View.VISIBLE);
                 break;
         }
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tut2"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-<LinearLayout
-    android:id="@+id/ts2l1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:textSize="15sp"
-        android:text="Fais glisser le rectangle bleu sur le rectangle rouge." />
+        android:layout_centerHorizontal="true"
+        android:text="Fais glisser le rectangle bleu sur le rectangle rouge."
+        android:textSize="15sp" />
     <ImageView
         android:id="@+id/blue_rectangle"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_margin="50dp"
-        android:background="@drawable/blue_rectangle"/>
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/blue_rectangle" />
-</LinearLayout>
-    <RelativeLayout
-        android:id="@+id/ts2r1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/ts2l1"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/red_rectangle"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_centerInParent="true"
-            android:background="@drawable/red_rectangle" />
-
-        <Button
-            android:id="@+id/button_id_home"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_margin="5dp"
-            android:onClick="backHome"
-            android:text="@string/home" />
+    <ImageView
+        android:id="@+id/red_rectangle"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_centerInParent="true"
+        android:background="@drawable/red_rectangle" />
-    </RelativeLayout>
+    <Button
+        android:id="@+id/button_id_home"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_margin="5dp"
+        android:onClick="backHome"
+        android:text="@string/home" />
 </RelativeLayout>
 \ No newline at end of file