Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 2bc6498

Browse files
committed
Remaining time of sleep timer changed from MM:ss to HH:mm:ss
1 parent bb56be2 commit 2bc6498

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

app/src/main/java/com/jamal2367/urlradio/PlayerFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ class PlayerFragment : Fragment(),
471471
.build()
472472

473473
timePicker.addOnPositiveButtonClickListener {
474-
val selectedTimeMillis = (timePicker.hour * 60 * 60 * 1000L) + (timePicker.minute * 60 * 1000L)
474+
val selectedTimeMillis = (timePicker.hour * 60 * 60 * 1000L) + (timePicker.minute * 60 * 1000L) + 1000
475475
// start the sleep timer with the selected time
476476
playerState.sleepTimerRunning = true
477477
controller?.startSleepTimer(selectedTimeMillis)

app/src/main/java/com/jamal2367/urlradio/helpers/DateTimeHelper.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ object DateTimeHelper {
5656
}
5757

5858

59-
/* Converts a milliseconds in to a readable format */
60-
fun convertToMinutesAndSeconds(milliseconds: Long, negativeValue: Boolean = false): String {
61-
// convert milliseconds to minutes and seconds
62-
val minutes: Long = milliseconds / 1000 / 60
59+
/* Converts a milliseconds into a readable format (HH:mm:ss) */
60+
fun convertToHoursMinutesSeconds(milliseconds: Long, negativeValue: Boolean = false): String {
61+
// convert milliseconds to hours, minutes, and seconds
62+
val hours: Long = milliseconds / 1000 / 3600
63+
val minutes: Long = milliseconds / 1000 % 3600 / 60
6364
val seconds: Long = milliseconds / 1000 % 60
6465
var timeString =
65-
"${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}"
66+
"${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}"
6667
if (negativeValue) {
6768
// add a minus sign if a negative values was requested
6869
timeString = "-$timeString"

app/src/main/java/com/jamal2367/urlradio/ui/LayoutHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ data class LayoutHolder(var rootView: View) {
276276
}
277277
else -> {
278278
sleepTimerRunningViews.isVisible = true
279-
val sleepTimerTimeRemaining = DateTimeHelper.convertToMinutesAndSeconds(timeRemaining)
279+
val sleepTimerTimeRemaining = DateTimeHelper.convertToHoursMinutesSeconds(timeRemaining)
280280
sheetSleepTimerRemainingTimeView.text = sleepTimerTimeRemaining
281281
sheetSleepTimerRemainingTimeView.contentDescription = "${context.getString(R.string.descr_expanded_player_sleep_timer_remaining_time)}: $sleepTimerTimeRemaining"
282282
stationNameView.isSelected = false

0 commit comments

Comments
 (0)