From d653200e704a96bdf75da3b2c534eab4d2486dd1 Mon Sep 17 00:00:00 2001
From: Florian Staine <florian.staine@utbm.fr>
Date: Sun, 4 Jun 2017 16:33:47 +0200
Subject: [PATCH] Use xml param

---
 app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java | 24 +++++++++---------------
 app/src/main/res/layout/content_positioning.xml                               |  5 +++--
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
index 678e68c..407373b 100644
--- a/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
+++ b/app/src/main/java/fr/utbm/lo53/p2017/positionningapp/PositioningActivity.java
@@ -1,25 +1,22 @@
 package fr.utbm.lo53.p2017.positionningapp;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.constraint.ConstraintLayout;
-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.text.Layout;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.widget.Button;
 import android.widget.ImageView;
 
 public class PositioningActivity extends BaseActivity {
 
+    private static final String TAG = "PositioningActivity";
+
     private ConstraintLayout start_layout;
+    private Animation hideAnimation;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -28,15 +25,8 @@ public class PositioningActivity extends BaseActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        final Animation hideAnimation = createFadeOutAndHideAnimation();
-
         start_layout = (ConstraintLayout) findViewById(R.id.start_layout);
-        start_layout.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                start_layout.startAnimation(hideAnimation);;
-            }
-        });
+        hideAnimation = createFadeOutAndHideAnimation();
     }
 
     @Override
@@ -47,9 +37,13 @@ public class PositioningActivity extends BaseActivity {
         return true;
     }
 
+    public void startLocating(View v) {
+        start_layout.startAnimation(hideAnimation);
+    }
+
     private Animation createFadeOutAndHideAnimation() {
         ImageView hiding_image = (ImageView) findViewById(R.id.hiding_image);
-        float initial_alpha = hiding_image.getImageAlpha();
+        final float initial_alpha = hiding_image.getImageAlpha() / 255;
         Animation animation = new AlphaAnimation(initial_alpha, 0);
         animation.setInterpolator(new AccelerateInterpolator());
         animation.setDuration(1000);
diff --git a/app/src/main/res/layout/content_positioning.xml b/app/src/main/res/layout/content_positioning.xml
index 13aadcf..a6c36d6 100644
--- a/app/src/main/res/layout/content_positioning.xml
+++ b/app/src/main/res/layout/content_positioning.xml
@@ -27,6 +27,7 @@
         android:id="@+id/start_layout"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:onClick="startLocating"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -34,6 +35,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
+            android:id="@+id/hiding_image"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:alpha=".85"
@@ -41,8 +43,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@android:color/background_dark"
-            android:id="@+id/hiding_image" />
+            app:srcCompat="@android:color/background_dark" />
 
         <TextView
             android:layout_width="wrap_content"
--
libgit2 0.21.4