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

Selection of seconds when entering workouts

Browse Source
This commit is contained in:
jannis 2020-03-11 12:21:51 +01:00
parent 3f7d590ded
commit 16c42ec350
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ public class EnterWorkoutActivity extends InformationActivity implements SelectW
typeTextView.setText(getString(workoutBuilder.getWorkoutType().title)); typeTextView.setText(getString(workoutBuilder.getWorkoutType().title));
dateTextView.setText(SimpleDateFormat.getDateInstance().format(workoutBuilder.getStart().getTime())); dateTextView.setText(SimpleDateFormat.getDateInstance().format(workoutBuilder.getStart().getTime()));
timeTextView.setText(SimpleDateFormat.getTimeInstance().format(workoutBuilder.getStart().getTime())); timeTextView.setText(SimpleDateFormat.getTimeInstance().format(workoutBuilder.getStart().getTime()));
durationTextView.setText(UnitUtils.getHourMinuteTime(workoutBuilder.getDuration())); durationTextView.setText(UnitUtils.getHourMinuteSecondTime(workoutBuilder.getDuration()));
} }
private void showTypeSelection() { private void showTypeSelection() {

21
app/src/main/java/de/tadris/fitness/dialog/DurationPickerDialogFragment.java
View File

@ -46,7 +46,7 @@ public class DurationPickerDialogFragment {
NumberPicker hours = v.findViewById(R.id.durationPickerHours); NumberPicker hours = v.findViewById(R.id.durationPickerHours);
hours.setFormatter(value -> value + " " + context.getString(R.string.timeHourShort)); hours.setFormatter(value -> value + " " + context.getString(R.string.timeHourShort));
hours.setMinValue(0); hours.setMinValue(0);
hours.setMaxValue(60); hours.setMaxValue(24);
hours.setValue(getInitialHours()); hours.setValue(getInitialHours());
NumberPicker minutes = v.findViewById(R.id.durationPickerMinutes); NumberPicker minutes = v.findViewById(R.id.durationPickerMinutes);
@ -55,11 +55,17 @@ public class DurationPickerDialogFragment {
minutes.setMaxValue(60); minutes.setMaxValue(60);
minutes.setValue(getInitialMinutes()); minutes.setValue(getInitialMinutes());
NumberPicker seconds = v.findViewById(R.id.durationPickerSeconds);
seconds.setFormatter(value -> value + " " + context.getString(R.string.timeSecondsShort));
seconds.setMinValue(0);
seconds.setMaxValue(60);
seconds.setValue(getInitialSeconds());
d.setView(v); d.setView(v);
d.setNegativeButton(R.string.cancel, null); d.setNegativeButton(R.string.cancel, null);
d.setPositiveButton(R.string.okay, (dialog, which) -> { d.setPositiveButton(R.string.okay, (dialog, which) -> {
listener.onDurationPick(getMillisFromPick(hours.getValue(), minutes.getValue())); listener.onDurationPick(getMillisFromPick(hours.getValue(), minutes.getValue(), seconds.getValue()));
}); });
d.create().show(); d.create().show();
@ -73,10 +79,15 @@ public class DurationPickerDialogFragment {
return (int) (initialDuration / 1000 / 60 % 60); return (int) (initialDuration / 1000 / 60 % 60);
} }
private static long getMillisFromPick(int hours, int minutes) { private int getInitialSeconds() {
long minuteInMillis = 1000L * 60; return (int) (initialDuration / 1000 % 60);
}
private static long getMillisFromPick(int hours, int minutes, int seconds) {
long secondInMillis = 1000L;
long minuteInMillis = secondInMillis * 60;
long hourInMillis = minuteInMillis * 60; long hourInMillis = minuteInMillis * 60;
return hours * hourInMillis + minutes * minuteInMillis; return hours * hourInMillis + minutes * minuteInMillis + seconds * secondInMillis;
} }
public interface DurationPickListener { public interface DurationPickListener {

11
app/src/main/res/layout/dialog_duration_picker.xml
View File

@ -40,4 +40,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="30dp" /> android:layout_margin="30dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=":" />
<NumberPicker
android:id="@+id/durationPickerSeconds"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp" />
</LinearLayout> </LinearLayout>

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

@ -53,6 +53,7 @@
<string name="timeHourSingular">Hour</string> <string name="timeHourSingular">Hour</string>
<string name="timeHourPlural">Hours</string> <string name="timeHourPlural">Hours</string>
<string name="timeHourShort">h</string> <string name="timeHourShort">h</string>
<string name="timeSecondsShort">s</string>
<string name="and">and</string> <string name="and">and</string>
<string name="errorEnterValidNumber">Enter a valid number</string> <string name="errorEnterValidNumber">Enter a valid number</string>