Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multi-line sleep timer time range for 12 hour locales (#7393)

Browse Source
This commit is contained in:
ByteHamster 2024-09-08 15:55:21 +02:00 committed by GitHub
parent 7e449484a7
commit 5ac3185605
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TimeRangeDialog.java
View File

@ -126,16 +126,20 @@ public class TimeRangeDialog extends MaterialAlertDialogBuilder {
canvas.drawCircle(p2.x, p2.y, padding / 2, paintSelected); canvas.drawCircle(p2.x, p2.y, padding / 2, paintSelected);
paintText.setTextSize(0.6f * padding); paintText.setTextSize(0.6f * padding);
String timeRange; float textBaseY = (size - paintText.descent() - paintText.ascent()) / 2;
if (from == to) { if (from == to) {
timeRange = getContext().getString(R.string.sleep_timer_always); String timeRange = getContext().getString(R.string.sleep_timer_always);
canvas.drawText(timeRange, size / 2, textBaseY, paintText);
} else if (DateFormat.is24HourFormat(getContext())) { } else if (DateFormat.is24HourFormat(getContext())) {
timeRange = String.format(Locale.getDefault(), "%02d:00 - %02d:00", from, to); String timeRange = String.format(Locale.getDefault(), "%02d:00 - %02d:00", from, to);
canvas.drawText(timeRange, size / 2, textBaseY, paintText);
} else { } else {
timeRange = String.format(Locale.getDefault(), "%02d:00 %s - %02d:00 %s", from % 12, String timeFrom = String.format(Locale.getDefault(), "%02d:00 %s", from % 12, from >= 12 ? "PM" : "AM");
from >= 12 ? "PM" : "AM", to % 12, to >= 12 ? "PM" : "AM"); String timeTo = String.format(Locale.getDefault(), "%02d:00 %s", to % 12, to >= 12 ? "PM" : "AM");
canvas.drawText(timeFrom, size / 2, textBaseY - paintText.getTextSize(), paintText);
canvas.drawText("-", size / 2, textBaseY, paintText);
canvas.drawText(timeTo, size / 2, textBaseY + paintText.getTextSize(), paintText);
} }
canvas.drawText(timeRange, size / 2, (size - paintText.descent() - paintText.ascent()) / 2, paintText);
} }
protected Point radToPoint(float angle, float radius) { protected Point radToPoint(float angle, float radius) {