Merge remote-tracking branch 'origin/master'

florian staine
2 parents c006882e d9714300
Showing 7 changed files with 52 additions and 50 deletions Show diff stats
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/Calibration.java
app/src/main/java/fr/utbm/lo53/p2017/positionningapp/TranslateCoordinate.java
app/src/main/res/drawable/map.png
app/src/main/res/drawable/map2.png
app/src/main/res/layout/activity_calibration.xml
app/src/main/res/layout/content_calibration.xml
build.gradle
@@ -14,7 +14,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 public class Calibration extends BaseActivity {
-
+    float height,width;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -23,15 +23,6 @@ public class Calibration extends BaseActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                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);
         final Button setPointButton = (Button) findViewById(R.id.setPointButton);
@@ -42,16 +33,20 @@ public class Calibration extends BaseActivity {
         cancelButton.setVisibility(cancelButton.INVISIBLE);
         measureButton.setVisibility(measureButton.INVISIBLE);
+        //Map.setMaxHeight(50);
+
         Map.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
                 /*motionEvent.getAction()==motionEvent.ACTION_MOVE &&*/
                 if( setPointButton.getVisibility() == setPointButton.INVISIBLE && motionEvent.getX() <= Map.getWidth() && motionEvent.getY() <= Map.getHeight() && motionEvent.getX() >= 0 && motionEvent.getY() >= 0) {
                     MapMarker.setVisibility(MapMarker.VISIBLE);
-                    Snackbar.make(view, " X : " + motionEvent.getX() + " Y : " + motionEvent.getY(), Snackbar.LENGTH_LONG)
+                    height = motionEvent.getX();
+                    width = motionEvent.getY();
+                    Snackbar.make(view, " X : " + height + " Y : " + width, Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
-                    MapMarker.setX(motionEvent.getX()-(MapMarker.getWidth()/4));
-                    MapMarker.setY(motionEvent.getY());
+                    MapMarker.setX(motionEvent.getX()- (view.getWidth()- Map.getWidth())/2 -40);//- MapMarker.getWidth()/2);
+                    MapMarker.setY(motionEvent.getY()+ (view.getHeight()/5));//+(MapMarker.getWidth()/(5/4)));
                 }
                 return true;
             }
@@ -84,7 +79,7 @@ public class Calibration extends BaseActivity {
             }
         });
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
@@ -93,18 +88,8 @@ public class Calibration extends BaseActivity {
         return true;
     }
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
+    public void sendCalibrateRequest(View v) {
+        Snackbar.make(v, "Coucou, X :" + height + " Y : " + width, Snackbar.LENGTH_LONG)
+                .setAction("Action", null).show();
     }
 }
+package fr.utbm.lo53.p2017.positionningapp;
+
+/**
+ * Created by Valentin on 14/06/2017.
+ */
+
+public class TranslateCoordinate {
+    private int mapWidth, mapHeight;
+    public class Point {
+        float x,y;
+    }
+    public Point PointToGeo(float xA, float yA)
+    {
+        Point p = new Point();
+        p.x = (xA/mapWidth)*100;
+        p.y = (yA/mapWidth)*100;
+        return p;
+    }
+}
 \ No newline at end of file
@@ -23,12 +23,4 @@
     <include layout="@layout/content_calibration"/>
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>
@@ -29,19 +29,22 @@
     <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_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:adjustViewBounds="false"
+        android:cropToPadding="false"
+        app:layout_constraintHorizontal_bias="0.15"
         app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:srcCompat="@drawable/map_marker"
         app:layout_constraintTop_toTopOf="@+id/Map"
         android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="@+id/Map"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginBottom="8dp" />
     <Button
         android:id="@+id/setPointButton"
@@ -52,12 +55,12 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="50dp"
         android:text="Set Point"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Map" />
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/cancelButton" />
     <Button
         android:id="@+id/cancelButton"
@@ -67,11 +70,12 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:text="Cancel"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/measureButton" />
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="8dp" />
     <Button
         android:id="@+id/measureButton"
@@ -81,10 +85,12 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="50dp"
+        android:onClick="sendCalibrateRequest"
         android:text="Measure"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Map" />
+        app:layout_constraintHorizontal_bias="0.0"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/cancelButton" />
 </android.support.constraint.ConstraintLayout>
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files