luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-28 16:22:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

set title in ActionBar according to activity

Browse Source
This commit is contained in:
jannis 2019-08-18 20:13:29 +02:00
parent 34a6dd3647
commit ac9af3a03b
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/tadris/fitness/activity/FitoTrackActivity.java
View File

@ -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 {

5
app/src/main/java/de/tadris/fitness/activity/RecordWorkoutActivity.java
View File

@ -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){

2
app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
View File

@ -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();

16
app/src/main/java/de/tadris/fitness/util/WorkoutTypeCalculator.java
View File

@ -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;
}
}

9
app/src/main/res/values/strings.xml
View File

@ -39,6 +39,15 @@
<string name="workoutTotalEnergy">Total Energy</string>
<string name="workoutEnergyConsumption">Energy Consumption</string>
<string name="workoutTypeRunning">Running</string>
<string name="workoutTypeWalking">Walking</string>
<string name="workoutTypeJogging">Jogging</string>
<string name="workoutTypeCycling">Cycling</string>
<string name="workoutTypeHiking">Hiking</string>
<string name="workoutTypeUnknown">Unknown</string>
<string name="recordWorkout">Record Workout</string>
<string name="deleteWorkout">Delete Workout</string>
<string name="deleteWorkoutMessage">Do you really want to delete the workout?</string>