Skip to content

Add report issue screen #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EmilJiang merged 2 commits into from
Nov 10, 2026
Merged

Add report issue screen #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fb1385
Add report issue screen
EmilJiang Nov 10, 2026
22f48a6
Address report issue review feedback
EmilJiang Nov 10, 2026
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
27 changes: 24 additions & 3 deletions app/src/main/java/com/cornellappdev/score/components/ButtonPrimary.kt
View file
Open in desktop
Comment thread
EmilJiang marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package com.cornellappdev.score.components

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
Expand All @@ -12,6 +15,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.cornellappdev.score.theme.CrimsonPrimary
import com.cornellappdev.score.theme.Style.bodyMedium
Expand All @@ -22,11 +26,16 @@ fun ButtonPrimary(
text: String,
icon: Painter?,
modifier: Modifier = Modifier,
onClick: () -> Unit = {}
onClick: () -> Unit = {},
enabled: Boolean = true
) {
Button(
onClick = onClick,
colors = ButtonDefaults.buttonColors(containerColor = CrimsonPrimary),
enabled = enabled,
colors = ButtonDefaults.buttonColors(
containerColor = CrimsonPrimary,
disabledContainerColor = CrimsonPrimary.copy(alpha = 0.38f)
),
modifier = modifier,
contentPadding = PaddingValues(12.dp)
) {
Expand All @@ -45,4 +54,16 @@ fun ButtonPrimary(
}
Text(text = text, style = bodyMedium.copy(color = White))
}
}
}

@Preview(showBackground = true)
@Composable
private fun ButtonPrimaryPreview() {
Column(
modifier = Modifier.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
ButtonPrimary(text = "Submit", icon = null)
ButtonPrimary(text = "Submit", icon = null, enabled = false)
}
}
233 changes: 233 additions & 0 deletions app/src/main/java/com/cornellappdev/score/screen/ReportIssueScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
package com.cornellappdev.score.screen

import androidx.annotation.StringRes
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
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.heightIn
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.cornellappdev.score.R
import com.cornellappdev.score.components.ButtonPrimary
import com.cornellappdev.score.components.NavigationHeader
import com.cornellappdev.score.model.Sport
import com.cornellappdev.score.theme.CrimsonPrimary
import com.cornellappdev.score.theme.GrayLight
import com.cornellappdev.score.theme.GrayMedium
import com.cornellappdev.score.theme.GrayPrimary
import com.cornellappdev.score.theme.GrayStroke
import com.cornellappdev.score.theme.Style
import com.cornellappdev.score.theme.White

enum class ReportIssueType(@StringRes val label: Int) {
INACCURATE_SCORES(R.string.report_inaccurate_scores),
WRONG_GAME_TIME(R.string.report_wrong_game_time),
MISSING_GAME(R.string.report_missing_game),
OTHER(R.string.report_other)
}

private val reportSports = listOf(
Sport.BASKETBALL,
Sport.ICE_HOCKEY,
Sport.LACROSSE,
Sport.SOCCER,
Sport.FIELD_HOCKEY,
Sport.BASEBALL,
Sport.FOOTBALL
)

data class IssueReport(
val issue: ReportIssueType,
val sport: Sport,
val description: String
)

/** Sending stays disabled until the caller supplies a reporting integration. */
@Composable
fun ReportIssueScreen(
onBack: () -> Unit,
modifier: Modifier = Modifier,
onSubmit: ((IssueReport) -> Unit)? = null
) {
var issue by rememberSaveable { mutableStateOf<ReportIssueType?>(null) }
var sport by rememberSaveable { mutableStateOf<Sport?>(null) }
var description by rememberSaveable { mutableStateOf("") }
val issueLabels = ReportIssueType.entries.associateWith { stringResource(it.label) }
val descriptionLabel = stringResource(R.string.report_description)

Column(modifier.fillMaxSize().background(White).imePadding()) {
NavigationHeader(stringResource(R.string.report_title), onBack)
Column(
Modifier.weight(1f).verticalScroll(rememberScrollState()).padding(16.dp, 24.dp),
verticalArrangement = Arrangement.spacedBy(24.dp)
) {
ReportField(stringResource(R.string.report_issue_question)) {
ReportDropdown(
label = stringResource(R.string.report_issue_question),
selected = issue,
options = ReportIssueType.entries,
optionLabel = { issueLabels.getValue(it) },
onSelect = { issue = it }
)
}
ReportField(stringResource(R.string.report_sport_question)) {
ReportDropdown(
label = stringResource(R.string.report_sport_question),
selected = sport,
options = reportSports,
optionLabel = { it.displayName },
onSelect = { sport = it }
)
}
ReportField(descriptionLabel) {
BasicTextField(
value = description,
onValueChange = { description = it },
modifier = Modifier.fillMaxWidth().heightIn(min = 194.dp)
.background(GrayStroke, RoundedCornerShape(8.dp)).padding(12.dp)
.semantics { contentDescription = descriptionLabel },
textStyle = Style.bodyMedium.copy(color = GrayPrimary, lineHeight = 20.sp),
cursorBrush = SolidColor(CrimsonPrimary),
decorationBox = { innerTextField ->
Box {
if (description.isEmpty()) {
Text(
stringResource(R.string.report_description_hint),
style = Style.bodyMedium,
color = GrayMedium
)
}
innerTextField()
}
}
)
}
}
ButtonPrimary(
text = stringResource(R.string.report_submit),
icon = null,
modifier = Modifier.align(Alignment.CenterHorizontally)
.padding(top = 16.dp, bottom = 76.dp),
enabled = onSubmit != null && issue != null && sport != null && description.isNotBlank(),
onClick = {
val selectedIssue = issue
val selectedSport = sport
if (selectedIssue != null && selectedSport != null && description.isNotBlank()) {
onSubmit?.invoke(IssueReport(selectedIssue, selectedSport, description.trim()))
}
}
)
}
}

@Composable
private fun ReportField(label: String, content: @Composable () -> Unit) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text(
label,
style = Style.bodySemibold.copy(fontSize = 16.sp, fontWeight = FontWeight.Bold),
color = GrayPrimary
)
content()
}
}

@Composable
private fun <T> ReportDropdown(
label: String,
selected: T?,
options: List<T>,
optionLabel: (T) -> String,
onSelect: (T) -> Unit
) {
var expanded by remember { mutableStateOf(false) }
val selectedLabel = selected?.let(optionLabel)
?: stringResource(R.string.report_choose_option)
Box {
Row(
Modifier.fillMaxWidth().background(GrayStroke, RoundedCornerShape(8.dp))
.clickable(role = Role.Button, onClick = { expanded = !expanded })
.semantics {
contentDescription = label
stateDescription = selectedLabel
}
.heightIn(min = 48.dp).padding(horizontal = 10.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Text(
selectedLabel,
style = Style.bodyMedium,
color = if (selected == null) GrayMedium else GrayPrimary
)
Spacer(Modifier.weight(1f))
Icon(
painterResource(R.drawable.report_chevron),
contentDescription = null,
modifier = Modifier.size(20.dp).rotate(if (expanded) -90f else 90f),
tint = GrayLight
)
}
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
containerColor = White
) {
options.forEach { option ->
DropdownMenuItem(
text = {
Text(
optionLabel(option), style = Style.bodyMedium,
color = if (selected == option) CrimsonPrimary else GrayPrimary
)
},
onClick = {
onSelect(option)
expanded = false
}
)
}
}
}
}

@Preview(showBackground = true, widthDp = 393, heightDp = 805)
@Composable
private fun ReportIssueScreenPreview() {
ReportIssueScreen(onBack = {})
}
Loading
Loading