bugfix/reorder_modules

[mshdabiola]

PR Type

Enhancement, Bug fix

---

Description

• Refactor notification dialog.

• Update MainData to data class.

• Improve main screen UI.

• Update repositories and view models.

---

Changes walkthrough 📝

	Relevant files
Enhancement	21 files NoteficationDialog.kt Refactor notification dialog to use new components and data structures +619/-376 MainScreen.kt Update MainScreen to use new notification dialog and top app bar +57/-115 MainViewModel.kt Update MainViewModel to handle new notification dialog and search logic +200/-207 TopbarAndDialog.kt Create new top app bar and update search functionality      +300/-62 DateTimeRepository.kt Create DateTimeRepository to manage notification data        +99/-0    MainNavigatin.kt Update MainNavigation to handle MainData type                        +13/-12  DetailScreen.kt Update DetailScreen to use new notification dialog              +21/-20  NotificationInterval.kt Create NotificationInterval sealed class                                  +33/-0    MainData.kt Refactor MainData to data class                                                    +9/-6      SearchState.kt Create SearchState sealed class                                                    +16/-0    NotificationUiState.kt Create NotificationUiState data class                                        +15/-0    DateListUiState.kt Add newValue field to DateListUiState                                        +1/-0      NotificationPlace.kt Create NotificationPlace sealed class                                        +8/-0      NotificationTime.kt Create NotificationTime data class                                              +9/-0      NotificationDate.kt Create NotificationDate data class                                              +8/-0      DateUseCase.kt Create DateUseCase class                                                                  +7/-0      modules_designsystem_arrays.xml Add notification related string arrays                                      +28/-0    strings.xml Add no search result string                                                            +4/-0      strings.xml Add no search result string                                                            +4/-0      strings.xml Add no search result string                                                            +4/-0      strings.xml Add no search result string                                                            +4/-0
Bug fix	15 files NotePadRepository.kt Update NotePadRepository to handle MainData type                  +27/-4    UserPreferencesRepository.kt Update UserPreferencesRepository to handle MainData type  +3/-9      MainState.kt Update MainState to handle MainData type                                  +3/-10    FakeNotePadRepository.kt Update FakeNotePadRepository to handle MainData type          +3/-3      OfflineFirstUserDataRepository.kt Update OfflineFirstUserDataRepository to handle MainData type +2/-1      FakeUserDataRepository.kt Update FakeUserDataRepository to handle MainData type        +2/-1      INotePadRepository.kt Update INotePadRepository to handle MainData type                +3/-2      TestNotePadRepository.kt Update TestNotePadRepository to handle MainData type          +2/-2      MainActivityViewModel.kt Update MainActivityViewModel to handle MainData type          +2/-1      UserDataRepository.kt Update UserDataRepository to handle MainData type                +2/-1      NotepadDao.kt Update NotepadDao to handle MainData type                                +5/-1      SharedActivityViewModel.kt Update SharedActivityViewModel to handle MainData type      +1/-1      TestUserDataRepository.kt Update TestUserDataRepository to handle MainData type        +1/-1      LabelViewModel.kt Update LabelViewModel to handle MainData type                        +1/-1      NoteApp.kt Update NoteApp to handle MainData type                                      +1/-1
Dependencies	3 files AndroidFeatureConventionPlugin.kt Add :modules:domain dependency to AndroidFeatureConventionPlugin +1/-0      build.gradle.kts Add dependencies for modules:data and modules:model            +7/-0      build.gradle.kts Add kotlinx-datetime dependency                                                    +3/-0
Additional files	1 files NewDialog.kt +0/-256

---

Need help?

Type /help how to ... in the comments thread for any questions about PR-Agent usage.

Check out the documentation for more information.

[github-actions]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 5 🔵🔵🔵🔵🔵

