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: add option for filtering alarms #272

Merged
merged 2 commits into from Jan 26, 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
8 changes: 8 additions & 0 deletions app/src/main/java/com/bnyro/clock/obj/AlarmFilters.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.bnyro.clock.obj

data class AlarmFilters(
val label: String = "",
val weekDays: List<Int> = listOf(0, 1, 2, 3, 4, 5, 6),
val startTime: Long = 0, //00:00
val endTime: Long = 86340000 //23:59
)
202 changes: 202 additions & 0 deletions app/src/main/java/com/bnyro/clock/ui/components/AlarmFilterSection.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
package com.bnyro.clock.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccessTimeFilled
import androidx.compose.material.icons.filled.ArrowRightAlt
import androidx.compose.material.icons.filled.CalendarToday
import androidx.compose.material.icons.outlined.Search
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.bnyro.clock.R
import com.bnyro.clock.obj.AlarmFilters
import com.bnyro.clock.ui.dialog.TimePickerDialog
import com.bnyro.clock.util.AlarmHelper
import com.bnyro.clock.util.TimeHelper

@Composable
fun AlarmFilterSection(
filters: AlarmFilters,
onChangeLabel: (String) -> Unit,
onClickWeekDay: (List<Int>) -> Unit,
onClickStartTime: (Long) -> Unit,
onClickEndTime: (Long) -> Unit
) {

var timeFromFilter by remember { mutableStateOf(false) }
var timeToFilter by remember { mutableStateOf(false) }

Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {

OutlinedTextField(
value = filters.label,
label = { Text(text = stringResource(id = R.string.alarm_name)) },
leadingIcon = {
Icon(imageVector = Icons.Outlined.Search, contentDescription = null)
},
singleLine = true,
shape = CircleShape,
onValueChange = { onChangeLabel(it) },
modifier = Modifier
.fillMaxWidth()
.padding(start = 8.dp, end = 8.dp)
)

WeekDayRow(weekDays = filters.weekDays, onClickWeekDay = onClickWeekDay)

TimeRangeRow(
startTime = filters.startTime,
endTime = filters.endTime,
onClickStartTime = { timeFromFilter = !timeFromFilter },
onClickEndTime = { timeToFilter = !timeToFilter }
)

if (timeFromFilter) {
TimePickerDialog(
label = stringResource(R.string.from),
onDismissRequest = { timeFromFilter = false }
) {
onClickStartTime(it.toLong())
timeFromFilter = false
}
}

if (timeToFilter) {
TimePickerDialog(
label = stringResource(R.string.to),
onDismissRequest = { timeToFilter = false }
) {
onClickEndTime(it.toLong())
timeToFilter = false
}
}
}


}

@Composable
fun WeekDayRow(weekDays: List<Int>, onClickWeekDay: (List<Int>) -> Unit) {

Row(
modifier = Modifier
.fillMaxWidth()
.padding(20.dp),
horizontalArrangement = Arrangement.Start
) {
val daysOfWeek = remember { AlarmHelper.getDaysOfWeekByLocale() }
val chosenDays = remember { weekDays.toMutableList() }

Icon(
imageVector = Icons.Default.CalendarToday,
contentDescription = null
)

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

daysOfWeek.forEach { (day, index) ->
val enabled = chosenDays.contains(index)
Box(
modifier = Modifier
.padding(end = 8.dp)
.size(30.dp)
.background(
if (enabled) MaterialTheme.colorScheme.primary else Color.Transparent,
CircleShape
)
.clip(CircleShape)
.border(
if (enabled) 0.dp else 1.dp,
MaterialTheme.colorScheme.primary,
CircleShape
)
.clickable {
if (enabled) {
if (chosenDays.size > 1) chosenDays.remove(index)
} else {
chosenDays.add(
index
)
}
onClickWeekDay(chosenDays.toList())
},
contentAlignment = Alignment.Center
) {
Text(
text = day,
color = if (enabled) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onPrimaryContainer
)
}

}
}
}

@Composable
fun TimeRangeRow(
startTime: Long,
endTime: Long,
onClickStartTime: () -> Unit,
onClickEndTime: () -> Unit
) {

Row(
modifier = Modifier
.fillMaxWidth()
.padding(start = 20.dp, end = 20.dp, bottom = 10.dp),
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically
) {
Icon(
imageVector = Icons.Default.AccessTimeFilled,
contentDescription = null
)

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

Button(onClick = onClickStartTime, modifier = Modifier.weight(1f)) {
Text(text = TimeHelper.millisToFormatted(startTime))
}

Icon(
imageVector = Icons.Default.ArrowRightAlt,
contentDescription = null,
modifier = Modifier.padding(start = 8.dp, end = 8.dp)
)

Button(onClick = onClickEndTime, modifier = Modifier.weight(1f)) {
Text(text = TimeHelper.millisToFormatted(endTime))
}

}
}
45 changes: 40 additions & 5 deletions app/src/main/java/com/bnyro/clock/ui/model/AlarmModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,35 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.bnyro.clock.db.DatabaseHolder
import com.bnyro.clock.obj.Alarm
import com.bnyro.clock.obj.AlarmFilters
import com.bnyro.clock.util.AlarmHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import java.util.Collections

