From aeff84be71385e117b1a60756cd07c51b1bdeeaf Mon Sep 17 00:00:00 2001
From: FatBaz <vavaburger@gmail.com>
Date: Mon, 29 May 2017 18:08:44 +0200
Subject: [PATCH] Add MapMarker and images

---
 app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java | 25 ++++++++++++++++++++++++-
 app/src/main/res/drawable/map.png                                     | Bin 0 -> 4655 bytes
 app/src/main/res/drawable/map_marker.png                              | Bin 0 -> 11488 bytes
 app/src/main/res/layout/activity_calibration.xml                      |  3 ++-
 app/src/main/res/layout/content_calibration.xml                       | 31 ++++++++++++++++++++++++++-----
 5 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/map.png
 create mode 100644 app/src/main/res/drawable/map_marker.png

diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
index ae5f9fe..334173f 100644
--- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
@@ -5,14 +5,17 @@ import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.ImageView;
 
 public class Calibration extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_calibration);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -22,10 +25,30 @@ public class Calibration extends AppCompatActivity {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                Snackbar.make(view, "Salut ! :) Ce bouton ne sert à rien.", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();
             }
         });
+
+        final ImageView Map = (ImageView) findViewById(R.id.Map);
+        final ImageView MapMarker =  (ImageView) findViewById(R.id.MapMarker);
+
+        MapMarker.setVisibility(MapMarker.INVISIBLE);
+
+        Map.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if(motionEvent.getAction()==motionEvent.ACTION_MOVE) {
+                    MapMarker.setVisibility(MapMarker.VISIBLE);
+                    Snackbar.make(view, " X : " + motionEvent.getX() + " Y : " + motionEvent.getY(), Snackbar.LENGTH_LONG)
+                            .setAction("Action", null).show();
+                    MapMarker.setX(motionEvent.getX()-(MapMarker.getWidth()/4));
+                    MapMarker.setY(motionEvent.getY()-(MapMarker.getHeight()/4));
+                }
+                return true;
+            }
+
+        });
     }
 
     @Override
diff --git a/app/src/main/res/drawable/map.png b/app/src/main/res/drawable/map.png
new file mode 100644
index 0000000..cc161de
Binary files /dev/null and b/app/src/main/res/drawable/map.png differ
diff --git a/app/src/main/res/drawable/map_marker.png b/app/src/main/res/drawable/map_marker.png
new file mode 100644
index 0000000..7b5e10e
Binary files /dev/null and b/app/src/main/res/drawable/map_marker.png differ
diff --git a/app/src/main/res/layout/activity_calibration.xml b/app/src/main/res/layout/activity_calibration.xml
index 640e1bb..ec54ca5 100644
--- a/app/src/main/res/layout/activity_calibration.xml
+++ b/app/src/main/res/layout/activity_calibration.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#000000"
     tools:context="fr.utbm.lo53.p2017.positionningapp.Calibration">
 
     <android.support.design.widget.AppBarLayout
@@ -20,7 +21,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_calibration" />
+    <include layout="@layout/content_calibration"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
diff --git a/app/src/main/res/layout/content_calibration.xml b/app/src/main/res/layout/content_calibration.xml
index 24c78dc..8663ffb 100644
--- a/app/src/main/res/layout/content_calibration.xml
+++ b/app/src/main/res/layout/content_calibration.xml
@@ -8,13 +8,34 @@
     tools:context="fr.utbm.lo53.p2017.positionningapp.Calibration"
     tools:showIn="@layout/activity_calibration">
 
-    <TextView
-        android:layout_width="wrap_content"
+    <ImageView
+        android:id="@+id/Map"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="30dp"
+        android:paddingLeft="0dp"
+        android:paddingTop="0dp"
+        android:scaleType="fitXY"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/map" />
+
+    <ImageView
+        android:id="@+id/MapMarker"
+        android:layout_width="42dp"
+        android:layout_height="46dp"
+        app:srcCompat="@drawable/map_marker"
+        android:layout_marginRight="8dp"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/Map"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/Map"
+        android:layout_marginBottom="8dp" />
 
 </android.support.constraint.ConstraintLayout>
--
libgit2 0.21.4