Highlights Search Screen UI #90
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,88 @@ | ||
| package com.cornellappdev.score.components.highlights | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| 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.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.score.R | ||
| import com.cornellappdev.score.components.EmptyStateBox | ||
| import com.cornellappdev.score.components.ScorePreview | ||
| import com.cornellappdev.score.model.HighlightData | ||
| import com.cornellappdev.score.theme.Style.bodyNormal | ||
| import com.cornellappdev.score.util.highlightsList | ||
| import com.cornellappdev.score.util.recentSearchList | ||
|
|
||
| @Composable | ||
| fun HighlightsCardLazyColumn( | ||
| recentSearchList: List<String>, | ||
| query: String, | ||
| highlightsList: List<HighlightData>, | ||
| numResultsHeader: (@Composable () -> Unit)? = null | ||
| ) { | ||
| Column( | ||
| modifier = Modifier.padding(horizontal = 24.dp) | ||
| ) { | ||
| if (recentSearchList.isNotEmpty() && query.isEmpty()) { //start state: no search attempted yet | ||
|
Member
There was a problem hiding this comment. Nit: It could be potentially worth considering using something like animatedcontent here to have more control over the transition between recent searches content and the search results |
||
| RecentSearches(recentSearchList) | ||
| } else if (query.isNotEmpty()) { //filtering - will pull this out to the viewmodel when i do that, just here for sanity check rn | ||
| val filteredList = highlightsList.filter { | ||
| it.title.contains(query, ignoreCase = true) | ||
| } | ||
| if (filteredList.isEmpty()) { | ||
| EmptyStateBox( | ||
| icon = R.drawable.ic_kid_star, | ||
| title = "No results yet.", | ||
| ) | ||
| } else { | ||
| numResultsHeader?.invoke() | ||
| LazyColumn( | ||
| verticalArrangement = Arrangement.spacedBy(16.dp) | ||
| ) { | ||
| items(highlightsList) { item -> | ||
| when (item) { | ||
| is HighlightData.Video -> VideoHighlightCard(item.data, true) | ||
| is HighlightData.Article -> ArticleHighlightCard(item.data, true) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* Used to display number of results in on HighlightsSearchScreen*/ | ||
| @Composable | ||
| fun HighlightsCardLazyColumnNumResultsHeader( | ||
|
Member
There was a problem hiding this comment. Nit: probably don't need to abbreviate num or can potentially just remove num |
||
| size: Int | ||
| ) { | ||
| Column { | ||
| Text("$size Results", style = bodyNormal) | ||
| Spacer(Modifier.height(16.dp)) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun HighlightsCardLazyColumnSubScreenPreview() { | ||
| ScorePreview { | ||
| HighlightsCardLazyColumn(recentSearchList, "", highlightsList) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
|
Member
There was a problem hiding this comment. Nit: might be good to have a preview or preview parameter where we can see the highlights list as well instead of just recent searches |
||
| @Composable | ||
| private fun HighlightsCardLazyColumnSearchResultsPreview() { | ||
| ScorePreview { | ||
| HighlightsCardLazyColumn( | ||
| recentSearchList, "", highlightsList, | ||
| { HighlightsCardLazyColumnNumResultsHeader(highlightsList.size) }) | ||
| } | ||
| } | ||
This file contains hidden or 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,97 @@ | ||
| package com.cornellappdev.score.components.highlights | ||
|
|
||
| import androidx.compose.animation.AnimatedVisibility | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| 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.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| 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.focus.onFocusChanged | ||
| import androidx.compose.ui.platform.LocalFocusManager | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.cornellappdev.score.components.ScorePreview | ||
| import com.cornellappdev.score.model.Sport | ||
| import com.cornellappdev.score.theme.Style.bodyMedium | ||
| import com.cornellappdev.score.util.sportList | ||
|
|
||
| @Composable | ||
| fun HighlightsScreenSearchFilterBar( | ||
| sportList: List<Sport> | ||
| ) { | ||
| val focusManager = LocalFocusManager.current | ||
| var isFocused by remember { mutableStateOf(true) } //todo: should probably be handled by viewModel | ||
| Column(modifier = Modifier.fillMaxWidth()) { | ||
| Row( | ||
| modifier = Modifier | ||
| .padding(horizontal = 24.dp) | ||
| .clip(shape = RoundedCornerShape(100.dp)) | ||
| .onFocusChanged { focusState -> | ||
|
Member
There was a problem hiding this comment. Not sure if this ideal to have here or if we can just pass in some sort of onFocus function/logic to the search bar component |
||
| if (focusState.isFocused && !isFocused) { | ||
| /*todo clear the highlight rows and show recent searches*/ | ||
| } | ||
| }, | ||
| horizontalArrangement = Arrangement.spacedBy(12.dp), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| HighlightsSearchBar( | ||
| onSearchClick = { | ||
|
Member
There was a problem hiding this comment. Not sure if this is needed here if we have the focus change detection in the search bar itself? Maybe you can pass in an onFocus function? |
||
| isFocused = true | ||
| }, | ||
| modifier = Modifier | ||
| .weight(1f) | ||
| .onFocusChanged { state -> | ||
|
Member
There was a problem hiding this comment. Not sure if this is necessary if we have the logic in the text field? |
||
| // When the search bar loses focus, hide cancel | ||
| if (!state.isFocused) { | ||
| isFocused = !isFocused | ||
| } | ||
| } | ||
| ) | ||
|
|
||
| AnimatedVisibility( | ||
| isFocused | ||
| ) { | ||
| Text( | ||
| "Cancel", | ||
| style = bodyMedium, | ||
| modifier = Modifier.clickable { | ||
| isFocused = true; | ||
|
|
||
| focusManager.clearFocus(force = true) | ||
| /*todo: clear the text in the search bar*/ | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| HighlightsFilterRow(sportList, {/*todo on filter selected*/ }) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun HighlightsScreenSearchFilterBarActivePreview() { | ||
| ScorePreview { | ||
| HighlightsScreenSearchFilterBar(sportList) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun HighlightsScreenSearchFilterBarInactivePreview() { | ||
| ScorePreview { | ||
| HighlightsScreenSearchFilterBar(sportList) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.