Merge highlights networking branches

app/src/main/java/com/cornellappdev/score/components/highlights/HighlightsCardLazyColumn.kt

@@ -26,49 +26,30 @@ import com.cornellappdev.score.theme.Style.bodyNormal
 import com.cornellappdev.score.util.highlightsList
 import com.cornellappdev.score.util.recentSearchList
 
-sealed interface SearchResultsState {
-    data object Recent : SearchResultsState
-    data class Results(val items: List<HighlightData>) : SearchResultsState
-    data object Empty : SearchResultsState
-}
+enum class SearchUiState { RECENT, EMPTY, RESULTS }
 
 @Composable
 fun HighlightsCardLazyColumn(
     recentSearchList: List<String>,
     query: String,
-    highlightsList: List<HighlightData>,
-    onItemClick: () -> Unit,
-    onCloseClick: () -> Unit,
+    filteredResults: List<HighlightData>,
+    onItemClick: (String) -> Unit,
+    onCloseClick: (String) -> Unit,
     numResultsHeader: (@Composable () -> Unit)? = null
 ) {
 
     Column(
         modifier = Modifier.padding(horizontal = 24.dp)
     ) {
-        /*todo: move to VM*/
-        val resultsState: SearchResultsState =
-            when {
-                recentSearchList.isNotEmpty() && query.isEmpty() ->
-                    SearchResultsState.Recent
-
-                query.isNotEmpty() -> {
-                    val filtered = highlightsList.filter {
-                        it.title.contains(query, ignoreCase = true)
-                    }
-
-                    if (filtered.isEmpty()) {
-                        SearchResultsState.Empty
-                    } else {
-                        SearchResultsState.Results(filtered)
-                    }
-                }
-
-                else -> SearchResultsState.Recent
-            }
 
+        val uiStateKey = when {
+            query.isEmpty() -> SearchUiState.RECENT
+            filteredResults.isEmpty() -> SearchUiState.EMPTY
+            else -> SearchUiState.RESULTS
+        }
 
         AnimatedContent(
-            targetState = resultsState,
+            targetState = uiStateKey,
             transitionSpec = {
                 (fadeIn() + slideInVertically { it / 8 }) togetherWith
                         (fadeOut() + slideOutVertically { -it / 8 })
@@ -77,29 +58,29 @@ fun HighlightsCardLazyColumn(
         ) { state ->
 
             when (state) {
-                SearchResultsState.Recent -> {
+                SearchUiState.RECENT -> {
                     RecentSearches(
                         recentSearchList,
                         onItemClick,
                         onCloseClick
                     )
                 }
 
-                SearchResultsState.Empty -> {
+                SearchUiState.EMPTY -> {
                     EmptyStateBox(
                         icon = R.drawable.ic_kid_star,
                         title = "No results yet."
                     )
                 }
 
-                is SearchResultsState.Results -> {
+                SearchUiState.RESULTS -> {
                     Column {
                         numResultsHeader?.invoke()
 
                         LazyColumn(
                             verticalArrangement = Arrangement.spacedBy(16.dp)
                         ) {
-                            items(state.items) { item ->
+                            items(filteredResults) { item ->
                                 when (item) {
                                     is HighlightData.Video ->
                                         VideoHighlightCard(item.data, true)

app/src/main/java/com/cornellappdev/score/components/highlights/HighlightsCardRow.kt

@@ -23,14 +23,16 @@ import androidx.compose.ui.unit.dp
 import com.cornellappdev.score.R
 import com.cornellappdev.score.components.ScorePreview
 import com.cornellappdev.score.model.HighlightData
+import com.cornellappdev.score.screen.HighlightsSubScreenType
 import com.cornellappdev.score.theme.Style.bodyNormal
 import com.cornellappdev.score.theme.Style.heading2
 import com.cornellappdev.score.util.highlightsList
 
 @Composable
 fun HighlightsCardRow(
     highlightsList: List<HighlightData>,
-    rowHeader: String
+    rowHeader: String,
+    toSubScreen: (HighlightsSubScreenType) -> Unit
 ) {
     Column(
         modifier = Modifier.fillMaxWidth()
@@ -47,7 +49,7 @@ fun HighlightsCardRow(
                 style = heading2
             )
             Row(
-                modifier = Modifier.clickable {/*todo navigation to Today screen*/ },
+                modifier = Modifier.clickable { toSubScreen(if (rowHeader == "Today") HighlightsSubScreenType.TODAY else HighlightsSubScreenType.PAST3DAYS) },
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
@@ -82,6 +84,6 @@ fun HighlightsCardRow(
 @Composable
 private fun HighlightsCardRowPreview() {
     ScorePreview {
-        HighlightsCardRow(highlightsList, "Today")
+        HighlightsCardRow(highlightsList, "Today", {})
     }
 }

app/src/main/java/com/cornellappdev/score/components/highlights/HighlightsFilter.kt

@@ -33,7 +33,6 @@ import com.cornellappdev.score.theme.GrayPrimary
 import com.cornellappdev.score.theme.Stroke
 import com.cornellappdev.score.theme.Style.bodyNormal
 import com.cornellappdev.score.theme.White
-import com.cornellappdev.score.util.sportList
 import com.cornellappdev.score.util.sportSelectionList
 
 @Composable
@@ -50,7 +49,8 @@ private fun HighlightsFilterButton(
         shape = RoundedCornerShape(100.dp),
         colors = outlinedButtonColors(
             containerColor = if (isSelected) GrayLight else White,
-            contentColor = GrayPrimary
+            contentColor = GrayPrimary,
+            disabledContainerColor = GrayLight
         ),
         contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
     ) {
@@ -70,6 +70,7 @@ private fun HighlightsFilterButton(
 @Composable
 fun HighlightsFilterRow(
     sportList: List<SportSelection>,
+    selectedSport: SportSelection,
     onFilterSelected: (SportSelection) -> Unit,
 ) {
     LazyRow(
@@ -82,24 +83,27 @@ fun HighlightsFilterRow(
             items = sportList.filterIsInstance<SportSelection.SportSelect>(),
             key = { it.sport }
         ) { selection ->
+
+            val isSelected = selectedSport == selection
+
             HighlightsFilterButton(
                 sport = selection.sport,
-                onFilterSelected = onFilterSelected
+                onFilterSelected = onFilterSelected,
+                isSelected = isSelected
             )
         }
     }
-
 }
 
 @Preview
 @Composable
 private fun HighlightsFilterButtonPreview() {
     var isSelected by remember { mutableStateOf(false) }
-    HighlightsFilterButton(Sport.BASEBALL, { isSelected = !isSelected }, isSelected = isSelected)
+    HighlightsFilterButton(Sport.BASEBALL, { !isSelected }, isSelected = isSelected)
 }
 
 @Preview
 @Composable
 private fun HighlightsFilterRowPreview() {
-    HighlightsFilterRow(sportSelectionList, {})
+    HighlightsFilterRow(sportSelectionList, SportSelection.All, {})
 }

app/src/main/java/com/cornellappdev/score/components/highlights/HighlightsLoadingScreen.kt

@@ -0,0 +1,184 @@
+package com.cornellappdev.score.components.highlights
+
+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.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.cornellappdev.score.components.LoadingStateBox
+import com.cornellappdev.score.screen.HighlightsSubScreenHeader
+import com.cornellappdev.score.theme.GrayStroke
+import com.cornellappdev.score.theme.Style.heading1
+import com.cornellappdev.score.theme.Style.heading2
+
+@Composable
+fun HighlightsLoadingScreen(
+    topHeader: String, modifier: Modifier = Modifier
+) {
+    Column(
+        modifier = modifier.fillMaxSize()
+    ) {
+        Column(
+            modifier = Modifier.padding(horizontal = 24.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = topHeader,
+                style = heading1,
+                color = GrayStroke,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.Start)
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            LoadingStateBox(100, 40.dp)
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+        Row(
+            modifier = Modifier.padding(start = 24.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            repeat(4) {
+                LoadingStateBox(
+                    100, 30.dp, modifier = Modifier.width(85.dp)
+                )
+            }
+        }
+        Spacer(modifier = Modifier.height(24.dp))
+        Row(
+            modifier = Modifier
+                .padding(horizontal = 24.dp)
+                .fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "Loading Today...", style = heading2, color = GrayStroke
+            )
+            LoadingStateBox(
+                100, 15.dp, modifier = Modifier.width(
+                    50.dp
+                )
+            )
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+        Row(
+            modifier = Modifier.padding(start = 24.dp),
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            LoadingStateBox(
+                12, 192.dp, modifier = Modifier.width(
+                    241.dp
+                )
+            )
+            LoadingStateBox(
+                12, 192.dp, modifier = Modifier.width(
+                    241.dp
+                )
+            )
+        }
+        Spacer(modifier = Modifier.height(24.dp))
+        Row(
+            modifier = Modifier
+                .padding(horizontal = 24.dp)
+                .fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "Loading Past 3 Days...", style = heading2, color = GrayStroke
+            )
+            LoadingStateBox(
+                100, 15.dp, modifier = Modifier.width(
+                    50.dp
+                )
+            )
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+        Row(
+            modifier = Modifier.padding(start = 24.dp),
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            LoadingStateBox(
+                12, 192.dp, modifier = Modifier.width(
+                    241.dp
+                )
+            )
+            LoadingStateBox(
+                12, 192.dp, modifier = Modifier.width(
+                    241.dp
+                )
+            )
+        }
+    }
+}
+
+@Composable
+fun SubHighlightsLoadingScreen(
+    header: String, modifier: Modifier = Modifier
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        HighlightsSubScreenHeader(
+            header = header, navigateBack = {})
+        Column(
+            modifier = modifier
+                .fillMaxWidth()
+                .padding(start = 24.dp, end = 24.dp, top = 24.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            LoadingStateBox(
+                100, height = 40.dp
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+        }
+        Row(
+            modifier = Modifier.padding(start = 24.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            repeat(4) {
+                LoadingStateBox(
+                    100, 30.dp, modifier = Modifier.width(85.dp)
+                )
+            }
+        }
+        Spacer(modifier.height(24.dp))
+        Column(
+            modifier = Modifier.padding(horizontal = 24.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            repeat(4) {
+                LoadingStateBox(
+                    12, 192.dp
+                )
+            }
+        }
+    }
+}
+
+
+@Preview
+@Composable
+private fun HighlightsLoadingScreenPreview() =
+    _root_ide_package_.com.cornellappdev.score.components.ScorePreview {
+        HighlightsLoadingScreen("Loading Highlights...")
+    }
+
+@Preview
+@Composable
+private fun SubHighlightsLoadingScreenPreview() =
+    _root_ide_package_.com.cornellappdev.score.components.ScorePreview {
+        SubHighlightsLoadingScreen("Past 3 Days")
+    }