diff --git a/app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java b/app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java index 74d22bc..a781812 100644 --- a/app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java @@ -22,7 +22,7 @@ package de.tadris.fitness.activity; import android.app.Activity; import android.util.TypedValue; -public class FitoTrackActivity extends Activity { +abstract public class FitoTrackActivity extends Activity { diff --git a/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java index 84a160c..d385a86 100644 --- a/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java @@ -51,6 +51,7 @@ import de.tadris.fitness.location.WorkoutRecorder; import de.tadris.fitness.map.MapManager; import de.tadris.fitness.util.ThemeManager; import de.tadris.fitness.util.UnitUtils; +import de.tadris.fitness.util.WorkoutTypeCalculator; public class RecordWorkoutActivity extends FitoTrackActivity implements LocationListener.LocationChangeListener { @@ -73,6 +74,8 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location setTheme(ThemeManager.getThemeByWorkoutType(ACTIVITY)); setContentView(R.layout.activity_record_workout); + setTitle(R.string.recordWorkout); + setupMap(); ((ViewGroup)findViewById(R.id.recordMapViewrRoot)).addView(mapView); @@ -124,7 +127,7 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location while (recorder.isActive()){ Thread.sleep(1000); if(isResumed){ - mHandler.post(() -> updateDescription()); + mHandler.post(this::updateDescription); } } }catch (InterruptedException e){ diff --git a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java index c89a494..2721da2 100644 --- a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java @@ -64,6 +64,7 @@ import de.tadris.fitness.map.MapManager; import de.tadris.fitness.map.WorkoutLayer; import de.tadris.fitness.util.ThemeManager; import de.tadris.fitness.util.UnitUtils; +import de.tadris.fitness.util.WorkoutTypeCalculator; public class ShowWorkoutActivity extends FitoTrackActivity { static Workout selectedWorkout; @@ -86,6 +87,7 @@ public class ShowWorkoutActivity extends FitoTrackActivity { setContentView(R.layout.activity_show_workout); getActionBar().setDisplayHomeAsUpEnabled(true); + setTitle(WorkoutTypeCalculator.getType(workout)); theme= getTheme(); diff --git a/app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java b/app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java index 5382925..2cf7ab7 100644 --- a/app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java +++ b/app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java @@ -19,28 +19,28 @@ package de.tadris.fitness.util; +import de.tadris.fitness.R; import de.tadris.fitness.data.Workout; public class WorkoutTypeCalculator { - public static String getType(Workout workout){ - // TODO: use localisation + public static int getType(Workout workout){ if(workout.workoutType.equals(Workout.WORKOUT_TYPE_RUNNING)){ if(workout.avgSpeed < 7){ - return "Walking"; + return R.string.workoutTypeWalking; }else if(workout.avgSpeed < 9.6){ - return "Jogging"; + return R.string.workoutTypeJogging; }else{ - return "Running"; + return R.string.workoutTypeRunning; } } if(workout.workoutType.equals(Workout.WORKOUT_TYPE_CYCLING)){ - return "Cycling"; + return R.string.workoutTypeCycling; } if(workout.workoutType.equals(Workout.WORKOUT_TYPE_HIKING)){ - return "Hiking"; + return R.string.workoutTypeHiking; } - return "Unknown"; + return R.string.workoutTypeUnknown; } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ad9eef..dd0b5a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,6 +39,15 @@ Total Energy Energy Consumption + Running + Walking + Jogging + Cycling + Hiking + Unknown + + Record Workout + Delete Workout Do you really want to delete the workout?