Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Consolidated app dialogs and tweaked bottom sheets
Arty Bishop24eebdef74c4
diff --git a/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.ktindex 30c07d3e..b9ffe81e 100644--- a/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt+++ b/core/presentation/src/main/java/com/rtbishop/look4sat/core/presentation/Components.kt@@ -27,11 +27,15 @@ import androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.RowScopeimport androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.WindowInsets+import androidx.compose.foundation.layout.asPaddingValuesimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.statusBarsimport androidx.compose.foundation.layout.statusBarsPaddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShape@@ -47,7 +51,6 @@ import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Text-import androidx.compose.material3.SheetValueimport androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.material3.adaptive.currentWindowAdaptiveInfoimport androidx.compose.runtime.Composable@@ -73,6 +76,8 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextDecorationimport androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.platform.LocalDensity+import androidx.compose.ui.platform.LocalWindowInfoimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.TextUnit@@ -291,52 +296,81 @@ fun getDefaultPass(): OrbitalPass = OrbitalPass()@Composable-fun SharedDialog(- title: String, onCancel: () -> Unit, onAccept: () -> Unit, content: @Composable () -> Unit+fun InfoDialog(+ title: String,+ onDismiss: () -> Unit,+ onAccept: () -> Unit,+ content: @Composable () -> Unit) {- SharedDialog(title = title, onDismissRequest = onCancel, onCancel = onCancel, onAccept = onAccept) { _ ->+ DialogShell(onDismissRequest = onDismiss) { padding ->+ Row(+ verticalAlignment = Alignment.CenterVertically,+ modifier = Modifier+ .fillMaxWidth()+ .padding(start = padding, top = padding, end = padding)+ ) {+ Text(+ text = title,+ fontSize = 16.sp,+ fontWeight = FontWeight.Medium,+ color = MaterialTheme.colorScheme.primary,+ maxLines = 1,+ overflow = TextOverflow.Ellipsis,+ modifier = Modifier.weight(1f)+ )+ CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))+ }content()}}@Composable-fun SharedDialog(+fun ConfirmDialog(title: String,- onDismissRequest: () -> Unit,- onCancel: (() -> Unit)? = null,- onAccept: (() -> Unit)? = null,- titleFontSize: Int = 16,- titleTextAlign: TextAlign = if (onCancel != null && onAccept != null) TextAlign.Center else TextAlign.Start,- content: @Composable (padding: Dp) -> Unit+ onCancel: () -> Unit,+ onAccept: () -> Unit,+ content: @Composable () -> Unit) {- val dismissible = onCancel != null- DialogShell(onDismissRequest = onDismissRequest, dismissible = dismissible) { padding ->+ DialogShell(onDismissRequest = onCancel) { padding ->Row(verticalAlignment = Alignment.CenterVertically,modifier = Modifier.fillMaxWidth().padding(start = padding, top = padding, end = padding)) {- if (onCancel != null) {- CardButton(onClick = onCancel, text = stringResource(R.string.btn_cancel))- }+ CardButton(onClick = onCancel, text = stringResource(R.string.btn_cancel))Text(text = title,- fontSize = titleFontSize.sp,+ fontSize = 16.sp,fontWeight = FontWeight.Medium,color = MaterialTheme.colorScheme.primary,- textAlign = titleTextAlign,+ textAlign = TextAlign.Center,maxLines = 1,overflow = TextOverflow.Ellipsis,modifier = Modifier.weight(1f)- .padding(horizontal = if (onCancel != null && onAccept != null) padding else 0.dp)+ .padding(horizontal = padding))- if (onAccept != null) {- CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))- }+ CardButton(onClick = onAccept, text = stringResource(R.string.btn_accept))}- content(padding)+ content()+ }+}++@Composable+fun WhatsNewDialog(onDismiss: () -> Unit) {+ InfoDialog(+ title = stringResource(R.string.pass_whatsnew_title),+ onDismiss = onDismiss,+ onAccept = onDismiss+ ) {+ Text(+ text = stringResource(R.string.pass_whatsnew_message),+ fontSize = 16.sp,+ color = MaterialTheme.colorScheme.onSurface,+ modifier = Modifier.padding(horizontal = LocalSpacing.current.large)+ )+ Spacer(modifier = Modifier.height(0.dp))}}@@ -344,14 +378,13 @@ fun SharedDialog(@Composableprivate fun DialogShell(onDismissRequest: () -> Unit,- dismissible: Boolean = true,content: @Composable (padding: Dp) -> Unit) {val padding = LocalSpacing.current.large- val sheetState = rememberModalBottomSheetState(- skipPartiallyExpanded = true,- confirmValueChange = { if (dismissible) true else it != SheetValue.Hidden }- )+ val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)+ val statusBarHeight = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()+ val containerHeight = with(LocalDensity.current) { LocalWindowInfo.current.containerSize.height.toDp() }+ val maxSheetHeight = containerHeight - statusBarHeightval stopSheetFling = remember {object : NestedScrollConnection {override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {@@ -366,10 +399,10 @@ private fun DialogShell(}}ModalBottomSheet(- onDismissRequest = if (dismissible) onDismissRequest else { {} },+ onDismissRequest = onDismissRequest,sheetState = sheetState,dragHandle = null,- shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),+ shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),scrimColor = Color.Black.copy(alpha = 0.64f)) {Column(@@ -377,6 +410,7 @@ private fun DialogShell(verticalArrangement = Arrangement.spacedBy(padding),modifier = Modifier.fillMaxWidth()+ .heightIn(max = maxSheetHeight).nestedScroll(stopSheetFling)) {content(padding)diff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesDialog.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesDialog.ktindex 4e1aa773..c774ff1f 100644--- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesDialog.kt+++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesDialog.kt@@ -58,7 +58,7 @@ import androidx.compose.ui.unit.spimport com.rtbishop.look4sat.core.presentation.LocalSpacingimport com.rtbishop.look4sat.core.presentation.MainThemeimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialog+import com.rtbishop.look4sat.core.presentation.ConfirmDialogimport com.rtbishop.look4sat.core.presentation.ElevationHighColorimport com.rtbishop.look4sat.core.presentation.ElevationLowColorimport com.rtbishop.look4sat.core.presentation.elevationColor@@ -140,7 +140,7 @@ internal fun PassesFilterDialog()cancel()}- SharedDialog(title = stringResource(R.string.pass_filter_title), onCancel = cancel, onAccept = onAccept) {+ ConfirmDialog(title = stringResource(R.string.pass_filter_title), onCancel = cancel, onAccept = onAccept) {SliderRow(title = stringResource(R.string.pass_filter_elev),value = elevationValueNew.doubleValue,@@ -365,7 +365,7 @@ internal fun RadiosDialog(modes: List<String>, cancel: () -> Unit, accept: (Listselected.value = if (mode in selected.value) selected.value - mode else selected.value + mode}val onAccept = { accept(selected.value.toList()).also { cancel() } }- SharedDialog(title = stringResource(R.string.pass_modes_title), onCancel = cancel, onAccept = onAccept) {+ ConfirmDialog(title = stringResource(R.string.pass_modes_title), onCancel = cancel, onAccept = onAccept) {LazyVerticalGrid(columns = GridCells.Adaptive(240.dp),modifier = Modifierdiff --git a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.ktindex 257d6a72..f9c39dfa 100644--- a/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt+++ b/feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt@@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width@@ -72,10 +71,10 @@ import com.rtbishop.look4sat.core.presentation.MainThemeimport com.rtbishop.look4sat.core.presentation.NextPassRowimport com.rtbishop.look4sat.core.presentation.Rimport com.rtbishop.look4sat.core.presentation.ScreenColumn-import com.rtbishop.look4sat.core.presentation.SharedDialogimport com.rtbishop.look4sat.core.presentation.SwipeableItemimport com.rtbishop.look4sat.core.presentation.TimerRowimport com.rtbishop.look4sat.core.presentation.TopBar+import com.rtbishop.look4sat.core.presentation.WhatsNewDialogimport com.rtbishop.look4sat.core.presentation.elevationColorimport com.rtbishop.look4sat.core.presentation.infiniteMarqueeimport com.rtbishop.look4sat.core.presentation.isVerticalLayout@@ -136,20 +135,7 @@ private fun PassesScreen(}if (uiState.shouldSeeWhatsNew) {val dismiss = { onAction(PassesAction.DismissWhatsNew) }- SharedDialog(- title = stringResource(R.string.pass_whatsnew_title),- onDismissRequest = dismiss,- onAccept = dismiss,- titleFontSize = 18- ) { padding ->- Text(- text = stringResource(R.string.pass_whatsnew_message),- fontSize = 16.sp,- color = MaterialTheme.colorScheme.onSurface,- modifier = Modifier.padding(horizontal = padding)- )- Spacer(modifier = Modifier.height(0.dp))- }+ WhatsNewDialog(onDismiss = dismiss)}ScreenColumn(topBar = { isVerticalLayout ->diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.ktindex c0ceb48c..0144c504 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/SstvPage.kt@@ -53,10 +53,10 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp+import com.rtbishop.look4sat.core.presentation.ConfirmDialogimport com.rtbishop.look4sat.core.presentation.IconCardimport com.rtbishop.look4sat.core.presentation.OutlinedTextimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialogimport com.rtbishop.look4sat.core.presentation.infiniteMarqueeimport kotlin.math.roundToInt@@ -96,14 +96,14 @@ internal fun SstvPage(if (showModeDialog.value) {val allModes = remember(sstv.supportedModes) { listOf("Auto") + sstv.supportedModes }val dismiss = { showModeDialog.value = false }- SharedDialog(+ ConfirmDialog(title = "SSTV Mode",- onDismissRequest = dismiss,- onAccept = dismiss- ) { _ ->+ onAccept = dismiss,+ onCancel = dismiss+ ) {LazyColumn(modifier = Modifier- .fillMaxHeight(0.7f)+ .fillMaxHeight(0.69f).background(MaterialTheme.colorScheme.background),verticalArrangement = Arrangement.spacedBy(1.dp)) {diff --git a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesDialog.kt b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesDialog.ktindex 2147f9f3..e077f44a 100644--- a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesDialog.kt+++ b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesDialog.kt@@ -39,9 +39,9 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dp+import com.rtbishop.look4sat.core.presentation.ConfirmDialogimport com.rtbishop.look4sat.core.presentation.MainThemeimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialog@Preview(showBackground = true)@Composable@@ -59,7 +59,7 @@ internal fun MultiModesDialog(selected.value = if (mode in selected.value) selected.value - mode else selected.value + mode}val onAccept = { accept(selected.value.toList()) }- SharedDialog(title = stringResource(R.string.sat_type_title), onCancel = cancel, onAccept = onAccept) {+ ConfirmDialog(title = stringResource(R.string.sat_type_title), onCancel = cancel, onAccept = onAccept) {LazyVerticalGrid(columns = GridCells.Adaptive(240.dp),modifier = Modifierdiff --git a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.ktindex 33441d7c..4083dccd 100644--- a/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt+++ b/feature/satellites/src/main/java/com/rtbishop/look4sat/feature/satellites/SatellitesScreen.kt@@ -62,10 +62,11 @@ import com.rtbishop.look4sat.core.domain.repository.IContainerProviderimport com.rtbishop.look4sat.core.presentation.CardLoadingIndicatorimport com.rtbishop.look4sat.core.presentation.EmptyListCardimport com.rtbishop.look4sat.core.presentation.IconCard+import com.rtbishop.look4sat.core.presentation.InfoDialog+import com.rtbishop.look4sat.core.presentation.LocalSpacingimport com.rtbishop.look4sat.core.presentation.MainThemeimport com.rtbishop.look4sat.core.presentation.PrimaryIconCardimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialogimport com.rtbishop.look4sat.core.presentation.TopBarimport com.rtbishop.look4sat.core.presentation.infiniteMarqueeimport com.rtbishop.look4sat.core.presentation.isVerticalLayout@@ -96,17 +97,16 @@ private fun SatellitesScreen(}if (uiState.shouldSeeWarning) {val dismiss = { onAction(SatellitesAction.DismissWarning) }- SharedDialog(+ InfoDialog(title = stringResource(R.string.sat_warning_title),- onDismissRequest = dismiss,- onAccept = dismiss,- titleFontSize = 18- ) { padding ->+ onDismiss = dismiss,+ onAccept = dismiss+ ) {Text(text = stringResource(R.string.sat_warning_message),fontSize = 16.sp,color = MaterialTheme.colorScheme.onSurface,- modifier = Modifier.padding(horizontal = padding)+ modifier = Modifier.padding(horizontal = LocalSpacing.current.large))Spacer(modifier = Modifier.height(0.dp))}diff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.ktindex 42ca9169..43baaf24 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsDialog.kt@@ -49,7 +49,7 @@ import com.rtbishop.look4sat.core.presentation.CardButtonimport com.rtbishop.look4sat.core.presentation.LocalSpacingimport com.rtbishop.look4sat.core.presentation.MainThemeimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialog+import com.rtbishop.look4sat.core.presentation.ConfirmDialog@Preview(showBackground = true)@Composable@@ -63,7 +63,7 @@ fun PositionDialog(lat: Double, lon: Double, dismiss: () -> Unit, save: (Double,val lonValue = rememberSaveable { mutableStateOf(lon.toString()) }val titleText = stringResource(id = R.string.prefs_station_title)val onAccept = { saveValues(latValue.value, lonValue.value, save).also { dismiss() } }- SharedDialog(title = titleText, onCancel = dismiss, onAccept = onAccept) {+ ConfirmDialog(title = titleText, onCancel = dismiss, onAccept = onAccept) {Row(horizontalArrangement = Arrangement.spacedBy(6.dp),modifier = Modifier@@ -107,7 +107,7 @@ private fun LocatorDialogPreview() {fun LocatorDialog(qthLocator: String, dismiss: () -> Unit, save: (String) -> Unit) {val locator = rememberSaveable { mutableStateOf(qthLocator) }val onAccept = { save(locator.value).also { dismiss() } }- SharedDialog(+ ConfirmDialog(title = stringResource(R.string.prefs_locator_title),onCancel = dismiss,onAccept = onAccept@@ -169,7 +169,7 @@ fun DataSourcesDialog(onDismiss()}val onCancel = { onDismiss() }- SharedDialog(+ ConfirmDialog(title = stringResource(id = R.string.prefs_data_sources_title),onCancel = onCancel,onAccept = onAccept,@@ -313,7 +313,7 @@ fun NetworkOutputDialog()onDismiss()}- SharedDialog(+ ConfirmDialog(title = stringResource(R.string.prefs_net_title),onCancel = onDismiss,onAccept = onAccept@@ -411,7 +411,7 @@ fun BluetoothOutputDialog()onDismiss()}- SharedDialog(+ ConfirmDialog(title = stringResource(R.string.prefs_bt_title),onCancel = onDismiss,onAccept = onAccept@@ -538,7 +538,7 @@ fun RadioControlDialog(onDismiss()}- SharedDialog(+ ConfirmDialog(title = stringResource(R.string.rc_settings_title),onCancel = onDismiss,onAccept = onAcceptdiff --git a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.ktindex dd71422f..63c3cf0f 100644--- a/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt+++ b/feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt@@ -74,6 +74,7 @@ import com.rtbishop.look4sat.core.presentation.PrimaryIconCardimport com.rtbishop.look4sat.core.presentation.Rimport com.rtbishop.look4sat.core.presentation.ScreenColumnimport com.rtbishop.look4sat.core.presentation.TopBar+import com.rtbishop.look4sat.core.presentation.WhatsNewDialogimport com.rtbishop.look4sat.core.presentation.infiniteMarqueeimport com.rtbishop.look4sat.core.presentation.isVerticalLayoutimport java.text.SimpleDateFormat@@ -198,6 +199,9 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->onSave = { onAction(SettingsAction.UpdateRadioControl(it)) })}+ if (dialogs.whatsNew) {+ WhatsNewDialog(onDismiss = { dialogs.whatsNew = false })+ }// URLs for top barval uriHandler = LocalUriHandler.current@@ -218,7 +222,7 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->if (isVerticalLayout) {TopBar {TopCard(- onClick = { safeOpenUri(appUrl) },+ onClick = { dialogs.whatsNew = true },version = uiState.appVersionName,modifier = Modifier.weight(1f))@@ -246,7 +250,7 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->TopBar {PrimaryIconCard(onClick = { safeOpenUri(donateUrl) }, resId = R.drawable.ic_like)TopCard(- onClick = { safeOpenUri(appUrl) },+ onClick = { dialogs.whatsNew = true },version = uiState.appVersionName,modifier = Modifier.weight(1f))@@ -718,6 +722,7 @@ private class DialogVisibility {var network by mutableStateOf(false)var bluetooth by mutableStateOf(false)var radioControl by mutableStateOf(false)+ var whatsNew by mutableStateOf(false)}@Composable@@ -725,12 +730,12 @@ private fun rememberDialogVisibility(): DialogVisibility {return rememberSaveable(saver = run {androidx.compose.runtime.saveable.Saver(save = {- listOf(it.position, it.locator, it.dataSources, it.network, it.bluetooth, it.radioControl)+ listOf(it.position, it.locator, it.dataSources, it.network, it.bluetooth, it.radioControl, it.whatsNew)},restore = {DialogVisibility().apply {position = it[0]; locator = it[1]; dataSources = it[2]- network = it[3]; bluetooth = it[4]; radioControl = it[5]+ network = it[3]; bluetooth = it[4]; radioControl = it[5]; whatsNew = it[6]}})diff --git a/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt b/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.ktindex ca301e11..27080a07 100644--- a/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt+++ b/feature/status/src/main/java/com/rtbishop/look4sat/feature/status/SatStatusScreen.kt@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width@@ -50,8 +51,8 @@ import com.rtbishop.look4sat.core.domain.model.SatReportimport com.rtbishop.look4sat.core.domain.model.SatSlotimport com.rtbishop.look4sat.core.domain.model.SatStatusimport com.rtbishop.look4sat.core.domain.repository.IContainerProvider+import com.rtbishop.look4sat.core.presentation.ConfirmDialogimport com.rtbishop.look4sat.core.presentation.R-import com.rtbishop.look4sat.core.presentation.SharedDialogimport com.rtbishop.look4sat.core.presentation.layoutPaddingimport java.util.Calendar@@ -279,12 +280,12 @@ private fun DayCell(slot: SatSlot, modifier: Modifier, onClick: () -> Unit) {@Composableprivate fun ReportDialog(statusName: String, day: SatDay, reports: Map<String, SatReport>, onDismiss: () -> Unit) {val dayReports = day.slots.flatMap { it.reportIds }.mapNotNull { reports[it] }- SharedDialog(title = "$statusName · ${day.dateLabel}", onCancel = onDismiss, onAccept = onDismiss) {+ ConfirmDialog(title = "$statusName · ${day.dateLabel}", onCancel = onDismiss, onAccept = onDismiss) {if (dayReports.isEmpty()) {Text(stringResource(id = R.string.amsat_no_reports))Spacer(modifier = Modifier.height(8.dp))} else {- LazyColumn {+ LazyColumn(modifier = Modifier.heightIn(max = 480.dp)) {items(dayReports) { report ->Column(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {Row(verticalAlignment = Alignment.CenterVertically) {