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
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ dependencies {
implementation("androidx.navigation:navigation-compose:2.8.2")
implementation(libs.material3)
implementation("com.google.dagger:hilt-android:2.51.1")
implementation(libs.androidx.material3)
kapt("com.google.dagger:hilt-android-compiler:2.51.1")
implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
implementation("com.google.accompanist:accompanist-pager:0.24.0-alpha")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.cornellappdev.score.screen
import ScoringSummary
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -106,6 +107,7 @@ fun GameDetailsContent(
gameCard: DetailsCardData,
navigateToGameScoreSummary: (List<ScoreEvent>) -> Unit
) {
val scrollState = rememberScrollState()
Column(
modifier = Modifier
.background(White)
Expand All @@ -132,7 +134,10 @@ fun GameDetailsContent(
)
Text(
text = gameCard.title,
style = heading1.copy(color = GrayPrimary)
style = heading1.copy(color = GrayPrimary),
maxLines = 1,
modifier = Modifier
.horizontalScroll(scrollState)
)
Spacer(modifier = Modifier.height(13.5.dp))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material3.Divider
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -43,7 +44,7 @@ fun GameScoreSummaryScreenDetail(scoreEvents: List<ScoreEvent>, onBackArrow: ()
) {
items(scoreEvents.size) { event ->
ScoreEventItemDetailed(event = scoreEvents[event])
Divider(color = Color.LightGray, thickness = 0.5.dp)
HorizontalDivider(thickness = 0.5.dp, color = Color.LightGray)
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ media3CommonKtx = "1.5.1"
# Using alpha version due to bug with pull to refresh in the latest stabel version
# See https://stackoverflow.com/a/79126321
material3 = "1.4.0-alpha11"
material3Version = "1.3.2"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand All @@ -31,6 +32,7 @@ androidx-constraintlayout = { group = "androidx.constraintlayout", name = "const
androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }
apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime" }
androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3CommonKtx" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3Version" }

[plugins]
androidApplication = { id = "com.android.application", version.ref = "agp" }
Expand Down