diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fca0fe5..d6c534f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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") diff --git a/app/src/main/java/com/cornellappdev/score/screen/GameDetailsScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/GameDetailsScreen.kt index d2f01bf..4062de6 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/GameDetailsScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/GameDetailsScreen.kt @@ -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 @@ -106,6 +107,7 @@ fun GameDetailsContent( gameCard: DetailsCardData, navigateToGameScoreSummary: (List) -> Unit ) { + val scrollState = rememberScrollState() Column( modifier = Modifier .background(White) @@ -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)) diff --git a/app/src/main/java/com/cornellappdev/score/screen/GameScoreSummaryScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/GameScoreSummaryScreen.kt index 0c94504..a9514f9 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/GameScoreSummaryScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/GameScoreSummaryScreen.kt @@ -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 @@ -43,7 +44,7 @@ fun GameScoreSummaryScreenDetail(scoreEvents: List, 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) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0fa6263..b53ee5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" } @@ -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" }