Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fun HistoryScreen(
) {
val searchQuery by viewModel.searchQuery.collectAsState()
val historyLogs by viewModel.historyLogs.collectAsState()

val selectedFilter by viewModel.selectedFilter.collectAsState()
var selectedLog by remember { mutableStateOf<NotificationEvent?>(null) }
val timeFormatter = remember {
DateTimeFormatter.ofPattern("hh:mm a").withZone(ZoneId.systemDefault())
Expand Down Expand Up @@ -75,7 +75,41 @@ fun HistoryScreen(
)

Spacer(modifier = Modifier.height(12.dp))
Row(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {

FilterChip(
selected = selectedFilter == RuleAction.BLOCK,
onClick = {
viewModel.toggleFilter(RuleAction.BLOCK)
},
label = {
Text("Blocked")
}
)

FilterChip(
selected = selectedFilter == RuleAction.MUTE,
onClick = {
viewModel.toggleFilter(RuleAction.MUTE)
},
label = {
Text("Muted")
}
)

FilterChip(
selected = selectedFilter == RuleAction.ALLOW,
onClick = {
viewModel.toggleFilter(RuleAction.ALLOW)
},
label = {
Text("Delivered")
}
)
}
Spacer(modifier = Modifier.height(12.dp))
// ── Logs List ──
LazyColumn(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,52 +19,45 @@ class HistoryViewModel @Inject constructor(
private val _searchQuery = MutableStateFlow("")
val searchQuery: StateFlow<String> = _searchQuery.asStateFlow()

private val _selectedTab = MutableStateFlow("All") // "All", "BLOCK", "MUTE", "ALLOW"
val selectedTab: StateFlow<String> = _selectedTab.asStateFlow()
private val _selectedFilter = MutableStateFlow<RuleAction?>(null)
val selectedFilter: StateFlow<RuleAction?> = _selectedFilter.asStateFlow()

val historyLogs: StateFlow<List<NotificationEvent>> = combine(
_searchQuery,
_selectedTab
) { query, tab ->
Pair(query, tab)
}.flatMapLatest { (query, tab) ->
val baseFlow = if (query.isBlank()) {
if (tab == "All") {
historyRepository.getAllLogs()
} else {
val action = runCatching { RuleAction.valueOf(tab) }.getOrNull()
if (action != null) {
historyRepository.getLogsByAction(action)
} else {
val historyLogs: StateFlow<List<NotificationEvent>> =
combine(
_searchQuery,
_selectedFilter
) { query, filter ->
query to filter
}.flatMapLatest { (query, filter) ->

val flow =
if (query.isBlank()) {
historyRepository.getAllLogs()
}
}
} else {
historyRepository.searchLogs(query).map { list ->
if (tab == "All") {
list
} else {
val action = runCatching { RuleAction.valueOf(tab) }.getOrNull()
if (action != null) {
list.filter { it.actionTaken == action }
} else {
list
}
historyRepository.searchLogs(query)
}

flow.map { logs ->
filter?.let { action ->
logs.filter { it.actionTaken == action }
} ?: logs
}
}
baseFlow
}.stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5000),
initialValue = emptyList()
)
}.stateIn(
scope = viewModelScope,
started = SharingStarted.WhileSubscribed(5000),
initialValue = emptyList()
)

fun setSearchQuery(query: String) {
_searchQuery.value = query
}

fun setSelectedTab(tab: String) {
_selectedTab.value = tab
fun toggleFilter(filter: RuleAction) {
_selectedFilter.value =
if (_selectedFilter.value == filter) {
null
} else {
filter
}
}
}
Loading