class AlarmModel : ViewModel() {
var selectedAlarm: Alarm? by mutableStateOf(null)
val alarms: StateFlow<List<Alarm>> = DatabaseHolder.instance.alarmsDao().getAllStream().stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5000L),
initialValue = listOf()
)
var showFilter by mutableStateOf(false)
val filters = MutableStateFlow(AlarmFilters())
val alarms: StateFlow<List<Alarm>> =
combine(DatabaseHolder.instance.alarmsDao().getAllStream(), filters) { items, filter ->
items.filter { alarm ->
(filter.startTime <= alarm.time && alarm.time <= filter.endTime)
&& !Collections.disjoint(filter.weekDays, alarm.days)
&& (alarm.label?.lowercase()?.contains(filter.label.lowercase()) ?: true)

}
}.stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5000L),
initialValue = listOf()
)

fun createAlarm(alarm: Alarm) {
viewModelScope.launch(Dispatchers.IO) {
Expand All @@ -42,4 +57,24 @@ class AlarmModel : ViewModel() {
DatabaseHolder.instance.alarmsDao().delete(alarm)
}
}

fun updateLabelFilter(label: String) {
filters.update { it.copy(label = label) }
}

fun updateWeekDayFilter(weekDays: List<Int>) {
filters.update { it.copy(weekDays = weekDays) }
}

fun updateStartTimeFilter(startTime: Long) {
filters.update { it.copy(startTime = startTime) }
}

fun updateEndTimeFilter(endTime: Long) {
filters.update { it.copy(endTime = endTime) }
}

fun resetFilters() {
filters.update { AlarmFilters() }
}
}
61 changes: 53 additions & 8 deletions app/src/main/java/com/bnyro/clock/ui/screens/AlarmScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,31 @@ package com.bnyro.clock.ui.screens
import android.content.Intent
import android.os.Build
import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Create
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.material.icons.filled.FilterAlt
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DismissDirection
import androidx.compose.material3.DismissValue
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.SwipeToDismiss
import androidx.compose.material3.Text
import androidx.compose.material3.rememberDismissState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
Expand All @@ -19,8 +37,10 @@ import com.bnyro.clock.BuildConfig
import com.bnyro.clock.R
import com.bnyro.clock.obj.Alarm
import com.bnyro.clock.ui.common.BlobIconBox
import com.bnyro.clock.ui.components.AlarmFilterSection
import com.bnyro.clock.ui.components.AlarmRow
import com.bnyro.clock.ui.components.AlarmSettingsSheet
import com.bnyro.clock.ui.components.ClickableIcon
import com.bnyro.clock.ui.components.DialogButton
import com.bnyro.clock.ui.dialog.TimePickerDialog
import com.bnyro.clock.ui.model.AlarmModel
Expand All @@ -37,6 +57,8 @@ fun AlarmScreen(
var showCreationDialog by remember {
mutableStateOf(false)
}
val alarms by alarmModel.alarms.collectAsState()
val filters by alarmModel.filters.collectAsState()

LaunchedEffect(Unit) {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
Expand All @@ -50,15 +72,24 @@ fun AlarmScreen(
}

TopBarScaffold(title = stringResource(R.string.alarm), onClickSettings, fab = {
FloatingActionButton(
onClick = {
showCreationDialog = true
if (!alarmModel.showFilter) {
FloatingActionButton(
onClick = {
showCreationDialog = true
}
) {
Icon(Icons.Default.Create, null)
}
}
}, actions = {
ClickableIcon(
imageVector = Icons.Default.FilterAlt
) {
Icon(Icons.Default.Create, null)
alarmModel.showFilter = !alarmModel.showFilter
if (!alarmModel.showFilter) alarmModel.resetFilters()
}
}) { pv ->
val alarms by alarmModel.alarms.collectAsState()

if (alarms.isEmpty()) {
BlobIconBox(icon = R.drawable.ic_alarm)
}
Expand All @@ -67,6 +98,20 @@ fun AlarmScreen(
.fillMaxSize()
.padding(pv)
) {

item {
if (alarmModel.showFilter) {
AlarmFilterSection(
filters,
{ alarmModel.updateLabelFilter(it) },
{ alarmModel.updateWeekDayFilter(it) },
{ alarmModel.updateStartTimeFilter(it) },
{ alarmModel.updateEndTimeFilter(it) },
)
}

}

items(alarms) {
var showDeletionDialog by remember {
mutableStateOf(false)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
<string name="catppuccin">Catppuccin</string>
<string name="color_scheme">Color Scheme</string>
<string name="start_tab">Start tab</string>
<string name="from">From</string>
<string name="to">To</string>

<plurals name="hour_offset_positive">
<item quantity="one">%d hour ahead</item>
Expand Down
Loading