Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions app/src/main/graphql/Highlights.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
query Highlights($sportsType: String) {
articles(sportsType: $sportsType) {
title
image
sportsType
publishedAt
url
}
youtubeVideos {
title
thumbnail
url
publishedAt
duration
sportsType
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cornellappdev.score.screen
package com.cornellappdev.score.components

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
Expand All @@ -23,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

/**
Expand Down
Comment thread
amjiao marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,23 @@ 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
import com.cornellappdev.score.util.sampleArticleHighlightData

@Composable
fun ArticleHighlightCard(
Expand Down Expand Up @@ -100,7 +89,7 @@ fun ArticleHighlightCard(
Text(
color = Color.White,
style = labelsNormal,
text = articleHighlight.date
text = articleHighlight.dateString
)
}
}
Expand All @@ -111,13 +100,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
)
}
Expand All @@ -126,13 +109,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
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand All @@ -128,7 +132,7 @@ fun VideoHighlightCardBody(
}
Text(
style = labelsNormal,
text = videoHighlight.date
text = videoHighlight.dateString
)
}
}
Expand Down Expand Up @@ -160,22 +164,8 @@ data class VideoHighlightPreviewData(
class VideoHighlightsPreviewProvider : PreviewParameterProvider<VideoHighlightPreviewData> {
override val values: Sequence<VideoHighlightPreviewData> = 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))
Expand Down
71 changes: 65 additions & 6 deletions app/src/main/java/com/cornellappdev/score/model/Highlights.kt
Original file line number Diff line number Diff line change
@@ -1,33 +1,92 @@
package com.cornellappdev.score.model

import com.cornellappdev.score.util.isValidSport
import com.cornellappdev.score.util.outputFormatter
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")) {
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)
)
)
}
Original file line number Diff line number Diff line change
@@ -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<List<HighlightData>>>(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
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import com.cornellappdev.score.theme.GrayStroke
import com.cornellappdev.score.theme.GreenBackground
import com.cornellappdev.score.theme.Style
import com.cornellappdev.score.theme.saturatedGreen
import com.cornellappdev.score.util.sampleProfileData

internal val favoriteSportComparator = compareBy<ProfileFavorite>(
{ it.sport.displayName },
Expand Down Expand Up @@ -85,9 +86,11 @@ fun EditFavoriteSportsScreen(
.filter { gender == GenderDivision.ALL || it.gender == gender }
.sortedWith(selectedFavoritesFirst(favorites))

Column(modifier
.fillMaxSize()
.background(Color.White)) {
Column(
modifier
.fillMaxSize()
.background(Color.White)
) {
NavigationHeader(stringResource(R.string.edit_favorite_sports), onBack)
FavoriteSportSelectionScreenContents(
favorites = favorites,
Expand Down Expand Up @@ -173,9 +176,11 @@ private fun FavoriteSportOption(favorite: ProfileFavorite, selected: Boolean, on
.toggleable(selected, role = Role.Checkbox, onValueChange = { onClick() }),
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(Modifier
.fillMaxWidth()
.aspectRatio(1f), contentAlignment = Alignment.Center) {
Box(
Modifier
.fillMaxWidth()
.aspectRatio(1f), contentAlignment = Alignment.Center
) {
Box(
Modifier
.fillMaxSize()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading
Loading