From 0ba7da7083f7d277b3e0bddea639a12fa9ad98a1 Mon Sep 17 00:00:00 2001 From: chteufleur Date: Thu, 16 Aug 2018 11:37:09 +0200 Subject: [PATCH] Change buttons. --- .../mytrackingdog/MainActivity.java | 32 +++++----- app/src/main/res/drawable/blue_button.xml | 37 +++++++++++ app/src/main/res/drawable/green_button.xml | 37 +++++++++++ app/src/main/res/drawable/red_button.xml | 37 +++++++++++ app/src/main/res/layout/main.xml | 62 ++++++++++++------- app/src/main/res/values/strings.xml | 5 ++ 6 files changed, 170 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable/blue_button.xml create mode 100644 app/src/main/res/drawable/green_button.xml create mode 100644 app/src/main/res/drawable/red_button.xml diff --git a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java index 658cd6f..22402db 100644 --- a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java +++ b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java @@ -14,7 +14,6 @@ import android.os.Environment; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; -import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; @@ -22,6 +21,7 @@ import android.view.MenuItem; import android.view.Surface; import android.view.View; import android.view.WindowManager; +import android.widget.Button; import android.widget.TextView; import android.widget.Toast; @@ -70,9 +70,9 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu private static final float LINE_WIDTH_BIG = 12; - private FloatingActionButton start_stop_trace; - private FloatingActionButton start_stop_dog_trace; - private FloatingActionButton add_object; + private Button start_stop_trace; + private Button start_stop_dog_trace; + private Button add_object; private TextView textViewCurrentLocation; private MyLocation lastLocation = null; @@ -129,7 +129,6 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu start_stop_trace = findViewById(R.id.start_stop_trace); - start_stop_trace.setImageResource(R.drawable.ic_play); start_stop_trace.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -137,7 +136,6 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu } }); start_stop_dog_trace = findViewById(R.id.start_stop_dog_trace); - start_stop_dog_trace.setImageResource(R.drawable.ic_play); start_stop_dog_trace.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -145,7 +143,6 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu } }); add_object = findViewById(R.id.add_object); - add_object.setImageResource(R.drawable.ic_plus); add_object.setVisibility(View.GONE); add_object.setOnClickListener(new View.OnClickListener() { @Override @@ -166,12 +163,13 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu private void changeStatusTrace() { serviceGps.toggleTraceurActivation(); if (serviceGps.isTraceurActivated()) { - this.start_stop_trace.setImageResource(R.drawable.ic_stop); + this.start_stop_trace.setText(R.string.trail_stop); this.add_object.setVisibility(View.VISIBLE); this.start_stop_dog_trace.setVisibility(View.GONE); this.textViewCurrentLocation.setVisibility(View.VISIBLE); + updateDistance(); } else { - this.start_stop_trace.setImageResource(R.drawable.ic_play); + this.start_stop_trace.setText(R.string.trail_start); this.add_object.setVisibility(View.GONE); this.start_stop_dog_trace.setVisibility(View.VISIBLE); } @@ -180,13 +178,15 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu private void changeStatusDogTrace() { serviceGps.toggleDogActivation(); if (serviceGps.isDogActivated()) { - this.start_stop_dog_trace.setImageResource(R.drawable.ic_stop); + this.start_stop_dog_trace.setText(R.string.dog_stop); this.add_object.setVisibility(View.GONE); this.start_stop_trace.setVisibility(View.GONE); + this.textViewCurrentLocation.setVisibility(View.GONE); } else { - this.start_stop_dog_trace.setImageResource(R.drawable.ic_play); - this.add_object.setVisibility(View.VISIBLE); + this.start_stop_dog_trace.setText(R.string.dog_start); + this.add_object.setVisibility(View.GONE); this.start_stop_trace.setVisibility(View.VISIBLE); + this.textViewCurrentLocation.setVisibility(View.GONE); } } @@ -398,7 +398,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu private void calculTrailDistance() { List listLoc = serviceGps.getListGeoPointTraceur(); MyLocation last = null; - int distance = 0; + distance = 0; for (MyLocation loc: listLoc) { if (last != null) { distance += loc.distanceTo(last); @@ -406,7 +406,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu last = loc; } if (distance != 0) { - updateDistance(distance); + updateDistance(); } } @@ -450,7 +450,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu updateTrailTrace(); if (lastLocation != null) { distance += loc.distanceTo(lastLocation); - updateDistance(distance); + updateDistance(); } lastLocation = loc; } else if (serviceGps.isDogActivated()) { @@ -476,7 +476,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu return ret; } - private void updateDistance(int distance) { + private void updateDistance() { this.textViewCurrentLocation.setText("Distance: "+distance+"m"); this.textViewCurrentLocation.setVisibility(View.VISIBLE); } diff --git a/app/src/main/res/drawable/blue_button.xml b/app/src/main/res/drawable/blue_button.xml new file mode 100644 index 0000000..ec897d8 --- /dev/null +++ b/app/src/main/res/drawable/blue_button.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/green_button.xml b/app/src/main/res/drawable/green_button.xml new file mode 100644 index 0000000..d056938 --- /dev/null +++ b/app/src/main/res/drawable/green_button.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/red_button.xml b/app/src/main/res/drawable/red_button.xml new file mode 100644 index 0000000..6b1dd2f --- /dev/null +++ b/app/src/main/res/drawable/red_button.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index ac8eb6f..d018c17 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -30,32 +30,46 @@ + android:layout_height="fill_parent" > - + - + android:layout_gravity="bottom" + android:orientation="horizontal"> + + +