Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Updated gradle plugin and dependencies versions
Arty Bishop7191e02f9944
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex c6899c60..933b1ff2 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -32,7 +32,7 @@ android {sourceCompatibility = JavaVersion.VERSION_17targetCompatibility = JavaVersion.VERSION_17}- composeOptions { kotlinCompilerExtensionVersion = "1.4.7" }+ composeOptions { kotlinCompilerExtensionVersion = "1.5.1" }packaging { resources { excludes += listOf("META-INF/{AL2.0,LGPL2.1}") } }}diff --git a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt b/app/src/main/java/com/rtbishop/look4sat/MainApplication.ktindex 6877d711..b993f38b 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainApplication.kt@@ -18,10 +18,10 @@package com.rtbishop.look4satimport android.app.Application-import kotlinx.coroutines.launchimport java.text.SimpleDateFormatimport java.util.Dateimport java.util.Locale+import kotlinx.coroutines.launchclass MainApplication : Application() {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.ktindex 721f36fe..1d186bff 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt@@ -3,7 +3,10 @@ package com.rtbishop.look4sat.presentationimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.padding-import androidx.compose.material3.*+import androidx.compose.material3.Icon+import androidx.compose.material3.NavigationBar+import androidx.compose.material3.NavigationBarItem+import androidx.compose.material3.Scaffoldimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.painterResource@@ -23,14 +26,13 @@ import com.rtbishop.look4sat.presentation.radar.RadarScreenimport com.rtbishop.look4sat.presentation.settings.SettingsScreensealed class Screen(var title: String, var icon: Int, var route: String) {- object Entries : Screen("Entries", R.drawable.ic_entries, "entries")- object Passes : Screen("Passes", R.drawable.ic_passes, "passes")- object Radar : Screen("Radar", R.drawable.ic_radar, "radar")- object Map : Screen("World Map", R.drawable.ic_world_map, "world_map")- object Settings : Screen("Settings", R.drawable.ic_settings, "settings")+ data object Entries : Screen("Entries", R.drawable.ic_entries, "entries")+ data object Passes : Screen("Passes", R.drawable.ic_passes, "passes")+ data object Radar : Screen("Radar", R.drawable.ic_radar, "radar")+ data object Map : Screen("World Map", R.drawable.ic_world_map, "world_map")+ data object Settings : Screen("Settings", R.drawable.ic_settings, "settings")}-@OptIn(ExperimentalMaterial3Api::class)@Composablefun MainScreen(navController: NavHostController = rememberNavController()) {Scaffold(bottomBar = { MainNavBar(navController = navController) }) { innerPadding ->diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.ktindex 786e5e05..277252fc 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/FilterDialog.kt@@ -21,7 +21,10 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.material3.*+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.saveable.rememberSaveable@@ -38,17 +41,13 @@ private fun FilterDialogPreview() {MainTheme { FilterDialog(8, 16.0, {}) { _, _ -> } }}-@OptIn(ExperimentalMaterial3Api::class)@Composablefun FilterDialog(hours: Int, elevation: Double, toggle: () -> Unit, save: (Int, Double) -> Unit) {val hoursValue = rememberSaveable { mutableStateOf(hours) }val elevValue = rememberSaveable { mutableStateOf(elevation) }Dialog(onDismissRequest = { toggle() }) {ElevatedCard {- Column(- horizontalAlignment = Alignment.CenterHorizontally,- modifier = Modifier.fillMaxWidth(1f)- ) {+ Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth(1f)) {Text(text = "Filter passes", color = MaterialTheme.colorScheme.primary)Text(text = "Show passes that occur within X hours")OutlinedTextField(value = hoursValue.value.toString(), onValueChange = { newValue ->@@ -68,10 +67,7 @@ fun FilterDialog(hours: Int, elevation: Double, toggle: () -> Unit, save: (Int,}elevValue.value = maxElevation})- Row(- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {+ Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {CardButton(onClick = { toggle() }, text = "Cancel")CardButton(onClick = {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/LocatorDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/LocatorDialog.ktindex 51263f82..4935d9a7 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/LocatorDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/LocatorDialog.kt@@ -4,7 +4,10 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.material3.*+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.saveable.rememberSaveable@@ -23,29 +26,17 @@ private fun LocatorDialogPreview() {MainTheme { LocatorDialog("IO91vl", {}) { } }}-@OptIn(ExperimentalMaterial3Api::class)@Composablefun LocatorDialog(qthLocator: String, hide: () -> Unit, save: (String) -> Unit) {val locator = rememberSaveable { mutableStateOf(qthLocator) }Dialog(onDismissRequest = { hide() }) {ElevatedCard {- Column(- horizontalAlignment = Alignment.CenterHorizontally,- modifier = Modifier.fillMaxWidth(1f)- ) {- Text(- text = stringResource(id = R.string.locator_title),- color = MaterialTheme.colorScheme.primary- )+ Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth(1f)) {+ Text(text = stringResource(id = R.string.locator_title), color = MaterialTheme.colorScheme.primary)Text(text = stringResource(id = R.string.locator_text))OutlinedTextField(value = locator.value, onValueChange = { locator.value = it })- Row(- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {- CardButton(- onClick = { hide() }, text = stringResource(id = R.string.btn_cancel)- )+ Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {+ CardButton(onClick = { hide() }, text = stringResource(id = R.string.btn_cancel))CardButton(onClick = {save(locator.value)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/ModesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/ModesDialog.ktindex bec1a3ef..dd1859f9 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/ModesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/ModesDialog.kt@@ -2,11 +2,19 @@ package com.rtbishop.look4sat.presentation.dialogsimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.layout.*+import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.fillMaxHeight+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.items-import androidx.compose.material3.*+import androidx.compose.material3.Checkbox+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.Surface+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember@@ -26,7 +34,7 @@ private val allModes = listOf("LRPT", "LSB", "MFSK", "MSK", "MSK AX.100 Mode 5", "MSK AX.100 Mode 6", "OFDM", "OQPSK","PSK", "PSK31", "PSK63", "QPSK", "QPSK31", "QPSK63", "SSTV", "USB", "WSJT")-private val selectedModes = mutableListOf<String>("AFSK", "AFSK S-Net")+private val selectedModes = mutableListOf("AFSK", "AFSK S-Net")@Preview(showBackground = true)@Composable@@ -41,12 +49,7 @@ private fun ModesDialogPreview() {}@Composable-fun ModesDialog(- list: List<String>,- selected: List<String>,- toggle: () -> Unit,- click: (String) -> Unit-) {+fun ModesDialog(list: List<String>, selected: List<String>, toggle: () -> Unit, click: (String) -> Unit) {Dialog(onDismissRequest = { toggle() }) {ElevatedCard(modifier = Modifier.fillMaxHeight(0.9f)) {LazyVerticalGrid(diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/PositionDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/PositionDialog.ktindex 2b5de5dc..8863b613 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/PositionDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/PositionDialog.kt@@ -4,7 +4,10 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.material3.*+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.saveable.rememberSaveable@@ -23,32 +26,22 @@ private fun PositionDialogPreview() {MainTheme { PositionDialog(0.0, 0.0, {}) { _, _ -> } }}-@OptIn(ExperimentalMaterial3Api::class)@Composablefun PositionDialog(lat: Double, lon: Double, hide: () -> Unit, save: (Double, Double) -> Unit) {val latValue = rememberSaveable { mutableStateOf(lat.toString()) }val lonValue = rememberSaveable { mutableStateOf(lon.toString()) }Dialog(onDismissRequest = { hide() }) {ElevatedCard {- Column(- horizontalAlignment = Alignment.CenterHorizontally,- modifier = Modifier.fillMaxWidth(1f)- ) {+ Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth(1f)) {Text(- text = stringResource(id = R.string.position_title),- color = MaterialTheme.colorScheme.primary+ text = stringResource(id = R.string.position_title), color = MaterialTheme.colorScheme.primary)Text(text = stringResource(id = R.string.position_lat_text))OutlinedTextField(value = latValue.value, onValueChange = { latValue.value = it })Text(text = stringResource(id = R.string.position_lon_text))OutlinedTextField(value = lonValue.value, onValueChange = { lonValue.value = it })- Row(- horizontalArrangement = Arrangement.SpaceBetween,- modifier = Modifier.fillMaxWidth()- ) {- CardButton(- onClick = { hide() }, text = stringResource(id = R.string.btn_cancel)- )+ Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {+ CardButton(onClick = { hide() }, text = stringResource(id = R.string.btn_cancel))CardButton(onClick = { saveValues(latValue.value, lonValue.value, hide, save) },text = stringResource(id = R.string.btn_accept)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/TypesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/TypesDialog.ktindex 11d0bf39..3d9a1d00 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/TypesDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/dialogs/TypesDialog.kt@@ -2,10 +2,18 @@ package com.rtbishop.look4sat.presentation.dialogsimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.layout.*+import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.fillMaxHeight+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.material3.*+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.RadioButton+import androidx.compose.material3.Surface+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.ktindex 337db202..1e9cc024 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt@@ -3,11 +3,26 @@ package com.rtbishop.look4sat.presentation.entriesimport androidx.compose.foundation.ExperimentalFoundationApiimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.layout.*+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.fillMaxSize+import androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.text.BasicTextField-import androidx.compose.material3.*+import androidx.compose.material3.CardDefaults+import androidx.compose.material3.Checkbox+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.Icon+import androidx.compose.material3.IconButton+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.Surface+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.saveable.rememberSaveable@@ -97,9 +112,7 @@ private fun SearchBar(setQuery: (String) -> Unit, modifier: Modifier = Modifier)singleLine = true,modifier = modifier.padding(start = 12.dp),textStyle = TextStyle(- fontSize = 16.sp,- fontWeight = FontWeight.Medium,- color = MaterialTheme.colorScheme.onSurface+ fontSize = 16.sp, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurface),decorationBox = { innerTextField ->if (currentQuery.value.isEmpty()) {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.ktindex 7a28d6a2..aa13c5b8 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt@@ -31,6 +31,10 @@ import com.rtbishop.look4sat.domain.repository.ISettingsRepoimport com.rtbishop.look4sat.domain.utility.QthConverterimport com.rtbishop.look4sat.domain.utility.toDegreesimport com.rtbishop.look4sat.domain.utility.toTimerString+import java.util.Date+import kotlin.collections.set+import kotlin.math.max+import kotlin.math.minimport kotlinx.coroutines.Jobimport kotlinx.coroutines.cancelAndJoinimport kotlinx.coroutines.delay@@ -39,10 +43,6 @@ import kotlinx.coroutines.flow.SharedFlowimport kotlinx.coroutines.flow.flowimport kotlinx.coroutines.isActiveimport kotlinx.coroutines.launch-import java.util.Date-import kotlin.collections.set-import kotlin.math.max-import kotlin.math.minclass MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISettingsRepo) : ViewModel() {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.ktindex 51cd2551..46137d5d 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt@@ -3,10 +3,25 @@ package com.rtbishop.look4sat.presentation.passesimport androidx.compose.foundation.ExperimentalFoundationApiimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.layout.*+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.fillMaxSize+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.material3.*+import androidx.compose.material3.ElevatedCard+import androidx.compose.material3.Icon+import androidx.compose.material3.IconButton+import androidx.compose.material3.LinearProgressIndicator+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.Surface+import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.mutableStateOf@@ -19,14 +34,15 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.tooling.preview.Preview-import androidx.compose.ui.unit.*+import androidx.compose.ui.unit.dp+import androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModelimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.domain.model.DataStateimport com.rtbishop.look4sat.domain.predict.NearEarthSatelliteimport com.rtbishop.look4sat.domain.predict.OrbitalDataimport com.rtbishop.look4sat.domain.predict.SatPass-import com.rtbishop.look4sat.presentation.*+import com.rtbishop.look4sat.presentation.MainThemeimport com.rtbishop.look4sat.presentation.dialogs.FilterDialogimport com.rtbishop.look4sat.presentation.pullRefresh.PullRefreshIndicatorimport com.rtbishop.look4sat.presentation.pullRefresh.PullRefreshStatediff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshIndicator.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshIndicator.ktindex 398ca648..338dbede 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshIndicator.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshIndicator.kt@@ -27,7 +27,11 @@ import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Surfaceimport androidx.compose.material3.contentColorFor-import androidx.compose.runtime.*+import androidx.compose.runtime.Composable+import androidx.compose.runtime.Immutable+import androidx.compose.runtime.derivedStateOf+import androidx.compose.runtime.getValue+import androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offsetdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.ktindex 285d6a07..103df10d 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/pullRefresh/PullRefreshState.kt@@ -17,14 +17,23 @@package com.rtbishop.look4sat.presentation.pullRefreshimport androidx.compose.animation.core.animate-import androidx.compose.runtime.*+import androidx.compose.runtime.Composable+import androidx.compose.runtime.SideEffect+import androidx.compose.runtime.State+import androidx.compose.runtime.derivedStateOf+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.rememberCoroutineScope+import androidx.compose.runtime.rememberUpdatedState+import androidx.compose.runtime.setValueimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dp-import kotlinx.coroutines.CoroutineScope-import kotlinx.coroutines.launchimport kotlin.math.absimport kotlin.math.pow+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.launch/*** Creates a [PullRefreshState] that is remembered across compositions.diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.ktindex dcfc1884..b8ae9e48 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt@@ -2,7 +2,10 @@package com.rtbishop.look4sat.presentation.radar-import androidx.compose.animation.core.*+import androidx.compose.animation.core.animateFloat+import androidx.compose.animation.core.infiniteRepeatable+import androidx.compose.animation.core.rememberInfiniteTransition+import androidx.compose.animation.core.tweenimport androidx.compose.foundation.Canvasimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.runtime.Composable@@ -10,9 +13,23 @@ import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offset-import androidx.compose.ui.graphics.*-import androidx.compose.ui.graphics.drawscope.*-import androidx.compose.ui.text.*+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.Path+import androidx.compose.ui.graphics.PathEffect+import androidx.compose.ui.graphics.PathMeasure+import androidx.compose.ui.graphics.ShaderBrush+import androidx.compose.ui.graphics.StampedPathEffectStyle+import androidx.compose.ui.graphics.SweepGradientShader+import androidx.compose.ui.graphics.drawscope.DrawScope+import androidx.compose.ui.graphics.drawscope.Fill+import androidx.compose.ui.graphics.drawscope.Stroke+import androidx.compose.ui.graphics.drawscope.rotate+import androidx.compose.ui.graphics.drawscope.translate+import androidx.compose.ui.text.ExperimentalTextApi+import androidx.compose.ui.text.TextMeasurer+import androidx.compose.ui.text.TextStyle+import androidx.compose.ui.text.drawText+import androidx.compose.ui.text.rememberTextMeasurerimport androidx.compose.ui.unit.spimport com.rtbishop.look4sat.domain.predict.PI_2import com.rtbishop.look4sat.domain.predict.SatPosdiff --git a/build.gradle.kts b/build.gradle.ktsindex 4c8a75c4..46e30fec 100644--- a/build.gradle.kts+++ b/build.gradle.kts@@ -1,8 +1,9 @@plugins {- id("com.android.application") version "8.0.2" apply false+ id("com.android.application") version "8.1.0" apply falseid("com.android.library") version "7.1.2" apply false- id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false- id("org.jetbrains.kotlin.android") version "1.8.21" apply false+ id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false+ id("org.jetbrains.kotlin.android") version "1.9.0" apply false+ id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false}tasks.register("clean", Delete::class.java) {diff --git a/data/src/main/java/com/rtbishop/look4sat/data/database/dao/StorageDao.kt b/data/src/main/java/com/rtbishop/look4sat/data/database/dao/StorageDao.ktindex cefc1560..4475b4db 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/database/dao/StorageDao.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/database/dao/StorageDao.kt@@ -17,7 +17,11 @@*/package com.rtbishop.look4sat.data.database.dao-import androidx.room.*+import androidx.room.Dao+import androidx.room.Insert+import androidx.room.OnConflictStrategy+import androidx.room.Query+import androidx.room.Transactionimport com.rtbishop.look4sat.data.database.entity.SatEntryimport com.rtbishop.look4sat.data.database.entity.SatItemimport com.rtbishop.look4sat.data.database.entity.SatRadiodiff --git a/domain/build.gradle.kts b/domain/build.gradle.ktsindex 1e4b7f46..e96663a2 100644--- a/domain/build.gradle.kts+++ b/domain/build.gradle.kts@@ -1,5 +1,5 @@plugins {- id("kotlin")+ id("org.jetbrains.kotlin.jvm")}kotlin {diff --git a/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.ktindex 0530c885..a3784511 100644--- a/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt@@ -21,6 +21,6 @@ sealed class DataState<out T> {data class Success<out T>(val data: T) : DataState<T>()data class Error(val resId: Int?) : DataState<Nothing>()data class Exception(val message: String?) : DataState<Nothing>()- object Handled : DataState<Nothing>()- object Loading : DataState<Nothing>()+ data object Handled : DataState<Nothing>()+ data object Loading : DataState<Nothing>()}diff --git a/gradle.properties b/gradle.propertiesindex 45e00774..42de5ff9 100644--- a/gradle.properties+++ b/gradle.properties@@ -1,26 +1,3 @@-# Project-wide Gradle settings.-# IDE (e.g. Android Studio) users:-# Gradle settings configured through the IDE *will override*-# any settings specified in this file.-# For more details on how to configure your build environment visit-# http://www.gradle.org/docs/current/userguide/build_environment.html-# Specifies the JVM arguments used for the daemon process.-# The setting is particularly useful for tweaking memory settings.-#org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8-# When configured, Gradle will run in incubating parallel mode.-# This option should only be used with decoupled projects. More details, visit-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects-# org.gradle.parallel=true-# AndroidX package structure to make it clearer which packages are bundled with the-# Android operating system, and which are packaged with your app"s APK-# https://developer.android.com/topic/libraries/support-library/androidx-rn-#android.useAndroidX=true-# Kotlin code style for this project: "official" or "obsolete":-#kotlin.code.style=official-# Enables namespacing of each library's R class so that its R class includes only the-# resources declared in the library itself and none from the library's dependencies,-# thereby reducing the size of the R class for that library-#android.nonTransitiveRClass=trueandroid.defaults.buildfeatures.buildconfig=falseandroid.enableJetifier=falseandroid.nonFinalResIds=true