-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: implement search screen ui * feat: add searchScreen navGraph to KaigiNavHost * refactor: rename searchScreen navGraph * spotless fix * fix: TimetableScreenRobot * test: add screenshot test of navigation to search screen * refactor: replace string literal of filter chip with SessionsStrings * refactor: replace string literal of result not found message * refactor: add getDropDownText in DroidKaigi2023Day * fix: updated date * Revert "fix: updated date" This reverts commit 1290520.
- Loading branch information
1 parent
7ff3a4e
commit bdbe2da
Showing
14 changed files
with
682 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
feature/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/SearchScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package io.github.droidkaigi.confsched2023.sessions | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Divider | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import androidx.navigation.NavController | ||
| import androidx.navigation.NavGraphBuilder | ||
| import androidx.navigation.compose.composable | ||
| import io.github.droidkaigi.confsched2023.model.DroidKaigi2023Day | ||
| import io.github.droidkaigi.confsched2023.model.TimetableCategory | ||
| import io.github.droidkaigi.confsched2023.sessions.component.EmptySearchResultBody | ||
| import io.github.droidkaigi.confsched2023.sessions.component.SearchFilter | ||
| import io.github.droidkaigi.confsched2023.sessions.component.SearchFilterUiState | ||
| import io.github.droidkaigi.confsched2023.sessions.component.SearchTextFieldAppBar | ||
|
|
||
| const val searchScreenRoute = "search" | ||
| const val SearchScreenTestTag = "SearchScreen" | ||
|
|
||
| fun NavGraphBuilder.searchScreen(onNavigationIconClick: () -> Unit) { | ||
| composable(searchScreenRoute) { | ||
| SearchScreen( | ||
| onBackClick = onNavigationIconClick, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| fun NavController.navigateSearchScreen() { | ||
| navigate(searchScreenRoute) | ||
| } | ||
|
|
||
| @Composable | ||
| fun SearchScreen( | ||
| onBackClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| viewModel: SearchScreenViewModel = hiltViewModel(), | ||
| ) { | ||
| val uiState by viewModel.uiState.collectAsState() | ||
|
|
||
| SearchScreen( | ||
| modifier = modifier, | ||
| onBackClick = onBackClick, | ||
| searchQuery = uiState.searchQuery, | ||
| onSearchQueryChanged = viewModel::onSearchQueryChanged, | ||
| searchFilterUiState = uiState.searchFilterUiState, | ||
| onDaySelected = viewModel::onDaySelected, | ||
| onFilterCategoryChipClicked = viewModel::onFilterCategoryChipClicked, | ||
| onCategoriesSelected = viewModel::onCategoriesSelected, | ||
| ) | ||
| } | ||
|
|
||
| data class SearchScreenUiState( | ||
| val searchQuery: String, | ||
| val searchFilterUiState: SearchFilterUiState, | ||
| ) | ||
|
|
||
| @Composable | ||
| private fun SearchScreen( | ||
| searchFilterUiState: SearchFilterUiState, | ||
| modifier: Modifier = Modifier, | ||
| onBackClick: () -> Unit = {}, | ||
| searchQuery: String = "", | ||
| onSearchQueryChanged: (String) -> Unit = {}, | ||
| onDaySelected: (DroidKaigi2023Day, Boolean) -> Unit = { _, _ -> }, | ||
| onFilterCategoryChipClicked: () -> Unit = {}, | ||
| onCategoriesSelected: (TimetableCategory, Boolean) -> Unit = { _, _ -> }, | ||
| ) { | ||
| Scaffold( | ||
| modifier = modifier.testTag(SearchScreenTestTag), | ||
| topBar = { | ||
| SearchTextFieldAppBar( | ||
| searchQuery = searchQuery, | ||
| onSearchQueryChanged = onSearchQueryChanged, | ||
| onBackClick = onBackClick, | ||
| ) | ||
| }, | ||
| ) { innerPadding -> | ||
| Column( | ||
| modifier = Modifier.padding(innerPadding), | ||
| ) { | ||
| Divider( | ||
| thickness = 1.dp, | ||
| color = MaterialTheme.colorScheme.outline, | ||
| ) | ||
| SearchFilter( | ||
| searchFilterUiState = searchFilterUiState, | ||
| onDaySelected = onDaySelected, | ||
| onFilterCategoryChipClicked = onFilterCategoryChipClicked, | ||
| onCategoriesSelected = onCategoriesSelected, | ||
| ) | ||
| EmptySearchResultBody() | ||
| } | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
...ssions/src/main/java/io/github/droidkaigi/confsched2023/sessions/SearchScreenViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package io.github.droidkaigi.confsched2023.sessions | ||
|
|
||
| import androidx.lifecycle.SavedStateHandle | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import io.github.droidkaigi.confsched2023.model.DroidKaigi2023Day | ||
| import io.github.droidkaigi.confsched2023.model.TimetableCategory | ||
| import io.github.droidkaigi.confsched2023.sessions.component.SearchFilterUiState | ||
| import io.github.droidkaigi.confsched2023.ui.buildUiState | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| const val SEARCH_QUERY = "searchQuery" | ||
|
|
||
| @HiltViewModel | ||
| class SearchScreenViewModel @Inject constructor( | ||
| private val savedStateHandle: SavedStateHandle, | ||
| ) : ViewModel() { | ||
| private val searchQuery = savedStateHandle.getStateFlow(SEARCH_QUERY, "") | ||
|
|
||
| private val searchFilterUiState: MutableStateFlow<SearchFilterUiState> = MutableStateFlow( | ||
| SearchFilterUiState(), | ||
| ) | ||
|
|
||
| val uiState: StateFlow<SearchScreenUiState> = buildUiState( | ||
| searchQuery, | ||
| searchFilterUiState, | ||
| ) { searchQuery, searchFilterUiState -> | ||
| SearchScreenUiState( | ||
| searchQuery = searchQuery, | ||
| searchFilterUiState = searchFilterUiState, | ||
| ) | ||
| } | ||
|
|
||
| fun onSearchQueryChanged(searchQuery: String) { | ||
| savedStateHandle[SEARCH_QUERY] = searchQuery | ||
| } | ||
|
|
||
| fun onDaySelected(day: DroidKaigi2023Day, isSelected: Boolean) { | ||
| val selectedDays = searchFilterUiState.value.selectedDays.toMutableList() | ||
| searchFilterUiState.value = searchFilterUiState.value.copy( | ||
| selectedDays = selectedDays.apply { | ||
| if (isSelected) { | ||
| add(day) | ||
| } else { | ||
| remove(day) | ||
| } | ||
| }.sortedBy(DroidKaigi2023Day::start), | ||
| ) | ||
| } | ||
|
|
||
| fun onFilterCategoryChipClicked() { | ||
| viewModelScope.launch { | ||
| // TODO: Implement SessionsRepository.getCategories() | ||
| val categories = emptyList<TimetableCategory>() | ||
| if (categories.isEmpty()) { | ||
| return@launch | ||
| } | ||
|
|
||
| searchFilterUiState.value = SearchFilterUiState( | ||
| categories = categories, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| fun onCategoriesSelected(category: TimetableCategory, isSelected: Boolean) { | ||
| val selectedCategories = searchFilterUiState.value.selectedCategories.toMutableList() | ||
| searchFilterUiState.value = searchFilterUiState.value.copy( | ||
| selectedCategories = selectedCategories.apply { | ||
| if (isSelected) { | ||
| add(category) | ||
| } else { | ||
| remove(category) | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
.../main/java/io/github/droidkaigi/confsched2023/sessions/component/EmptySearchResultBody.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package io.github.droidkaigi.confsched2023.sessions.component | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.wrapContentSize | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Search | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import io.github.droidkaigi.confsched2023.sessions.strings.SessionsStrings | ||
|
|
||
| @Composable | ||
| fun EmptySearchResultBody( | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Box( | ||
| modifier = modifier.fillMaxSize(), | ||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier.wrapContentSize(), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Icon( | ||
| imageVector = Icons.Default.Search, | ||
| contentDescription = null, | ||
| modifier = Modifier.size(58.dp), | ||
| tint = MaterialTheme.colorScheme.onBackground, | ||
| ) | ||
| Spacer(modifier = Modifier.height(28.dp)) | ||
| Text( | ||
| text = SessionsStrings.SearchResultNotFound.asString(), | ||
| style = MaterialTheme.typography.bodyLarge, | ||
| color = MaterialTheme.colorScheme.onBackground, | ||
| ) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.