🧪 No relevant tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Code Complexity The NotificationDialogNew function and its related composables are quite extensive and could benefit from refactoring to improve readability and maintainability. Consider breaking down the large functions into smaller, more focused ones. @OptIn(ExperimentalMaterial3Api::class) @Composable fun NotificationDialogNew( notificationUiState: NotificationUiState, isEdit: Boolean = false, showDialog: Boolean = false, onDismissRequest: () -> Unit = {}, onSetAlarm: () -> Unit = { }, onDeleteAlarm: () -> Unit = {}, ) { var showDateDialog by remember { mutableStateOf(false) } var showTimeDialog by remember { mutableStateOf(false) } var isError by remember { mutableStateOf(false) } if (showDialog) { AlertDialog( onDismissRequest = onDismissRequest, title = { Text(text = if (isEdit) "Edit Reminder" else "Add Reminder") }, text = { }, confirmButton = { Button( onClick = { onSetAlarm() onDismissRequest() }, enabled = !isError, ) { Text(text = "Save") } }, dismissButton = { Row { if (isEdit) { TextButton( onClick = { onDismissRequest() onDeleteAlarm() }, ) { Text(text = "Delete") } Spacer(modifier = Modifier.width(8.dp)) } TextButton(onClick = { onDismissRequest() }) { Text(text = "Cancel") } } }, ) if (showDateDialog) { val dateState = rememberDatePickerState() DatePickerDialog( onDismissRequest = { showDateDialog = false }, confirmButton = { Button( onClick = { showDateDialog = false }, ) { Text(text = "Set date") } }, dismissButton = { TextButton( onClick = { showDateDialog = false }, ) { Text(text = "Cancel") } }, ) { DatePicker( state = dateState, // dateValidator = { it > (System.currentTimeMillis() - (48 * 60 * 60 * 1000)) } ) } } if (showTimeDialog) { val timeState = rememberTimePickerState() DatePickerDialog( onDismissRequest = onDismissRequest, confirmButton = { Button( onClick = { showTimeDialog = false }, ) { Text(text = "Set time") } }, dismissButton = { TextButton( onClick = { showTimeDialog = false }, ) { Text(text = "Cancel") } }, ) { TimePicker(state = timeState) } } } } @SuppressLint("NewApi") @OptIn(ExperimentalMaterial3Api::class) @Preview @Composable fun NotificationDialogNewPreview() { val notificationUiState = NotificationUiState( currentTime = LocalTime(10, 30), currentDate = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date, currentInterval = NotificationInterval.Daily( interval = 1, intervalEnd = IntervalEnd.Forever, ), currentPlace = NotificationPlace.Home, times = listOf( NotificationTime(LocalTime(9, 0), false, true), NotificationTime(LocalTime(12, 0), false, true), NotificationTime(LocalTime(15, 0), false, true), NotificationTime(LocalTime(18, 0), false, true), NotificationTime(LocalTime(0, 0), true, true), ), dates = listOf( NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 0), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 1), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 7), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date, true, ), ), intervals = listOf( NotificationInterval.DoNotRepeat, NotificationInterval.Daily(1, IntervalEnd.Forever), NotificationInterval.Weekly(1, emptyList(), IntervalEnd.Forever), NotificationInterval.Monthly(1, true, IntervalEnd.Forever), NotificationInterval.Yearly(1, IntervalEnd.Forever), NotificationInterval.Custom, ), places = listOf( NotificationPlace.Home, NotificationPlace.Work, NotificationPlace.School, ), ) NotificationDialogNew(notificationUiState = notificationUiState, showDialog = true) } @Composable private fun NotificationContent( modifier: Modifier = Modifier, notificationUiState: NotificationUiState, ) { val pagerState = rememberPagerState { 2 } Column(modifier.fillMaxSize()) { NoteTabRow(pagerState.currentPage) { NoteTab(pagerState.currentPage == 0, onClick = {}) { Text(text = "Time") } NoteTab(pagerState.currentPage == 1, onClick = {}) { Text(text = "Place") } } HorizontalPager(modifier = Modifier.fillMaxSize().weight(1f), state = pagerState) { when (it) { 0 -> { Column( Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp), ) { TimeTextDropbox( modifier = Modifier.fillMaxWidth(), currentTime = notificationUiState.currentTime, onValueChange = { }, times = notificationUiState.times, ) DateTextDropbox( modifier = Modifier.fillMaxWidth(), currentDate = notificationUiState.currentDate, onValueChange = { }, dates = notificationUiState.dates, ) IntervalTextDropbox( modifier = Modifier.fillMaxWidth(), currentInterval = notificationUiState.currentInterval, onValueChange = { }, notificationIntervals = notificationUiState.intervals, ) } } 1 -> { NotificationPlace( places = notificationUiState.places, onValueChange = { }, currentPlace = notificationUiState.currentPlace, ) } } } } } @Preview(backgroundColor = 0xFF968F8F) @Composable fun NotificationContentPreview() { val notificationUiState = NotificationUiState( currentTime = LocalTime(10, 30), currentDate = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date, currentInterval = NotificationInterval.Daily( interval = 1, intervalEnd = IntervalEnd.Forever, ), currentPlace = NotificationPlace.Home, times = listOf( NotificationTime(LocalTime(9, 0), false, true), NotificationTime(LocalTime(12, 0), false, true), NotificationTime(LocalTime(15, 0), false, true), NotificationTime(LocalTime(18, 0), false, true), NotificationTime(LocalTime(0, 0), true, true), ), dates = listOf( NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 0), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 1), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date.plus( DatePeriod(days = 7), ), false, ), NotificationDate( Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date, true, ), ), intervals = listOf( NotificationInterval.DoNotRepeat, NotificationInterval.Daily(1, IntervalEnd.Forever), NotificationInterval.Weekly(1, emptyList(), IntervalEnd.Forever), NotificationInterval.Monthly(1, true, IntervalEnd.Forever), NotificationInterval.Yearly(1, IntervalEnd.Forever), NotificationInterval.Custom, ), places = listOf(NotificationPlace.Home, NotificationPlace.Work, NotificationPlace.School), ) NotificationContent(notificationUiState = notificationUiState) } @Composable fun NotificationPlace( modifier: Modifier = Modifier, places: List<NotificationPlace> = emptyList(), onValueChange: (NotificationPlace) -> Unit = {}, currentPlace: NotificationPlace? = null, ) { val placeStringArray = stringArrayResource(R.array.modules_designsystem_notification_places) Column(modifier = modifier) { places.forEachIndexed { index, place -> if (place !is NotificationPlace.Edit) { Row { RadioButton(selected = place == currentPlace, onClick = {}) Text(text = placeStringArray[index]) } } else { Row { RadioButton(selected = place == currentPlace, onClick = { }) TextField( state = rememberTextFieldState(), ) } } } } } @OptIn(ExperimentalMaterial3Api::class) @Composable fun TimeTextDropbox( modifier: Modifier = Modifier, currentTime: LocalTime, onValueChange: (NotificationTime) -> Unit = {}, times: List<NotificationTime> = emptyList(), ) { var expanded by remember { mutableStateOf(false) } var showError by remember { mutableStateOf(false) } val state = rememberTextFieldState() LaunchedEffect(key1 = currentTime) { state.clearText() state.edit { append("${currentTime.hour}:${currentTime.minute} ") append(if (currentTime.hour < 12) "AM" else "PM") } val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()) showError = currentTime <= now.time } val timeStringArray = stringArrayResource(R.array.modules_designsystem_notification_times) ExposedDropdownMenuBox( modifier = modifier, expanded = expanded, onExpandedChange = { expanded = !expanded }, ) { TextField( modifier = Modifier.fillMaxWidth().menuAnchor(ExposedDropdownMenuAnchorType.SecondaryEditable, true), readOnly = true, state = state, supportingText = { if (showError) Text(text = "Time as past") }, isError = showError, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, colors = ExposedDropdownMenuDefaults.textFieldColors(), lineLimits = TextFieldLineLimits.SingleLine, ) ExposedDropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, ) { times.forEachIndexed { index, notificationTime -> DropdownMenuItem( text = { Text(text = timeStringArray[index]) }, onClick = { onValueChange(notificationTime) expanded = false }, enabled = notificationTime.isEnable, trailingIcon = { Text( text = if (notificationTime.isPickTime) { "" } else { "${notificationTime.time.hour}:${notificationTime.time.minute} " + if (notificationTime.time.hour < 12) "AM" else "PM" }, ) }, ) } } } } @Preview @Composable fun TimeTextDropboxPreview() { val currentTime = LocalTime(10, 30) val times = listOf( NotificationTime(LocalTime(9, 0), false, true), NotificationTime(LocalTime(12, 0), false, true), NotificationTime(LocalTime(15, 0), false, true), NotificationTime(LocalTime(18, 0), false, true), NotificationTime(LocalTime(0, 0), true, true), ) TimeTextDropbox(currentTime = currentTime, times = times) } @OptIn(ExperimentalMaterial3Api::class) @Composable fun DateTextDropbox( modifier: Modifier = Modifier, currentDate: LocalDate, onValueChange: (NotificationDate) -> Unit = {}, dates: List<NotificationDate> = emptyList(), ) { var expanded by remember { mutableStateOf(false) } val state = rememberTextFieldState() LaunchedEffect(key1 = currentDate) { state.clearText() state.edit { append("${currentDate.month.name} ${currentDate.dayOfMonth}") val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()) if (currentDate.year != now.year) { append(", ${currentDate.year}") } } } val dateStringArray = stringArrayResource(R.array.modules_designsystem_notification_days) ExposedDropdownMenuBox( modifier = modifier, expanded = expanded, onExpandedChange = { expanded = !expanded }, ) { TextField( modifier = Modifier.fillMaxWidth().menuAnchor(ExposedDropdownMenuAnchorType.SecondaryEditable, true), readOnly = true, state = state, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, colors = ExposedDropdownMenuDefaults.textFieldColors(), lineLimits = TextFieldLineLimits.SingleLine, ) ExposedDropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, ) { dates.forEachIndexed { index, notificationTime -> DropdownMenuItem( text = { Text(text = dateStringArray[index]) }, onClick = { onValueChange(notificationTime) expanded = false }, ) } } } } @Preview @Composable fun DateTextDropboxPreview() { val currentTime = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date val dates = listOf( NotificationDate(currentTime.plus(DatePeriod(days = 0)), false), NotificationDate(currentTime.plus(DatePeriod(days = 1)), false), NotificationDate(currentTime.plus(DatePeriod(days = 7)), false), NotificationDate(currentTime, true), ) DateTextDropbox( currentDate = currentTime, dates = dates, ) } @Preview @Composable fun IntervalTextDropboxPreview() { val currentInterval = NotificationInterval.Daily( interval = 1, intervalEnd = IntervalEnd.Forever, ) val notificationIntervals = listOf( NotificationInterval.DoNotRepeat, NotificationInterval.Daily(1, IntervalEnd.Forever), NotificationInterval.Weekly(1, emptyList(), IntervalEnd.Forever), NotificationInterval.Monthly(1, true, IntervalEnd.Forever), NotificationInterval.Yearly(1, IntervalEnd.Forever), NotificationInterval.Custom, ) IntervalTextDropbox( currentInterval = currentInterval, notificationIntervals = notificationIntervals, ) } @OptIn(ExperimentalMaterial3Api::class) @Composable fun IntervalTextDropbox( modifier: Modifier = Modifier, currentInterval: NotificationInterval, onValueChange: (NotificationInterval) -> Unit = {}, notificationIntervals: List<NotificationInterval> = emptyList(), ) { var expanded by remember { mutableStateOf(false) } val state = rememberTextFieldState() LaunchedEffect(key1 = currentInterval) { state.clearText() state.edit { } } val intervalStringArray = stringArrayResource( R.array.modules_designsystem_notification_interval, ) ExposedDropdownMenuBox( modifier = modifier, expanded = expanded, onExpandedChange = { expanded = !expanded }, ) { TextField( modifier = Modifier.fillMaxWidth().menuAnchor(ExposedDropdownMenuAnchorType.SecondaryEditable, true), readOnly = true, state = state, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, colors = ExposedDropdownMenuDefaults.textFieldColors(), lineLimits = TextFieldLineLimits.SingleLine, ) ExposedDropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, ) { notificationIntervals.forEachIndexed { index, notificationTime -> DropdownMenuItem( text = { Text(text = intervalStringArray[index]) }, onClick = { onValueChange(notificationTime) expanded = false }, ) } } } } State Management The MainViewModel uses a complex combination of flows and state updates. Review the logic carefully to ensure correctness and efficiency. Consider simplifying the state management if possible. private val alarmManager: IAlarmManager, userDataRepository: UserDataRepository, ) : ViewModel() { private val _dateTimeState = MutableStateFlow(DateDialogUiData()) val dateTimeState = _dateTimeState.asStateFlow() private lateinit var currentDateTime: LocalDateTime private lateinit var today: LocalDateTime private val timeListDefault = mutableListOf( LocalTime(7, 0, 0), LocalTime(13, 0, 0), LocalTime(19, 0, 0), LocalTime(20, 0, 0), LocalTime(20, 0, 0), ) @OptIn(ExperimentalMaterial3Api::class) var datePicker: DatePickerState = DatePickerState( initialSelectedDateMillis = System.currentTimeMillis(), locale = Locale.getDefault(), ) @OptIn(ExperimentalMaterial3Api::class) var timePicker: TimePickerState = TimePickerState(12, 4, is24Hour = false) private lateinit var currentLocalDate: LocalDate private val setOfSelected = MutableStateFlow<Set<Long>>(setOf()) private val currentNotepads = userDataRepository .userData .mapLatest { it.mainData } .flatMapLatest { notepadRepository.getNotePadsWithMainData(it) } val mainState = combine( currentNotepads, userDataRepository.userData.mapLatest { it.mainData }, setOfSelected, ) { notepad, mainData, setOfSelected -> MainState.Success( notePads = notepad, mainData = mainData, setOfSelected = setOfSelected, ) }.stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), initialValue = MainState.Loading, ) val searchQuery = TextFieldState() private val searchTriple = MutableStateFlow< Triple< List<SearchSort.Type>, List<SearchSort.Color>, List<SearchSort.Label>, >, >(Triple(emptyList(), emptyList(), emptyList())) private val searchSort = MutableStateFlow<SearchSort?>(null) private var isTextAfterSearchSort = false val searchState = combine( snapshotFlow { searchQuery.text } .debounce(200), notepadRepository.getNotePads(), searchTriple, searchSort, ) { query, notepads, triple, searchSort -> val old = SearchState.Success( searches = notepads, types = triple.first, color = triple.second, label = triple.third, searchSort = searchSort, ) val searchList = onSearch(old) SearchState.Success( searches = searchList, types = triple.first, color = triple.second, label = triple.third, searchSort = searchSort, ) } .stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(), initialValue = SearchState.Loading, ) private fun onSearch(mainState: SearchState.Success): List<NotePad> { return when { mainState.searchSort != null -> { var list = when (val searchSort = mainState.searchSort) { is SearchSort.Color -> { mainState.searches.filter { it.color == searchSort.colorIndex } } is SearchSort.Label -> { mainState.searches.filter { it.labels.any { it.id == searchSort.id } } } is SearchSort.Type -> { when (searchSort.index) { 0 -> mainState.searches.filter { it.reminder > 0 } 1 -> mainState.searches.filter { it.isCheck } 2 -> mainState.searches.filter { it.images.isNotEmpty() } 3 -> mainState.searches.filter { it.voices.isNotEmpty() } 4 -> mainState.searches.filter { it.images.any { it.isDrawing } } 5 -> mainState.searches.filter { it.uris.isNotEmpty() } else -> mainState.searches } } null -> TODO() } if (searchQuery.text.isNotBlank()) { isTextAfterSearchSort = true list = list.filter { it.toString().contains( searchQuery.text, true, ) } } if (isTextAfterSearchSort && searchQuery.text.isBlank()) { isTextAfterSearchSort = false onSetSearch(null) } list } searchQuery.text.isNotBlank() -> { val list = mainState.searches.filter { it.toString().contains(searchQuery.text, true) } list } else -> emptyList() } } UI Complexity The NewTopMainAppBar composable is very large and combines multiple UI elements. Consider separating the search bar and top app bar into distinct composables for better organization and reusability. @OptIn(ExperimentalMaterial3Api::class) @Composable fun MainTopAppBar( isGrid: Boolean = false, navigateToSearch: () -> Unit = {}, onNavigate: () -> Unit = {}, scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(), onToggleGrid: () -> Unit = {}, ) { TopAppBar( modifier = Modifier, title = { Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .clickable { navigateToSearch() } .fillMaxWidth() .padding(4.dp) .padding(end = 16.dp) .clip( RoundedCornerShape( topEnd = 50f, topStart = 50f, bottomEnd = 50f, bottomStart = 50f, ), ) .background(MaterialTheme.colorScheme.secondaryContainer), ) { IconButton(onClick = onNavigate) { Icon( imageVector = NoteIcon.Menu, contentDescription = "menu", ) } Text( modifier = Modifier.weight(1f), text = stringResource(Rd.string.modules_designsystem_search_note), style = MaterialTheme.typography.titleMedium, textAlign = TextAlign.Center, ) IconButton(onClick = { onToggleGrid() }) { if (!isGrid) { Icon(imageVector = NoteIcon.GridView, contentDescription = "grid") } else { Icon(imageVector = NoteIcon.ViewAgenda, contentDescription = "column") } } } }, scrollBehavior = scrollBehavior, colors = TopAppBarDefaults.topAppBarColors( containerColor = Color.Transparent, scrolledContainerColor = Color.Transparent, ), ) } @OptIn(ExperimentalMaterial3Api::class, ExperimentalSharedTransitionApi::class) @Composable fun NewTopMainAppBar( modifier: Modifier = Modifier, sharedTransitionScope: SharedTransitionScope, animatedContentScope: AnimatedVisibilityScope, searchQuery: TextFieldState = rememberTextFieldState(), searchState: SearchState = SearchState.Loading, isGrid: Boolean = false, scrollBehavior: SearchBarScrollBehavior? = null, onNavigateIcon: () -> Unit = {}, onToggleGrid: () -> Unit = {}, onSetSearch: (SearchSort?) -> Unit = {}, onNoteClick: (Long) -> Unit = {}, onExpandSearch: (Boolean) -> Unit = {}, ) { val searchBarState = rememberSearchBarState(initialValue = SearchBarValue.Collapsed) val scope = rememberCoroutineScope() LaunchedEffect(key1 = searchBarState.currentValue) { onExpandSearch(searchBarState.currentValue == SearchBarValue.Expanded) } val inputField = @Composable { SearchBarDefaults.InputField( modifier = Modifier, searchBarState = searchBarState, textFieldState = searchQuery, onSearch = { scope.launch { searchBarState.animateToCollapsed() } }, placeholder = { Text(stringResource(Rd.string.modules_designsystem_search_note)) }, leadingIcon = { if (searchBarState.currentValue == SearchBarValue.Expanded) { IconButton( onClick = { scope.launch { searchBarState.animateToCollapsed() } }, ) { Icon(NoteIcon.ArrowBack, contentDescription = "Back") } } else { IconButton( onClick = onNavigateIcon, ) { Icon(NoteIcon.Menu, contentDescription = "menu") } } }, trailingIcon = { if (searchBarState.currentValue == SearchBarValue.Expanded) { IconButton( onClick = { searchQuery.clearText() }, ) { Icon(NoteIcon.Clear, contentDescription = "clear") } } else { IconButton(onClick = { onToggleGrid() }) { if (!isGrid) { Icon(imageVector = NoteIcon.GridView, contentDescription = "grid") } else { Icon( imageVector = NoteIcon.ViewAgenda, contentDescription = "column", ) } } } }, ) } TopSearchBar( modifier = modifier, state = searchBarState, inputField = inputField, scrollBehavior = scrollBehavior, ) ExpandedFullScreenSearchBar( state = searchBarState, inputField = inputField, ) { when (searchState) { is SearchState.Loading -> { Box( Modifier.fillMaxSize(), contentAlignment = Alignment.Center, ) { NoteLoadingWheel("") } } is SearchState.Success -> { LazyVerticalStaggeredGrid( modifier = Modifier .padding(16.dp), columns = StaggeredGridCells.Fixed(if (isGrid) 2 else 1), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalItemSpacing = 8.dp, ) { if (searchQuery.text.isNotBlank() && searchState.searches.isEmpty()) { item(span = StaggeredGridItemSpan.FullLine) { Column( Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, ) { Icon(imageVector = NoteIcon.Search, contentDescription = "search") Text(text = stringResource(Rd.string.modules_designsystem_no_result)) } } } if (searchState.searches.isEmpty() && searchQuery.text.isBlank()) { if (searchState.types.isNotEmpty()) { item(span = StaggeredGridItemSpan.FullLine) { LabelBox( title = stringResource(Rd.string.modules_designsystem_types), searchState.types, onItemClick = onSetSearch, ) } } if (searchState.label.isNotEmpty()) { item(span = StaggeredGridItemSpan.FullLine) { LabelBox( title = stringResource(Rd.string.modules_designsystem_labels), searchState.label, onItemClick = onSetSearch, ) } } if (searchState.color.isNotEmpty()) { item(span = StaggeredGridItemSpan.FullLine) { Text(text = stringResource(Rd.string.modules_designsystem_colors)) } item(span = StaggeredGridItemSpan.FullLine) { FlowRow( verticalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(4.dp), ) { searchState.color.forEach { color -> Surface( onClick = { onSetSearch(color) }, shape = CircleShape, color = if (color.colorIndex == -1) Color.White else NoteIcon.noteColors[color.colorIndex], modifier = Modifier .width(40.dp) .aspectRatio(1f), ) { if (color.colorIndex == -1) { Icon( imageVector = NoteIcon.FormatColorReset, contentDescription = "done", tint = Color.Gray, modifier = Modifier.padding(4.dp), ) } } } } } } } noteItems( modifier = Modifier, sharedTransitionScope = sharedTransitionScope, animatedContentScope = animatedContentScope, items = searchState.searches, onNoteClick = onNoteClick, onSelectedCard = {}, setOfSelected = emptySet(), sharedName = "search", ) } } } // SearchResults( // onResultClick = { // result - & gt; // textFieldState.setTextAndPlaceCursorAtEnd(result) // scope.launch { searchBarState.animateToCollapsed() } // } // ) }

[github-actions]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
Possible issue	Handle null userData safely The code handles the case where uiState is not MainActivityUiState.Success by providing a default MainData(). However, this might lead to unexpected behavior if userData is null. Add a null check for userData to prevent potential NullPointerExceptions. Consider providing a more informative default value or handling the null case explicitly. app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt [104-105] -currentMainArg = (uiState as? MainActivityUiState.Success) - ?.userData?.mainData ?: MainData(), +currentMainArg = (uiState as? MainActivityUiState.Success)?.userData?.mainData ?: MainData(NoteType.NOTE), Suggestion importance[1-10]: 8 __ Why: The suggestion addresses a potential NullPointerException by explicitly handling the case where userData might be null. Adding a null check and providing a default value improves the code's robustness and prevents unexpected crashes.	Medium
	Add missing dialog content The NotificationDialogNew function lacks a crucial text parameter in the AlertDialog composable. This parameter is essential for displaying content within the dialog. Add a text parameter to display relevant information to the user. Consider using a NotificationContent composable to manage the dialog's body. modules/ui/src/main/kotlin/com/mshdabiola/ui/NoteficationDialog.kt [85-86] + @SuppressLint("NewApi") + @OptIn(ExperimentalMaterial3Api::class) + @Composable + fun NotificationDialogNew( + notificationUiState: NotificationUiState, + isEdit: Boolean = false, + showDialog: Boolean = false, + onDismissRequest: () -> Unit = {}, + onSetAlarm: () -> Unit = { }, + onDeleteAlarm: () -> Unit = {}, + + ) { + var showDateDialog by remember { + mutableStateOf(false) + } + var showTimeDialog by remember { + mutableStateOf(false) + } + var isError by remember { + mutableStateOf(false) + } + + if (showDialog) { + AlertDialog( + onDismissRequest = onDismissRequest, + title = { Text(text = if (isEdit) "Edit Reminder" else "Add Reminder") }, -+ text = { -+ }, ++ text = { NotificationContent(notificationUiState = notificationUiState) }, + confirmButton = { + Button( + onClick = { + onSetAlarm() + onDismissRequest() + }, + enabled = !isError, + ) { + Text(text = "Save") + } + }, + dismissButton = { + Row { + if (isEdit) { + TextButton( + onClick = { + onDismissRequest() + onDeleteAlarm() + }, + ) { + Text(text = "Delete") + } + Spacer(modifier = Modifier.width(8.dp)) + } -+ TextButton(onClick = { onDismissRequest() }) { -+ Text(text = "Cancel") -+ } -+ } -+ }, -+ ) -+ if (showDateDialog) { -+ val dateState = rememberDatePickerState() -+ -+ DatePickerDialog( -+ onDismissRequest = { -+ showDateDialog = false -+ }, -+ confirmButton = { -+ Button( -+ onClick = { -+ showDateDialog = false -+ }, -+ ) { -+ Text(text = "Set date") ++ TextButton(onClick = { onDismissRequest() }) { ++ Text(text = "Cancel") ++ } + } + }, -+ dismissButton = { -+ TextButton( -+ onClick = { -+ showDateDialog = false -+ }, -+ ) { -+ Text(text = "Cancel") -+ } -+ }, -+ ) { -+ DatePicker( -+ state = dateState, -+ // dateValidator = { it > (System.currentTimeMillis() - (48 * 60 * 60 * 1000)) } -+ ) ++ ) ++ if (showDateDialog) { ++ val dateState = rememberDatePickerState() ++ ++ DatePickerDialog( ++ onDismissRequest = { ++ showDateDialog = false ++ }, ++ confirmButton = { ++ Button( ++ onClick = { ++ showDateDialog = false ++ }, ++ ) { ++ Text(text = "Set date") ++ } ++ }, ++ dismissButton = { ++ TextButton( ++ onClick = { ++ showDateDialog = false ++ }, ++ ) { ++ Text(text = "Cancel") ++ } ++ }, ++ ) { ++ DatePicker( ++ state = dateState, ++ // dateValidator = { it > (System.currentTimeMillis() - (48 * 60 * 60 * 1000)) } ++ ) ++ } + } -+ } -+ if (showTimeDialog) { -+ val timeState = rememberTimePickerState() -+ DatePickerDialog( -+ onDismissRequest = onDismissRequest, -+ confirmButton = { -+ Button( -+ onClick = { -+ showTimeDialog = false -+ }, -+ ) { -+ Text(text = "Set time") -+ } -+ }, -+ dismissButton = { -+ TextButton( -+ onClick = { -+ showTimeDialog = false -+ }, -+ ) { -+ Text(text = "Cancel") -+ } -+ }, -+ ) { -+ TimePicker(state = timeState) ++ if (showTimeDialog) { ++ val timeState = rememberTimePickerState() ++ DatePickerDialog( ++ onDismissRequest = onDismissRequest, ++ confirmButton = { ++ Button( ++ onClick = { ++ showTimeDialog = false ++ }, ++ ) { ++ Text(text = "Set time") ++ } ++ }, ++ dismissButton = { ++ TextButton( ++ onClick = { ++ showTimeDialog = false ++ }, ++ ) { ++ Text(text = "Cancel") ++ } ++ }, ++ ) { ++ TimePicker(state = timeState) ++ } + } + } + } ++ ++@Composable ++private fun NotificationContent( ++ modifier: Modifier = Modifier, ++ notificationUiState: NotificationUiState, ++) { ++ // Add your content here +} Suggestion importance[1-10]: 7 __ Why: The suggestion correctly points out a missing text parameter in the AlertDialog. Adding a text parameter with relevant content significantly improves the user experience. The use of a separate NotificationContent composable for managing the dialog body is a good practice for maintainability.	Medium
General	Refactor MainData to use enum The MainData class uses a Long to represent different note types. This is less readable and maintainable than using an enum. Consider refactoring MainData to directly use the NoteType enum, removing the need for the when statement. This improves code clarity and reduces potential errors from incorrect index values. modules/model/src/main/java/com/mshdabiola/model/MainData.kt [3-11] -data class MainData(val index: Long = NoteType.NOTE.index) { - val noteType: NoteType - get() = when (index) { - -1L -> NoteType.NOTE - -2L -> NoteType.ARCHIVE - -3L -> NoteType.TRASH - -4L -> NoteType.REMAINDER - else -> NoteType.LABEL - } -} +data class MainData(val noteType: NoteType = NoteType.NOTE) Suggestion importance[1-10]: 7 __ Why: The suggestion improves code readability and maintainability by replacing the less readable Long-based approach with a more direct use of the NoteType enum. This simplifies the code and reduces the risk of errors from incorrect index values.	Medium

[gemini-code-assist]

Code Review

The pull request refactors the notification dialog, updates MainData to a data class, improves the main screen UI, and updates repositories and view models to handle the new MainData type. The changes look good overall, with some minor suggestions for improved code readability.

[mshdabiola]

@gemini-code-assist how to improve the code

[gemini-code-assist]

Hi @mshdabiola,

Thanks for reaching out! To improve the code in this pull request, I recommend focusing on the key areas identified in the initial review:

• Code Complexity: The NotificationDialogNew function and its related composables are quite extensive. Breaking them down into smaller, more focused functions will significantly improve readability and maintainability.
• State Management: The MainViewModel uses a complex combination of flows and state updates. Simplifying this logic where possible will enhance correctness and efficiency.
• UI Complexity: The NewTopMainAppBar composable is very large. Separating the search bar and top app bar into distinct composables would lead to better organization and reusability.

In addition to these high-level points, please review the specific code suggestions provided earlier in the PR comments. Addressing these will offer concrete improvements:

• Handle null userData safely: This prevents potential NullPointerExceptions and makes the code more robust.
• Add missing dialog content: Ensure NotificationDialogNew displays relevant information to the user.
• Refactor MainData to use enum: This improves code clarity and reduces potential errors.

Addressing these points will lead to a more maintainable, readable, and robust codebase. Let me know if you have any specific questions as you work through these improvements!