Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(timer): support for vibrating when finished #298

Merged
merged 1 commit into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/com/bnyro/clock/obj/ScheduledObject.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ data class ScheduledObject(
var currentPosition: MutableState<Int> = mutableStateOf(0),
val initialPosition: Int = currentPosition.value,
var state: MutableState<WatchState> = mutableStateOf(WatchState.IDLE),
var ringtone: Uri? = null
var ringtone: Uri? = null,
var vibrate: Boolean = false
)
8 changes: 8 additions & 0 deletions app/src/main/java/com/bnyro/clock/services/TimerService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class TimerService : ScheduleService() {
)
.setSmallIcon(R.drawable.ic_notification)
.setSound(scheduledObject.ringtone ?: RingtoneHelper.getDefault(this))
.setVibrate(NotificationHelper.vibrationPattern.takeIf { scheduledObject.vibrate })
.setContentTitle(getString(R.string.timer_finished))
.setContentText(scheduledObject.label.value)
.build()
Expand All @@ -96,6 +97,13 @@ class TimerService : ScheduleService() {
}
}

fun updateVibrate(id: Int, vibrate: Boolean) {
scheduledObjects.firstOrNull { it.id == id }?.let {
it.vibrate = vibrate
invokeChangeListener()
}
}

override fun getStartNotification() = NotificationCompat.Builder(
this,
NotificationHelper.TIMER_SERVICE_CHANNEL
Expand Down
26 changes: 22 additions & 4 deletions app/src/main/java/com/bnyro/clock/ui/components/TimerItem.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.Pause
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -113,7 +114,8 @@ fun TimerItem(obj: ScheduledObject, index: Int, timerModel: TimerModel) {
}
}
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
.height(8.dp),
progress = obj.currentPosition.value / obj.initialPosition.toFloat(),
Expand Down Expand Up @@ -157,9 +159,25 @@ fun TimerItem(obj: ScheduledObject, index: Int, timerModel: TimerModel) {
)
}
if (showRingtoneEditor) {
RingtonePickerDialog(onDismissRequest = {
showRingtoneEditor = false
}) { _, uri ->
RingtonePickerDialog(
onDismissRequest = {
showRingtoneEditor = false
},
bottomContent = {
Row(
modifier = Modifier.align(Alignment.Start),
verticalAlignment = Alignment.CenterVertically
) {
Checkbox(
checked = obj.vibrate,
onCheckedChange = {
timerModel.service?.updateVibrate(obj.id, it)
}
)
Text(text = stringResource(R.string.vibrate))
}
}
) { _, uri ->
timerModel.service?.updateRingtone(obj.id, uri)
}
}
Expand Down
51 changes: 31 additions & 20 deletions app/src/main/java/com/bnyro/clock/ui/dialog/RingtonePickerDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.NotificationsActive
import androidx.compose.material3.AlertDialog
Expand All @@ -35,6 +37,7 @@ import com.bnyro.clock.util.PickPersistentFileContract
@Composable
fun RingtonePickerDialog(
onDismissRequest: () -> Unit,
bottomContent: @Composable ColumnScope.() -> Unit = {},
onSelection: (String, Uri) -> Unit
) {
val context = LocalContext.current
Expand Down Expand Up @@ -67,37 +70,45 @@ fun RingtonePickerDialog(
Text(stringResource(com.bnyro.clock.R.string.sound))
},
text = {
val scrollState = rememberScrollState()
Column(
modifier = Modifier
.fillMaxWidth()
.heightIn(400.dp, 500.dp)
.verticalScroll(scrollState),
.heightIn(400.dp, 500.dp),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
if (ringingToneModel.sounds.isEmpty()) {
CircularProgressIndicator()
} else {
ringingToneModel.sounds.forEach { (title, uri) ->
Row(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(10.dp))
.clickable {
onSelection.invoke(title, uri)
onDismissRequest.invoke()
LazyColumn(
modifier = Modifier.weight(1f),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
items(ringingToneModel.sounds) { (title, uri) ->
Row(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(10.dp))
.clickable {
onSelection.invoke(title, uri)
onDismissRequest.invoke()
}
.padding(horizontal = 10.dp, vertical = 2.dp),
verticalAlignment = Alignment.CenterVertically
) {
Text(title)
Spacer(modifier = Modifier.weight(1f))
ClickableIcon(imageVector = Icons.Default.NotificationsActive) {
ringingToneModel.playRingingTone(context, uri)
}
.padding(horizontal = 10.dp, vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically
) {
Text(title)
Spacer(modifier = Modifier.weight(1f))
ClickableIcon(imageVector = Icons.Default.NotificationsActive) {
ringingToneModel.playRingingTone(context, uri)
}
}
}

Spacer(modifier = Modifier.height(16.dp))

bottomContent()
}
}
}
Expand Down
Loading