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">
+ app:srcCompat="@android:color/background_dark" />