fix #5: Add reminder display duration setting
This commit is contained in:
parent
ffdaaf722b
commit
a7310220e5
@ -7,5 +7,5 @@
|
|||||||
"latestVersionCode": 4,
|
"latestVersionCode": 4,
|
||||||
"developer": "timklge",
|
"developer": "timklge",
|
||||||
"description": "Simple karoo extension that shows in-ride alerts every X minutes",
|
"description": "Simple karoo extension that shows in-ride alerts every X minutes",
|
||||||
"releaseNotes": "Fix reminders are shown immediately on start of the second ride after system start"
|
"releaseNotes": "Added display duration setting"
|
||||||
}
|
}
|
||||||
@ -77,7 +77,7 @@ class KarooReminderExtension : KarooExtension("karoo-reminder", "1.0.3") {
|
|||||||
id = "reminder-${reminder.id}-${elapsedMinutes}",
|
id = "reminder-${reminder.id}-${elapsedMinutes}",
|
||||||
detail = reminder.text,
|
detail = reminder.text,
|
||||||
title = reminder.name,
|
title = reminder.name,
|
||||||
autoDismissMs = if(reminder.isAutoDismiss) 15_000 else null,
|
autoDismissMs = if(reminder.isAutoDismiss) reminder.autoDismissSeconds * 1000L else null,
|
||||||
icon = R.drawable.ic_launcher,
|
icon = R.drawable.ic_launcher,
|
||||||
textColor = R.color.white,
|
textColor = R.color.white,
|
||||||
backgroundColor = reminder.getResourceColor(applicationContext)
|
backgroundColor = reminder.getResourceColor(applicationContext)
|
||||||
|
|||||||
@ -40,7 +40,6 @@ import androidx.compose.runtime.getValue
|
|||||||
import androidx.compose.runtime.mutableIntStateOf
|
import androidx.compose.runtime.mutableIntStateOf
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@ -61,7 +60,6 @@ import com.maxkeppeler.sheets.color.models.SingleColor
|
|||||||
import de.timklge.karooreminder.R
|
import de.timklge.karooreminder.R
|
||||||
import io.hammerhead.karooext.KarooSystemService
|
import io.hammerhead.karooext.KarooSystemService
|
||||||
import io.hammerhead.karooext.models.PlayBeepPattern
|
import io.hammerhead.karooext.models.PlayBeepPattern
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
@ -81,9 +79,10 @@ fun DetailScreen(isCreating: Boolean, reminder: Reminder, onSubmit: (updatedRemi
|
|||||||
var deleteDialogVisible by remember { mutableStateOf(false) }
|
var deleteDialogVisible by remember { mutableStateOf(false) }
|
||||||
var toneDialogVisible by remember { mutableStateOf(false) }
|
var toneDialogVisible by remember { mutableStateOf(false) }
|
||||||
var selectedTone by remember { mutableStateOf(reminder.tone) }
|
var selectedTone by remember { mutableStateOf(reminder.tone) }
|
||||||
|
var autoDismissSeconds by remember { mutableStateOf(reminder.autoDismissSeconds.toString()) }
|
||||||
|
|
||||||
fun getUpdatedReminder(): Reminder = Reminder(reminder.id, title, duration.toIntOrNull() ?: 0,
|
fun getUpdatedReminder(): Reminder = Reminder(reminder.id, title, duration.toIntOrNull() ?: 1,
|
||||||
text, selectedColor, isActive, isAutoDismiss = autoDismiss, tone = selectedTone)
|
text, selectedColor, isActive, isAutoDismiss = autoDismiss, tone = selectedTone, autoDismissSeconds = autoDismissSeconds.toIntOrNull() ?: 15)
|
||||||
|
|
||||||
Column(modifier = Modifier
|
Column(modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@ -158,6 +157,16 @@ fun DetailScreen(isCreating: Boolean, reminder: Reminder, onSubmit: (updatedRemi
|
|||||||
Text("Auto-Dismiss")
|
Text("Auto-Dismiss")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (autoDismiss){
|
||||||
|
OutlinedTextField(value = autoDismissSeconds, modifier = Modifier.fillMaxWidth(),
|
||||||
|
onValueChange = { autoDismissSeconds = it },
|
||||||
|
label = { Text("Display duration") },
|
||||||
|
suffix = { Text("s") },
|
||||||
|
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
|
||||||
|
singleLine = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
Switch(checked = isActive, onCheckedChange = { isActive = it})
|
Switch(checked = isActive, onCheckedChange = { isActive = it})
|
||||||
Spacer(modifier = Modifier.width(10.dp))
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
@ -212,7 +221,6 @@ fun DetailScreen(isCreating: Boolean, reminder: Reminder, onSubmit: (updatedRemi
|
|||||||
if (toneDialogVisible){
|
if (toneDialogVisible){
|
||||||
Dialog(onDismissRequest = { toneDialogVisible = false }) {
|
Dialog(onDismissRequest = { toneDialogVisible = false }) {
|
||||||
var dialogSelectedTone by remember { mutableStateOf(selectedTone) }
|
var dialogSelectedTone by remember { mutableStateOf(selectedTone) }
|
||||||
val coroutineScope = rememberCoroutineScope()
|
|
||||||
|
|
||||||
Card(
|
Card(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
@ -261,7 +269,6 @@ fun DetailScreen(isCreating: Boolean, reminder: Reminder, onSubmit: (updatedRemi
|
|||||||
Icon(Icons.Default.Close, contentDescription = "Cancel")
|
Icon(Icons.Default.Close, contentDescription = "Cancel")
|
||||||
Text("Cancel")
|
Text("Cancel")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -56,6 +56,7 @@ import androidx.navigation.navArgument
|
|||||||
import de.timklge.karooreminder.KarooReminderExtension
|
import de.timklge.karooreminder.KarooReminderExtension
|
||||||
import de.timklge.karooreminder.dataStore
|
import de.timklge.karooreminder.dataStore
|
||||||
import io.hammerhead.karooext.KarooSystemService
|
import io.hammerhead.karooext.KarooSystemService
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.serialization.encodeToString
|
import kotlinx.serialization.encodeToString
|
||||||
@ -151,6 +152,12 @@ fun MainScreen(reminders: MutableList<Reminder>, onNavigateToReminder: (r: Remin
|
|||||||
val ctx = LocalContext.current
|
val ctx = LocalContext.current
|
||||||
val karooSystem = remember { KarooSystemService(ctx) }
|
val karooSystem = remember { KarooSystemService(ctx) }
|
||||||
|
|
||||||
|
var showWarnings by remember { mutableStateOf(false) }
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
delay(1000L)
|
||||||
|
showWarnings = true
|
||||||
|
}
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = { TopAppBar(title = {Text("Reminder")}) },
|
topBar = { TopAppBar(title = {Text("Reminder")}) },
|
||||||
floatingActionButtonPosition = FabPosition.End,
|
floatingActionButtonPosition = FabPosition.End,
|
||||||
@ -203,10 +210,12 @@ fun MainScreen(reminders: MutableList<Reminder>, onNavigateToReminder: (r: Remin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reminders.isEmpty()) Text(modifier = Modifier.padding(5.dp), text = "No reminders added.")
|
if (showWarnings){
|
||||||
|
if (reminders.isEmpty()) Text(modifier = Modifier.padding(5.dp), text = "No reminders added.")
|
||||||
|
|
||||||
if (!karooConnected){
|
if (!karooConnected){
|
||||||
Text(modifier = Modifier.padding(5.dp), text = "Could not read device status. Is your Karoo updated?")
|
Text(modifier = Modifier.padding(5.dp), text = "Could not read device status. Is your Karoo updated?")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,7 +28,8 @@ enum class ReminderBeepPattern(val displayName: String, val tones: List<PlayBeep
|
|||||||
class Reminder(val id: Int, var name: String, var interval: Int, var text: String,
|
class Reminder(val id: Int, var name: String, var interval: Int, var text: String,
|
||||||
var foregroundColor: Int = android.graphics.Color.parseColor("#700000"),
|
var foregroundColor: Int = android.graphics.Color.parseColor("#700000"),
|
||||||
val isActive: Boolean = true, val isAutoDismiss: Boolean = true,
|
val isActive: Boolean = true, val isAutoDismiss: Boolean = true,
|
||||||
val tone: ReminderBeepPattern = ReminderBeepPattern.THREE_TONES_UP){
|
val tone: ReminderBeepPattern = ReminderBeepPattern.THREE_TONES_UP,
|
||||||
|
val autoDismissSeconds: Int = 15){
|
||||||
|
|
||||||
fun getResourceColor(context: Context): Int {
|
fun getResourceColor(context: Context): Int {
|
||||||
return when(foregroundColor){
|
return when(foregroundColor){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user