From 65b010a106bc268cea33c580ff06bfd0516b0340 Mon Sep 17 00:00:00 2001 From: amjiao Date: Wed, 11 Nov 2026 03:12:05 -0500 Subject: [PATCH 1/7] Add highlights networking and data layer --- app/src/main/graphql/Highlights.graphql | 17 ++ .../cornellappdev/score/model/Highlights.kt | 74 +++++- .../score/model/HighlightsRepository.kt | 76 ++++++ .../com/cornellappdev/score/util/DateUtil.kt | 17 ++ .../score/viewmodel/HighlightsViewModel.kt | 219 ++++++++++++++++++ 5 files changed, 397 insertions(+), 6 deletions(-) create mode 100644 app/src/main/graphql/Highlights.graphql create mode 100644 app/src/main/java/com/cornellappdev/score/model/HighlightsRepository.kt create mode 100644 app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt diff --git a/app/src/main/graphql/Highlights.graphql b/app/src/main/graphql/Highlights.graphql new file mode 100644 index 00000000..fa8b5d4b --- /dev/null +++ b/app/src/main/graphql/Highlights.graphql @@ -0,0 +1,17 @@ +query Highlights($sportsType: String) { + articles(sportsType: $sportsType) { + title + image + sportsType + publishedAt + url + } + youtubeVideos { + title + thumbnail + url + publishedAt + duration + sportsType + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt index 2d893df1..e981cc26 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt @@ -1,33 +1,95 @@ package com.cornellappdev.score.model +import com.cornellappdev.score.util.formatDateTimeDisplay +import com.cornellappdev.score.util.isValidSport +import com.cornellappdev.score.util.outputFormatter +import com.cornellappdev.score.util.parseDateTimeOrNull +import com.cornellappdev.score.util.parseIsoDateToLocalDateOrNull +import com.example.score.HighlightsQuery +import java.time.LocalDate + data class VideoHighlightData( val title: String, val thumbnailImageUrl: String, val videoUrl: String, - val date: String, - val sport: Sport, - val gender: GenderDivision, + val gender: GenderDivision?, val duration: String? = null, val finalScore: String? = null, - val photoCredit: String? = null + val photoCredit: String? = null, + val date: LocalDate?, + val dateString: String, + val sport: Sport?, ) data class ArticleHighlightData( val title: String, val imageUrl: String, val articleUrl: String, - val date: String, - val sport: Sport + val date: LocalDate?, + val dateString: String, + val sport: Sport? ) sealed class HighlightData { abstract val title: String + abstract val date: LocalDate? + + abstract val dateString: String + abstract val sport: Sport? data class Video(val data: VideoHighlightData) : HighlightData() { override val title = data.title + override val date = data.date + override val dateString = data.dateString + override val sport = data.sport } data class Article(val data: ArticleHighlightData) : HighlightData() { override val title = data.title + override val date = data.date + override val dateString = data.dateString + override val sport = data.sport } +} + +fun HighlightsQuery.YoutubeVideo.toHighlightData(): HighlightData? { + val sportName = sportsType ?: return null + if (!isValidSport(sportName)) return null + + val date = parseIsoDateToLocalDateOrNull(publishedAt) + + return HighlightData.Video( + VideoHighlightData( + title = title, + thumbnailImageUrl = thumbnail, + videoUrl = url, + date = date, + dateString = date?.format(outputFormatter) ?: "-/-/-", + sport = Sport.fromDisplayName(sportName), + gender = if (title.contains("Men's")) { + GenderDivision.MALE + } else { + GenderDivision.FEMALE + }, + duration = duration + ) + ) +} + +fun HighlightsQuery.Article.toHighlightData(): HighlightData? { + val sportName = sportsType + if (!isValidSport(sportName)) return null + + val date = parseIsoDateToLocalDateOrNull(publishedAt) + + return HighlightData.Article( + ArticleHighlightData( + title = title, + imageUrl = image ?: return null, + articleUrl = url, + date = date, + dateString = date?.format(outputFormatter) ?: "-/-/-", + sport = Sport.fromDisplayName(sportName) + ) + ) } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/model/HighlightsRepository.kt b/app/src/main/java/com/cornellappdev/score/model/HighlightsRepository.kt new file mode 100644 index 00000000..cb27e3af --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/model/HighlightsRepository.kt @@ -0,0 +1,76 @@ +package com.cornellappdev.score.model + +import android.util.Log +import com.apollographql.apollo.ApolloClient +import com.example.score.HighlightsQuery +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.Job +import kotlinx.coroutines.TimeoutCancellationException +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withTimeout +import javax.inject.Inject +import javax.inject.Singleton +import kotlin.coroutines.cancellation.CancellationException +import kotlin.time.Duration.Companion.milliseconds + +private const val TIMEOUT_TIME_MILLIS = 5000L + +@Singleton +class HighlightsRepository @Inject constructor( + private val apolloClient: ApolloClient, + private val appScope: CoroutineScope, +) { + private val _highlightsFlow = + MutableStateFlow>>(ApiResponse.Loading) + val highlightsFlow = _highlightsFlow.asStateFlow() + + //track the in-flight job so we can cancel it before starting a new one + private var currentFetchJob: Job? = null + + + /** + * Asynchronously fetches the list of highlights from the API. Once finished, will send down + * `upcomingGamesFlow` to be observed. + */ + fun fetchHighlights(): Job { + currentFetchJob?.cancel() + val fetchJob = appScope.launch(start = CoroutineStart.LAZY) { + + _highlightsFlow.value = ApiResponse.Loading + + try { + val result = + withTimeout(TIMEOUT_TIME_MILLIS.milliseconds) { + apolloClient.query(HighlightsQuery()).execute().toResult() + } + + if (result.isSuccess) { + val highlights = result.getOrNull() + val highlightsList = + highlights?.articles.orEmpty().mapNotNull { it?.toHighlightData() } + + highlights?.youtubeVideos.orEmpty().mapNotNull { it?.toHighlightData() } + + _highlightsFlow.value = ApiResponse.Success(highlightsList) + } else { + _highlightsFlow.value = ApiResponse.Error + } + + } catch (e: TimeoutCancellationException) { + Log.e("HighlightsRepository", "Highlights request timed out", e) + _highlightsFlow.value = ApiResponse.Error + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Log.e("HighlightsRepository", "Error fetching highlights", e) + _highlightsFlow.value = ApiResponse.Error + } + } + currentFetchJob = fetchJob + fetchJob.start() + return fetchJob + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt b/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt index 3075fe78..a76544ce 100644 --- a/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt +++ b/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt @@ -2,8 +2,10 @@ package com.cornellappdev.score.util import android.util.Log import java.time.Duration +import java.time.Instant import java.time.LocalDate import java.time.LocalDateTime +import java.time.ZoneId import java.time.format.DateTimeFormatter import java.util.Locale @@ -66,6 +68,21 @@ fun parseDateTimeOrNull(date: String, time: String): LocalDateTime? { } } +/** + * Parses an ISO-8601 timestamp: yyyy-MM-dd'T'HH:mm:ss'Z' into a LocalDate? object. + * + * @param strDate the date string to parse, in the format "yyyy-MM-dd'T'HH:mm:ss'Z'" + * @return a LocalDate object if parsing succeeds, or null if the format is invalid + */ +fun parseIsoDateToLocalDateOrNull(strDate: String): LocalDate? { + return try { + Instant.parse(strDate) + .atZone(ZoneId.systemDefault()) + .toLocalDate() + } catch (e: Exception) { + null + } +} /** * Formats a date and time string into a user-friendly display string. diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt new file mode 100644 index 00000000..e5e26af1 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt @@ -0,0 +1,219 @@ +package com.cornellappdev.score.viewmodel + +import com.cornellappdev.score.model.ApiResponse +import com.cornellappdev.score.model.GenderDivision +import com.cornellappdev.score.model.HighlightData +import com.cornellappdev.score.model.HighlightsRepository +import com.cornellappdev.score.model.Sport +import com.cornellappdev.score.model.SportSelection +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.debounce +import java.time.LocalDate +import javax.inject.Inject + +data class HighlightsUiState( + val sportSelect: SportSelection, + val loadedState: ApiResponse>, + val isRefreshing: Boolean, + val sportSelectionList: List, + val filteredHighlights: List, + val todayHighlights: List, + val pastThreeDaysHighlights: List, + val query: String, + val recentSearches: List +) + +private fun buildDerivedLists( + highlights: List, + sportSelect: SportSelection, + query: String +): Triple, List, List> { + val today = LocalDate.now() + val threeDaysAgo = today.minusDays(3) + + val filteredBySport = highlights + .filter { it.date != null } + .filter { h -> + when (sportSelect) { + is SportSelection.All -> true + is SportSelection.SportSelect -> h.sport == sportSelect.sport + } + } + + val filteredByQuery = + if (query.isBlank()) filteredBySport + else filteredBySport.filter { + it.title.contains(query, ignoreCase = true) || + (it.sport?.displayName?.contains(query, ignoreCase = true) == true) + } + + val sorted = filteredByQuery.sortedByDescending { it.date } + + val todayHighlights = sorted.filter { it.date == today } + + val pastThreeDays = sorted.filter { date -> + date.date?.let { + it < today && it >= threeDaysAgo + } ?: false + } + + return Triple(sorted, todayHighlights, pastThreeDays) +} + +private fun recompute(highlights: List, state: HighlightsUiState) + : HighlightsUiState { + + val (filtered, today, pastThreeDays) = + buildDerivedLists(highlights, state.sportSelect, state.query) + + return state.copy( + filteredHighlights = filtered, + todayHighlights = today, + pastThreeDaysHighlights = pastThreeDays + ) +} + +@HiltViewModel +class HighlightsViewModel @Inject constructor( + private val highlightsRepository: HighlightsRepository +) : BaseViewModel( + HighlightsUiState( + sportSelect = SportSelection.All, + loadedState = ApiResponse.Loading, + isRefreshing = true, + sportSelectionList = Sport.getSportSelectionList(GenderDivision.ALL), + filteredHighlights = emptyList(), + todayHighlights = emptyList(), + pastThreeDaysHighlights = emptyList(), + query = "", + recentSearches = emptyList() + ) +) { + init { + highlightsRepository.fetchHighlights() + asyncCollect(highlightsRepository.highlightsFlow) { response -> + applyMutation { + when (response) { + is ApiResponse.Success -> { + val sorted = response.data.sortedByDescending { it.date } + + val (filtered, today, pastThreeDays) = + buildDerivedLists(sorted, sportSelect, query) + + copy( + loadedState = ApiResponse.Success(sorted), + isRefreshing = false, + filteredHighlights = filtered, + todayHighlights = today, + pastThreeDaysHighlights = pastThreeDays + ) + } + + ApiResponse.Loading -> + if (loadedState is ApiResponse.Success) { + copy( + isRefreshing = true + ) + } else { + copy(isRefreshing = true, + loadedState = ApiResponse.Loading, + filteredHighlights = emptyList(), + todayHighlights = emptyList(), + pastThreeDaysHighlights = emptyList() + ) + } + + ApiResponse.Error -> + if (loadedState is ApiResponse.Success) { + copy( + isRefreshing = false + ) + } else { + copy( + loadedState = ApiResponse.Error, + isRefreshing = false, + filteredHighlights = emptyList(), + todayHighlights = emptyList(), + pastThreeDaysHighlights = emptyList() + ) + } + } + } + } + } + + fun onQueryChange(newQuery: String) { + applyMutation { + val highlights = (loadedState as? ApiResponse.Success)?.data.orEmpty() + + recompute( + highlights, + copy(query = newQuery) + ) + } + } + + fun onRefresh() { + applyMutation { + copy(isRefreshing = true) + } + highlightsRepository.fetchHighlights() + } + + fun onSportSelected(sport: SportSelection) { + applyMutation { + val highlights = + (loadedState as? ApiResponse.Success)?.data.orEmpty() + + val newSelection = + if (sportSelect == sport) { + SportSelection.All + } else { + sport + } + + recompute( + highlights, + copy(sportSelect = newSelection) + ) + } + } + + fun onSearch(query: String) { + if (query.isBlank()) return + + applyMutation { + val highlights = + (loadedState as? ApiResponse.Success)?.data.orEmpty() + + val updatedSearches = + (listOf(query) + recentSearches) + .distinct() + .take(3) + + recompute( + highlights, + copy( + query = query, + recentSearches = updatedSearches + ) + ) + } + } + + //Removes an item from the recent searches list + fun onRemoveRecent(recent: String) { + applyMutation { + val updated = recentSearches.filterNot { it == recent } + copy(recentSearches = updated) + } + } + + //Searches an item from the recent searches list + fun onSearchRecent(recent: String) { + onSearch(recent) + } +} From f12b996174d41c3822674364c59b3b4ecd173b24 Mon Sep 17 00:00:00 2001 From: amjiao Date: Sat, 14 Nov 2026 19:32:19 -0500 Subject: [PATCH 2/7] Fix apostrophe type error --- app/src/main/java/com/cornellappdev/score/model/Highlights.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt index e981cc26..59f8480c 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt @@ -66,7 +66,7 @@ fun HighlightsQuery.YoutubeVideo.toHighlightData(): HighlightData? { date = date, dateString = date?.format(outputFormatter) ?: "-/-/-", sport = Sport.fromDisplayName(sportName), - gender = if (title.contains("Men's")) { + gender = if (title.contains("Men")) { GenderDivision.MALE } else { GenderDivision.FEMALE From 528a8ff379d217b1b8e449b3a11dccb66c6135a4 Mon Sep 17 00:00:00 2001 From: amjiao Date: Sun, 15 Nov 2026 13:56:05 -0500 Subject: [PATCH 3/7] Fix lint failure --- .../highlights/ArticleHighlightsCard.kt | 19 +---- .../highlights/VideoHighlightsCard.kt | 36 ++++----- .../score/screen/ProfileSampleData.kt | 22 +----- .../score/util/TestingConstants.kt | 75 +++++++++---------- 4 files changed, 56 insertions(+), 96 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt b/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt index fac49a3f..bab7913d 100644 --- a/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt +++ b/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt @@ -39,6 +39,7 @@ import com.cornellappdev.score.theme.Style.bodySemibold import com.cornellappdev.score.theme.Style.heading2 import com.cornellappdev.score.theme.Style.labelsNormal import com.cornellappdev.score.theme.White +import com.cornellappdev.score.util.sampleArticleHighlightData @Composable fun ArticleHighlightCard( @@ -100,7 +101,7 @@ fun ArticleHighlightCard( Text( color = Color.White, style = labelsNormal, - text = articleHighlight.date + text = articleHighlight.dateString ) } } @@ -111,13 +112,7 @@ fun ArticleHighlightCard( @Composable private fun ArticleHighlightCardPreview() { ArticleHighlightCard( - ArticleHighlightData( - "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.ICE_HOCKEY - ), + sampleArticleHighlightData, false ) } @@ -126,13 +121,7 @@ private fun ArticleHighlightCardPreview() { @Composable private fun WideArticleHighlightCardPreview() { ArticleHighlightCard( - ArticleHighlightData( - "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.ICE_HOCKEY - ), + sampleArticleHighlightData, true ) } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/score/components/highlights/VideoHighlightsCard.kt b/app/src/main/java/com/cornellappdev/score/components/highlights/VideoHighlightsCard.kt index b8257145..2cac2cd5 100644 --- a/app/src/main/java/com/cornellappdev/score/components/highlights/VideoHighlightsCard.kt +++ b/app/src/main/java/com/cornellappdev/score/components/highlights/VideoHighlightsCard.kt @@ -39,6 +39,7 @@ import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.GrayStroke import com.cornellappdev.score.theme.Style.heading2 import com.cornellappdev.score.theme.Style.labelsNormal +import com.cornellappdev.score.util.sampleVideoHighlightData @Composable private fun VideoHighlightCardHeader( @@ -99,12 +100,15 @@ fun VideoHighlightCardBody( Row( verticalAlignment = Alignment.CenterVertically ) { - Icon( - painter = painterResource(videoHighlight.sport.emptyIcon), - contentDescription = "Sport icon", - modifier = Modifier.size(24.dp), - tint = Color.Unspecified - ) + if (videoHighlight.sport != null){ + Icon( + painter = painterResource(videoHighlight.sport.emptyIcon), + contentDescription = "Sport icon", + modifier = Modifier.size(24.dp), + tint = Color.Unspecified + ) + } + Icon( painter = painterResource(if (videoHighlight.gender == GenderDivision.FEMALE) R.drawable.ic_gender_women else R.drawable.ic_gender_men), contentDescription = "Gender icon", @@ -128,7 +132,7 @@ fun VideoHighlightCardBody( } Text( style = labelsNormal, - text = videoHighlight.date + text = videoHighlight.dateString ) } } @@ -160,22 +164,8 @@ data class VideoHighlightPreviewData( class VideoHighlightsPreviewProvider : PreviewParameterProvider { override val values: Sequence = sequence { val samples = listOf( - VideoHighlightData( - "vs Columbia", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.BASEBALL, - GenderDivision.MALE - ), - VideoHighlightData( - "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.BASEBALL, - GenderDivision.MALE - ) + sampleVideoHighlightData, + sampleVideoHighlightData ) for (sample in samples) { yield(VideoHighlightPreviewData(sample, true)) diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt b/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt index 15f819e9..4ff4c9d2 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt @@ -8,6 +8,8 @@ import com.cornellappdev.score.model.ProfileData import com.cornellappdev.score.model.ProfileFavorite import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.VideoHighlightData +import com.cornellappdev.score.util.sampleArticleHighlightData +import com.cornellappdev.score.util.sampleVideoHighlightData // Temporary design fixtures. Replace ProfileScreen.data when account data is available. val sampleProfileData = ProfileData( @@ -20,26 +22,10 @@ val sampleProfileData = ProfileData( ), bookmarks = listOf( HighlightData.Video( - VideoHighlightData( - title = "vs. Columbia", - thumbnailImageUrl = "android.resource://com.cornellappdev.score/${R.drawable.profile_highlight_soccer}", - videoUrl = "https://www.youtube.com/@CornellAthletics", - date = "11/09", - sport = Sport.BASEBALL, - gender = GenderDivision.MALE, - duration = "1:25", - finalScore = "3-0", - photoCredit = "Photo By: Caroline Sherman" - ) + sampleVideoHighlightData ), HighlightData.Article( - ArticleHighlightData( - title = "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - imageUrl = "android.resource://com.cornellappdev.score/${R.drawable.profile_highlight_hockey}", - articleUrl = "https://cornellsun.com/", - date = "11/09", - sport = Sport.ICE_HOCKEY - ) + sampleArticleHighlightData ) ) ) diff --git a/app/src/main/java/com/cornellappdev/score/util/TestingConstants.kt b/app/src/main/java/com/cornellappdev/score/util/TestingConstants.kt index a726a125..45c835d5 100644 --- a/app/src/main/java/com/cornellappdev/score/util/TestingConstants.kt +++ b/app/src/main/java/com/cornellappdev/score/util/TestingConstants.kt @@ -7,13 +7,13 @@ import com.cornellappdev.score.model.GameCardData import com.cornellappdev.score.model.GameData import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.HighlightData -import com.cornellappdev.score.model.VideoHighlightData import com.cornellappdev.score.model.ScoreEvent import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import com.cornellappdev.score.model.TeamBoxScore import com.cornellappdev.score.model.TeamGameSummary import com.cornellappdev.score.model.TeamScore +import com.cornellappdev.score.model.VideoHighlightData import java.time.LocalDate val PENN_GAME = GameCardData( @@ -227,49 +227,44 @@ val sportSelectionList = listOf( val recentSearchList = listOf("Columbia", "Men's ice hockey", "Late goal lifts No.6 men’s hockey") +val sampleArticleHighlightData = ArticleHighlightData( + title = "Late Goal Lifts No. 6 Men’s Hockey Over Brown", + imageUrl = "maxresdefault.jpg", + articleUrl = "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", + date = null, + dateString = "11/9", + sport = Sport.ICE_HOCKEY +) + +val sampleVideoHighlightData = VideoHighlightData( + title = "vs Columbia", + thumbnailImageUrl = "maxresdefault.jpg", + videoUrl = "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", + date = null, + dateString = "11/09", + sport = Sport.BASEBALL, + gender = GenderDivision.MALE +) + //Mixed type val highlightsList = listOf( HighlightData.Video - (VideoHighlightData( - "vs Columbia", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/09", - Sport.BASEBALL, - GenderDivision.MALE - )), - HighlightData.Article - (ArticleHighlightData( - "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/09", - Sport.ICE_HOCKEY - )), + ( + sampleVideoHighlightData + ), + HighlightData.Article( + sampleArticleHighlightData + ), HighlightData.Video - (VideoHighlightData( - "vs Columbia", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.BASEBALL, - GenderDivision.MALE - )), + ( + sampleVideoHighlightData + ), HighlightData.Article - (ArticleHighlightData( - "Late Goal Lifts No. 6 Men’s Hockey Over Brown", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/09", - Sport.ICE_HOCKEY - )), + ( + sampleArticleHighlightData + ), HighlightData.Video - (VideoHighlightData( - "vs Columbia", - "maxresdefault.jpg", - "https://cornellsun.com/article/london-mcdavid-is-making-a-name-for-herself-at-cornell", - "11/9", - Sport.BASEBALL, - GenderDivision.MALE - )) + ( + sampleVideoHighlightData + ) ) \ No newline at end of file From 4b35210641ea8e551ecadb9f20f99f25987cf70e Mon Sep 17 00:00:00 2001 From: amjiao Date: Mon, 16 Nov 2026 00:35:52 -0500 Subject: [PATCH 4/7] Reformat Highlights.kt --- app/src/main/java/com/cornellappdev/score/model/Highlights.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt index 59f8480c..3178e8c3 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Highlights.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Highlights.kt @@ -1,9 +1,7 @@ package com.cornellappdev.score.model -import com.cornellappdev.score.util.formatDateTimeDisplay import com.cornellappdev.score.util.isValidSport import com.cornellappdev.score.util.outputFormatter -import com.cornellappdev.score.util.parseDateTimeOrNull import com.cornellappdev.score.util.parseIsoDateToLocalDateOrNull import com.example.score.HighlightsQuery import java.time.LocalDate @@ -33,7 +31,6 @@ data class ArticleHighlightData( sealed class HighlightData { abstract val title: String abstract val date: LocalDate? - abstract val dateString: String abstract val sport: Sport? From ef2427170bca3e7d950b0025d8ed0c666f200473 Mon Sep 17 00:00:00 2001 From: amjiao Date: Wed, 18 Nov 2026 15:49:49 -0500 Subject: [PATCH 5/7] Clean up files/reorganize --- .../ProfilePictureOptions.kt | 5 ++--- .../components/highlights/ArticleHighlightsCard.kt | 14 +------------- .../score/screen/EditFavoriteSportsScreen.kt | 1 + .../score/screen/EditProfileScreen.kt | 1 + .../score/screen/OnboardingProfileSelectScreen.kt | 3 +-- .../cornellappdev/score/screen/ProfileScreen.kt | 1 + .../score/{screen => util}/ProfileSampleData.kt | 7 +------ 7 files changed, 8 insertions(+), 24 deletions(-) rename app/src/main/java/com/cornellappdev/score/{screen => components}/ProfilePictureOptions.kt (95%) rename app/src/main/java/com/cornellappdev/score/{screen => util}/ProfileSampleData.kt (73%) diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt b/app/src/main/java/com/cornellappdev/score/components/ProfilePictureOptions.kt similarity index 95% rename from app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt rename to app/src/main/java/com/cornellappdev/score/components/ProfilePictureOptions.kt index 2caa2550..a9b6816a 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfilePictureOptions.kt +++ b/app/src/main/java/com/cornellappdev/score/components/ProfilePictureOptions.kt @@ -1,4 +1,4 @@ -package com.cornellappdev.score.screen +package com.cornellappdev.score.components import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape @@ -24,7 +23,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import com.cornellappdev.score.components.ScorePreview +import com.cornellappdev.score.screen.ProfilePicture import com.cornellappdev.score.theme.saturatedGreen /** diff --git a/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt b/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt index bab7913d..148cb8db 100644 --- a/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt +++ b/app/src/main/java/com/cornellappdev/score/components/highlights/ArticleHighlightsCard.kt @@ -11,31 +11,19 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.text.BasicText -import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.LinkAnnotation -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.TextLinkStyles -import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.text.withLink import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil3.compose.AsyncImage -import com.cornellappdev.score.R import com.cornellappdev.score.model.ArticleHighlightData -import com.cornellappdev.score.model.Sport -import com.cornellappdev.score.theme.Style.bodySemibold import com.cornellappdev.score.theme.Style.heading2 import com.cornellappdev.score.theme.Style.labelsNormal import com.cornellappdev.score.theme.White diff --git a/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt index b35085ad..498ab8a7 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/EditFavoriteSportsScreen.kt @@ -33,6 +33,7 @@ import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.ProfileFavorite import com.cornellappdev.score.model.Sport import com.cornellappdev.score.theme.* +import com.cornellappdev.score.util.sampleProfileData private val favoriteSportComparator = compareBy( { it.sport.displayName }, diff --git a/app/src/main/java/com/cornellappdev/score/screen/EditProfileScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/EditProfileScreen.kt index 4c93ff04..e9288b30 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/EditProfileScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/EditProfileScreen.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.cornellappdev.score.R import com.cornellappdev.score.components.NavigationHeader +import com.cornellappdev.score.components.ProfilePictureOptions import com.cornellappdev.score.theme.Style enum class ProfilePicture(@DrawableRes val drawable: Int, @StringRes val label: Int) { diff --git a/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt index 30d02230..7038c647 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/OnboardingProfileSelectScreen.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -28,9 +27,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.cornellappdev.score.R +import com.cornellappdev.score.components.ProfilePictureOptions import com.cornellappdev.score.theme.CrimsonPrimary import com.cornellappdev.score.theme.GrayStroke import com.cornellappdev.score.theme.Style diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt index 090fdf22..8b8b631f 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/ProfileScreen.kt @@ -62,6 +62,7 @@ import com.cornellappdev.score.theme.GrayPrimary import com.cornellappdev.score.theme.GrayStroke import com.cornellappdev.score.theme.SpotColor import com.cornellappdev.score.theme.Style +import com.cornellappdev.score.util.sampleProfileData /** Standalone sample backed by replaceable dummy data; avatar editing is inherited from PR #115. */ @Composable diff --git a/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt b/app/src/main/java/com/cornellappdev/score/util/ProfileSampleData.kt similarity index 73% rename from app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt rename to app/src/main/java/com/cornellappdev/score/util/ProfileSampleData.kt index 4ff4c9d2..a00c84f3 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/ProfileSampleData.kt +++ b/app/src/main/java/com/cornellappdev/score/util/ProfileSampleData.kt @@ -1,15 +1,10 @@ -package com.cornellappdev.score.screen +package com.cornellappdev.score.util -import com.cornellappdev.score.R -import com.cornellappdev.score.model.ArticleHighlightData import com.cornellappdev.score.model.GenderDivision import com.cornellappdev.score.model.HighlightData import com.cornellappdev.score.model.ProfileData import com.cornellappdev.score.model.ProfileFavorite import com.cornellappdev.score.model.Sport -import com.cornellappdev.score.model.VideoHighlightData -import com.cornellappdev.score.util.sampleArticleHighlightData -import com.cornellappdev.score.util.sampleVideoHighlightData // Temporary design fixtures. Replace ProfileScreen.data when account data is available. val sampleProfileData = ProfileData( From 21ab7309e26bfc7e2b1a862f64ff2edcb8fa793d Mon Sep 17 00:00:00 2001 From: amjiao Date: Wed, 18 Nov 2026 16:12:23 -0500 Subject: [PATCH 6/7] Address pr comments --- .../com/cornellappdev/score/util/DateUtil.kt | 2 +- .../score/viewmodel/HighlightsViewModel.kt | 61 +++++++++++-------- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt b/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt index a76544ce..a99d72ce 100644 --- a/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt +++ b/app/src/main/java/com/cornellappdev/score/util/DateUtil.kt @@ -79,7 +79,7 @@ fun parseIsoDateToLocalDateOrNull(strDate: String): LocalDate? { Instant.parse(strDate) .atZone(ZoneId.systemDefault()) .toLocalDate() - } catch (e: Exception) { + } catch (_: Exception) { null } } diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt index e5e26af1..fc468da9 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt @@ -7,10 +7,6 @@ import com.cornellappdev.score.model.HighlightsRepository import com.cornellappdev.score.model.Sport import com.cornellappdev.score.model.SportSelection import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.FlowPreview -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.debounce import java.time.LocalDate import javax.inject.Inject @@ -26,15 +22,21 @@ data class HighlightsUiState( val recentSearches: List ) -private fun buildDerivedLists( +private data class FilteredHighlightsByDateBlock( + val filteredHighlights: List, + val todayHighlights: List, + val pastThreeDaysHighlights: List +) + +private fun filterAndGroupHighlightsByDateBlock( highlights: List, sportSelect: SportSelection, query: String -): Triple, List, List> { +): FilteredHighlightsByDateBlock { val today = LocalDate.now() val threeDaysAgo = today.minusDays(3) - val filteredBySport = highlights + val highlightsFilteredBySportSelection = highlights .filter { it.date != null } .filter { h -> when (sportSelect) { @@ -44,8 +46,8 @@ private fun buildDerivedLists( } val filteredByQuery = - if (query.isBlank()) filteredBySport - else filteredBySport.filter { + if (query.isBlank()) highlightsFilteredBySportSelection + else highlightsFilteredBySportSelection.filter { it.title.contains(query, ignoreCase = true) || (it.sport?.displayName?.contains(query, ignoreCase = true) == true) } @@ -56,23 +58,27 @@ private fun buildDerivedLists( val pastThreeDays = sorted.filter { date -> date.date?.let { - it < today && it >= threeDaysAgo + it in threeDaysAgo.., state: HighlightsUiState) +private fun refreshFilteredHighlights(highlights: List, state: HighlightsUiState) : HighlightsUiState { - val (filtered, today, pastThreeDays) = - buildDerivedLists(highlights, state.sportSelect, state.query) + val groupedHighlights = + filterAndGroupHighlightsByDateBlock(highlights, state.sportSelect, state.query) return state.copy( - filteredHighlights = filtered, - todayHighlights = today, - pastThreeDaysHighlights = pastThreeDays + filteredHighlights = groupedHighlights.filteredHighlights, + todayHighlights = groupedHighlights.todayHighlights, + pastThreeDaysHighlights = groupedHighlights.pastThreeDaysHighlights ) } @@ -100,15 +106,15 @@ class HighlightsViewModel @Inject constructor( is ApiResponse.Success -> { val sorted = response.data.sortedByDescending { it.date } - val (filtered, today, pastThreeDays) = - buildDerivedLists(sorted, sportSelect, query) + val groupedHighlights = + filterAndGroupHighlightsByDateBlock(sorted, sportSelect, query) copy( loadedState = ApiResponse.Success(sorted), isRefreshing = false, - filteredHighlights = filtered, - todayHighlights = today, - pastThreeDaysHighlights = pastThreeDays + filteredHighlights = groupedHighlights.filteredHighlights, + todayHighlights = groupedHighlights.todayHighlights, + pastThreeDaysHighlights = groupedHighlights.pastThreeDaysHighlights ) } @@ -118,7 +124,8 @@ class HighlightsViewModel @Inject constructor( isRefreshing = true ) } else { - copy(isRefreshing = true, + copy( + isRefreshing = true, loadedState = ApiResponse.Loading, filteredHighlights = emptyList(), todayHighlights = emptyList(), @@ -149,7 +156,7 @@ class HighlightsViewModel @Inject constructor( applyMutation { val highlights = (loadedState as? ApiResponse.Success)?.data.orEmpty() - recompute( + refreshFilteredHighlights( highlights, copy(query = newQuery) ) @@ -163,7 +170,7 @@ class HighlightsViewModel @Inject constructor( highlightsRepository.fetchHighlights() } - fun onSportSelected(sport: SportSelection) { + fun onSportToggled(sport: SportSelection) { applyMutation { val highlights = (loadedState as? ApiResponse.Success)?.data.orEmpty() @@ -175,7 +182,7 @@ class HighlightsViewModel @Inject constructor( sport } - recompute( + refreshFilteredHighlights( highlights, copy(sportSelect = newSelection) ) @@ -194,7 +201,7 @@ class HighlightsViewModel @Inject constructor( .distinct() .take(3) - recompute( + refreshFilteredHighlights( highlights, copy( query = query, From f65fb1bb2e1c57ca496a0eb9ed1de45df6736e30 Mon Sep 17 00:00:00 2001 From: amjiao Date: Thu, 19 Nov 2026 15:21:48 -0500 Subject: [PATCH 7/7] Readability --- .../com/cornellappdev/score/viewmodel/HighlightsViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt index fc468da9..aa31a507 100644 --- a/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt +++ b/app/src/main/java/com/cornellappdev/score/viewmodel/HighlightsViewModel.kt @@ -38,10 +38,10 @@ private fun filterAndGroupHighlightsByDateBlock( val highlightsFilteredBySportSelection = highlights .filter { it.date != null } - .filter { h -> + .filter { highlight -> when (sportSelect) { is SportSelection.All -> true - is SportSelection.SportSelect -> h.sport == sportSelect.sport + is SportSelection.SportSelect -> highlight.sport == sportSelect.sport } }