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

give vocal updates

Browse Source
This commit is contained in:
Ruslan Sokolovski 2020-01-01 22:26:20 -08:00
parent 07b362ddcc
commit a0a1f44ef9
5 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -49,6 +49,12 @@ android {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}
lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
// abortOnError false
}
}
dependencies {

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

@ -38,6 +38,8 @@ import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import android.speech.tts.TextToSpeech;
import androidx.core.app.ActivityCompat;
import org.mapsforge.core.graphics.Paint;
@ -171,6 +173,7 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
if(isResumed){
mHandler.post(this::updateDescription);
}
mHandler.post(this::speechUpdate);
}
}catch (InterruptedException e){
e.printStackTrace();
@ -178,14 +181,41 @@ public class RecordWorkoutActivity extends FitoTrackActivity implements Location
}).start();
}
int i= 0;
private void speechUpdate() {
long duration = recorder.getDuration();
if (duration / interval == lastSpeechUpdate / interval)
return;
private void updateDescription(){
i++;
timeView.setText(UnitUtils.getHourMinuteSecondTime(recorder.getDuration()));
infoViews[0].setText(getString(R.string.workoutDistance), UnitUtils.getDistance(recorder.getDistance()));
timeView.setText(UnitUtils.getHourMinuteSecondTime(duration));
final String distanceCaption = getString(R.string.workoutDistance);
final String distance = UnitUtils.getDistance(recorder.getDistance());
final String avgSpeedCaption = getString(R.string.workoutAvgSpeed);
final String avgSpeed = UnitUtils.getSpeed(Math.min(100d, recorder.getAvgSpeed()));
tts = new TextToSpeech(this, (int status) -> {
if (status != TextToSpeech.SUCCESS) return;
final String text = distanceCaption + ": " + distance + ". "
+ avgSpeedCaption + ": " + avgSpeed;
tts.speak(text, TextToSpeech.QUEUE_FLUSH, null, "updateDescription" + duration);
});
lastSpeechUpdate = duration;
}
TextToSpeech tts;
long lastSpeechUpdate = 0;
final long interval = 60 * 1000;
private void updateDescription() {
long duration = recorder.getDuration();
timeView.setText(UnitUtils.getHourMinuteSecondTime(duration));
final String distanceCaption = getString(R.string.workoutDistance);
final String distance = UnitUtils.getDistance(recorder.getDistance());
final String avgSpeedCaption = getString(R.string.workoutAvgSpeed);
final String avgSpeed = UnitUtils.getSpeed(Math.min(100d, recorder.getAvgSpeed()));
infoViews[0].setText(distanceCaption, distance);
infoViews[1].setText(getString(R.string.workoutBurnedEnergy), recorder.getCalories() + " kcal");
infoViews[2].setText(getString(R.string.workoutAvgSpeed), UnitUtils.getSpeed(Math.min(100d, recorder.getAvgSpeed())));
infoViews[2].setText(avgSpeedCaption, avgSpeed);
infoViews[3].setText(getString(R.string.workoutPauseDuration), UnitUtils.getHourMinuteSecondTime(recorder.getPauseDuration()));
}

2
app/src/main/java/de/tadris/fitness/recording/WorkoutRecorder.java
View File

@ -48,7 +48,7 @@ public class WorkoutRecorder implements LocationListener.LocationChangeListener
}
}
private static final int PAUSE_TIME= 10000;
private static final int PAUSE_TIME= 1000*1000;
/**
* Time after which the workout is stopped and saved automatically because there is no activity anymore

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

@ -57,7 +57,7 @@
<string name="workoutPace">Pace</string>
<string name="workoutRoute">Route</string>
<string name="workoutSpeed">Speed</string>
<string name="workoutAvgSpeed">Avg. Speed</string>
<string name="workoutAvgSpeed">Average Speed</string>
<string name="workoutTopSpeed">Top Speed</string>
<string name="workoutBurnedEnergy">Burned Energy</string>
<string name="workoutTotalEnergy">Total Energy</string>

2
build.gradle
View File

@ -26,7 +26,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:3.4.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files