From bfbe437ab1ef919ac73ef55ecc2bf0a133fe59fe Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 1 Nov 2025 16:37:26 +0000 Subject: [PATCH] Cleaned up classes and resources, updated dependencies --- app/build.gradle.kts | 2 +- app/proguard-rules.pro | 0 .../com/rtbishop/look4sat/MainActivity.kt | 16 +++--------- .../look4sat/presentation/MainScreen.kt | 4 +-- .../presentation/common/Components.kt | 2 +- .../presentation/passes/PassesDialog.kt | 2 +- .../presentation/passes/PassesScreen.kt | 2 +- .../presentation/radar/RadarScreen.kt | 4 +-- .../satellites/SatellitesScreen.kt | 13 +++------- .../presentation/settings/SettingsScreen.kt | 2 +- app/src/main/res/drawable/ic_arrow.xml | 6 ++--- app/src/main/res/drawable/ic_bitcoin.xml | 9 ------- app/src/main/res/drawable/ic_calendar.xml | 6 ++--- app/src/main/res/drawable/ic_clock.xml | 9 +++++++ app/src/main/res/drawable/ic_delete_one.xml | 9 ------- app/src/main/res/drawable/ic_delete_two.xml | 9 ------- app/src/main/res/drawable/ic_direction.xml | 9 ------- app/src/main/res/drawable/ic_dollar.xml | 9 ------- app/src/main/res/drawable/ic_email.xml | 9 ------- app/src/main/res/drawable/ic_fdroid.xml | 10 +++++++ app/src/main/res/drawable/ic_github.xml | 9 +++++++ app/src/main/res/drawable/ic_info.xml | 9 ------- app/src/main/res/drawable/ic_map.xml | 6 ++--- app/src/main/res/drawable/ic_moon.xml | 9 ------- .../main/res/drawable/ic_notifications.xml | 9 ------- app/src/main/res/drawable/ic_passes.xml | 6 ++--- app/src/main/res/drawable/ic_radar.xml | 9 +++++++ app/src/main/res/drawable/ic_radios.xml | 9 +++++++ app/src/main/res/drawable/ic_satellite.xml | 26 ------------------- .../{ic_sputnik.xml => ic_satellites.xml} | 0 app/src/main/res/drawable/ic_settings.xml | 2 +- app/src/main/res/drawable/ic_sun.xml | 9 ------- app/src/main/res/drawable/ic_tags.xml | 9 +++++++ app/src/main/res/drawable/ic_time.xml | 9 ------- app/src/main/res/values/strings.xml | 4 +-- .../look4sat/data/repository/SettingsRepo.kt | 2 +- gradle/libs.versions.toml | 10 +++---- gradle/wrapper/gradle-wrapper.properties | 4 +-- 38 files changed, 95 insertions(+), 178 deletions(-) delete mode 100644 app/proguard-rules.pro delete mode 100644 app/src/main/res/drawable/ic_bitcoin.xml create mode 100644 app/src/main/res/drawable/ic_clock.xml delete mode 100644 app/src/main/res/drawable/ic_delete_one.xml delete mode 100644 app/src/main/res/drawable/ic_delete_two.xml delete mode 100644 app/src/main/res/drawable/ic_direction.xml delete mode 100644 app/src/main/res/drawable/ic_dollar.xml delete mode 100644 app/src/main/res/drawable/ic_email.xml create mode 100644 app/src/main/res/drawable/ic_fdroid.xml create mode 100644 app/src/main/res/drawable/ic_github.xml delete mode 100644 app/src/main/res/drawable/ic_info.xml delete mode 100644 app/src/main/res/drawable/ic_moon.xml delete mode 100644 app/src/main/res/drawable/ic_notifications.xml create mode 100644 app/src/main/res/drawable/ic_radar.xml create mode 100644 app/src/main/res/drawable/ic_radios.xml delete mode 100644 app/src/main/res/drawable/ic_satellite.xml rename app/src/main/res/drawable/{ic_sputnik.xml => ic_satellites.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_sun.xml create mode 100644 app/src/main/res/drawable/ic_tags.xml delete mode 100644 app/src/main/res/drawable/ic_time.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6285d2d0..c286571e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,7 +31,7 @@ android { release { isMinifyEnabled = true isShrinkResources = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt")) } } androidResources { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt index 686b9918..aa5b8eb4 100644 --- a/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/MainActivity.kt @@ -23,16 +23,15 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge -import androidx.compose.runtime.collectAsState -import androidx.compose.ui.platform.LocalContext import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import com.rtbishop.look4sat.presentation.MainTheme import com.rtbishop.look4sat.presentation.MainScreen +import com.rtbishop.look4sat.presentation.MainTheme class MainActivity : ComponentActivity() { override fun attachBaseContext(newBase: Context?) { - overrideSystemFontAndDisplaySizeScaling(newBase) + val config = Configuration(newBase?.resources?.configuration) + applyOverrideConfiguration(config.apply { fontScale = 1.0f }) super.attachBaseContext(newBase) } @@ -41,14 +40,7 @@ class MainActivity : ComponentActivity() { enableEdgeToEdge() super.onCreate(savedInstanceState) setContent { - val container = (LocalContext.current.applicationContext as MainApplication).container - val otherSettings = container.settingsRepo.otherSettings.collectAsState().value - MainTheme(isDarkTheme = !otherSettings.stateOfLightTheme) { MainScreen() } + MainTheme(isDarkTheme = true) { MainScreen() } } } - - private fun overrideSystemFontAndDisplaySizeScaling(newBase: Context?) { - val newConfig = Configuration(newBase?.resources?.configuration).apply { fontScale = 1.0f } - applyOverrideConfiguration(newConfig) - } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt index c608789a..a942099a 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt @@ -20,9 +20,9 @@ import com.rtbishop.look4sat.presentation.satellites.satellitesDestination import com.rtbishop.look4sat.presentation.settings.settingsDestination sealed class Screen(val route: String, val iconResId: Int, val titleResId: Int) { - data object Satellites : Screen("satellites", R.drawable.ic_sputnik, R.string.nav_satellites) + data object Satellites : Screen("satellites", R.drawable.ic_satellites, R.string.nav_satellites) data object Passes : Screen("passes", R.drawable.ic_passes, R.string.nav_passes) - data object Radar : Screen("radar", R.drawable.ic_satellite, R.string.nav_radar) + data object Radar : Screen("radar", R.drawable.ic_radar, R.string.nav_radar) data object Map : Screen("map", R.drawable.ic_map, R.string.nav_map) data object Settings : Screen("settings", R.drawable.ic_settings, R.string.nav_settings) } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt index 1ce7998b..d3abc6a8 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt @@ -56,7 +56,7 @@ private fun TopBarPreview() = MainTheme { TopBar { IconCard(action = {}, resId = R.drawable.ic_filter) TimerRow(timeString = "88:88:88", isTimeAos = true) - IconCard(action = {}, resId = R.drawable.ic_satellite) + IconCard(action = {}, resId = R.drawable.ic_radios) } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt index 6e56cb34..732d3d4d 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt @@ -85,7 +85,7 @@ fun PassesDialog(hours: Int, elevation: Double, cancel: () -> Unit, accept: (Int title = "Show passes within", value = hoursValue.intValue.toDouble(), valuePostfix = "h", - valueResId = R.drawable.ic_time, + valueResId = R.drawable.ic_clock, valueRange = 1f..240f ) { hoursValue.intValue = it.toInt() } } 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.kt index d11ad32e..1e3ac9a4 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 @@ -116,7 +116,7 @@ private fun PassesScreen(uiState: PassesState, navigateToRadar: (Int, Long) -> U NextPassRow(pass = uiState.nextPass) }, endAction = { - IconCard(action = showRadiosDialog, resId = R.drawable.ic_satellite) + IconCard(action = showRadiosDialog, resId = R.drawable.ic_radios) } ) } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt index a97ef24c..48049587 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt @@ -160,7 +160,7 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) { verticalArrangement = Arrangement.Center ) { Icon( - painter = painterResource(R.drawable.ic_satellite), + painter = painterResource(R.drawable.ic_radios), contentDescription = null, modifier = Modifier.size(64.dp) ) @@ -245,7 +245,7 @@ private fun RadarScreen(uiState: RadarState, navigateUp: () -> Unit) { verticalArrangement = Arrangement.Center ) { Icon( - painter = painterResource(R.drawable.ic_satellite), + painter = painterResource(R.drawable.ic_radios), contentDescription = null, modifier = Modifier.size(64.dp) ) diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt index 35aa39eb..208c1050 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt @@ -6,10 +6,10 @@ 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.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid @@ -186,15 +186,10 @@ private fun TypeCard(types: List, onClick: () -> Unit, modifier: Modifie modifier = Modifier .height(48.dp) .clickable { onClick() }) { - Icon( - painter = painterResource(id = R.drawable.ic_arrow), - contentDescription = null, - modifier = Modifier - .size(36.dp) - .padding(start = 6.dp) - ) + Spacer(Modifier) + Icon(painter = painterResource(id = R.drawable.ic_tags), contentDescription = null) Text( - text = "Types: $typesText", + text = "Tags: $typesText", fontSize = 16.sp, fontWeight = FontWeight.Medium, modifier = Modifier diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt index 0ab5630b..36743ce6 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt @@ -180,7 +180,7 @@ private fun CardAbout(version: String, sendUrlAction: (SystemAction) -> Unit = { verticalAlignment = Alignment.CenterVertically ) { Icon( - painter = painterResource(id = R.drawable.ic_sputnik), + painter = painterResource(id = R.drawable.ic_satellites), tint = MaterialTheme.colorScheme.primary, contentDescription = null, modifier = Modifier.size(72.dp) diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index 5fbe7d44..ff7bfb11 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z" /> diff --git a/app/src/main/res/drawable/ic_bitcoin.xml b/app/src/main/res/drawable/ic_bitcoin.xml deleted file mode 100644 index a7efea3a..00000000 --- a/app/src/main/res/drawable/ic_bitcoin.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml index 361a3ec7..d797de2c 100644 --- a/app/src/main/res/drawable/ic_calendar.xml +++ b/app/src/main/res/drawable/ic_calendar.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M200,320L760,320L760,240Q760,240 760,240Q760,240 760,240L200,240Q200,240 200,240Q200,240 200,240L200,320ZM200,320L200,240Q200,240 200,240Q200,240 200,240L200,240Q200,240 200,240Q200,240 200,240L200,320ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240Q120,207 143.5,183.5Q167,160 200,160L240,160L240,80L320,80L320,160L640,160L640,80L720,80L720,160L760,160Q793,160 816.5,183.5Q840,207 840,240L840,467Q821,458 801,452Q781,446 760,443L760,400L200,400L200,800Q200,800 200,800Q200,800 200,800L452,800Q459,822 468.5,842Q478,862 491,880L200,880ZM720,920Q637,920 578.5,861.5Q520,803 520,720Q520,637 578.5,578.5Q637,520 720,520Q803,520 861.5,578.5Q920,637 920,720Q920,803 861.5,861.5Q803,920 720,920ZM787,815L815,787L740,712L740,600L700,600L700,728L787,815Z" /> diff --git a/app/src/main/res/drawable/ic_clock.xml b/app/src/main/res/drawable/ic_clock.xml new file mode 100644 index 00000000..56624fa1 --- /dev/null +++ b/app/src/main/res/drawable/ic_clock.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_one.xml b/app/src/main/res/drawable/ic_delete_one.xml deleted file mode 100644 index 6c6f704a..00000000 --- a/app/src/main/res/drawable/ic_delete_one.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_two.xml b/app/src/main/res/drawable/ic_delete_two.xml deleted file mode 100644 index ece785a6..00000000 --- a/app/src/main/res/drawable/ic_delete_two.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_direction.xml b/app/src/main/res/drawable/ic_direction.xml deleted file mode 100644 index 1c9f2aae..00000000 --- a/app/src/main/res/drawable/ic_direction.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_dollar.xml b/app/src/main/res/drawable/ic_dollar.xml deleted file mode 100644 index ba621721..00000000 --- a/app/src/main/res/drawable/ic_dollar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml deleted file mode 100644 index 4d54e4d8..00000000 --- a/app/src/main/res/drawable/ic_email.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_fdroid.xml b/app/src/main/res/drawable/ic_fdroid.xml new file mode 100644 index 00000000..4452bb71 --- /dev/null +++ b/app/src/main/res/drawable/ic_fdroid.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml new file mode 100644 index 00000000..0a7556fa --- /dev/null +++ b/app/src/main/res/drawable/ic_github.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml deleted file mode 100644 index 8e9cc5f1..00000000 --- a/app/src/main/res/drawable/ic_info.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 7a1ab400..d9097fef 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M600,840L360,756L174,828Q154,836 137,823.5Q120,811 120,790L120,230Q120,217 127.5,207Q135,197 148,192L360,120L600,204L786,132Q806,124 823,136.5Q840,149 840,170L840,730Q840,743 832.5,753Q825,763 812,768L600,840ZM560,742L560,274L400,218L400,686L560,742ZM640,742L760,702L760,228L640,274L640,742ZM200,732L320,686L320,218L200,258L200,732ZM640,274L640,274L640,742L640,742L640,274ZM320,218L320,218L320,686L320,686L320,218Z" /> diff --git a/app/src/main/res/drawable/ic_moon.xml b/app/src/main/res/drawable/ic_moon.xml deleted file mode 100644 index 0633e81e..00000000 --- a/app/src/main/res/drawable/ic_moon.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml deleted file mode 100644 index 3b02d07c..00000000 --- a/app/src/main/res/drawable/ic_notifications.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_passes.xml b/app/src/main/res/drawable/ic_passes.xml index a9cc0761..f44b9a16 100644 --- a/app/src/main/res/drawable/ic_passes.xml +++ b/app/src/main/res/drawable/ic_passes.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M80,800L80,640L240,640L240,800L80,800ZM320,800L320,640L880,640L880,800L320,800ZM80,560L80,400L240,400L240,560L80,560ZM320,560L320,400L880,400L880,560L320,560ZM80,320L80,160L240,160L240,320L80,320ZM320,320L320,160L880,160L880,320L320,320Z" /> diff --git a/app/src/main/res/drawable/ic_radar.xml b/app/src/main/res/drawable/ic_radar.xml new file mode 100644 index 00000000..fbfcebb2 --- /dev/null +++ b/app/src/main/res/drawable/ic_radar.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_radios.xml b/app/src/main/res/drawable/ic_radios.xml new file mode 100644 index 00000000..c59f3cec --- /dev/null +++ b/app/src/main/res/drawable/ic_radios.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_satellite.xml b/app/src/main/res/drawable/ic_satellite.xml deleted file mode 100644 index 63a29749..00000000 --- a/app/src/main/res/drawable/ic_satellite.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_satellites.xml similarity index 100% rename from app/src/main/res/drawable/ic_sputnik.xml rename to app/src/main/res/drawable/ic_satellites.xml diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index a4655095..171efabd 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -5,5 +5,5 @@ android:viewportHeight="960"> + android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z" /> diff --git a/app/src/main/res/drawable/ic_sun.xml b/app/src/main/res/drawable/ic_sun.xml deleted file mode 100644 index 30348bdc..00000000 --- a/app/src/main/res/drawable/ic_sun.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_tags.xml b/app/src/main/res/drawable/ic_tags.xml new file mode 100644 index 00000000..ad7640ae --- /dev/null +++ b/app/src/main/res/drawable/ic_tags.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml deleted file mode 100644 index 33f9a689..00000000 --- a/app/src/main/res/drawable/ic_time.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f98d4288..33743768 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ Satellites Passes Radar - World Map + Map Settings @@ -85,7 +85,7 @@ Selected type: %s - Name / Id + Id - Name There are no upcoming satellite passes to display No data to show. Please update the database via Settings menu. diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt b/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt index a634a88b..3fc244c4 100644 --- a/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt +++ b/data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt @@ -91,7 +91,7 @@ class SettingsRepo(private val manager: LocationManager, private val preferences private fun getSelectedTypes(): List { val typesString = preferences.getString(keySelectedTypes, null) - if (typesString.isNullOrEmpty()) return emptyList() + if (typesString.isNullOrEmpty()) return listOf("Amateur") return typesString.split(separatorComma) } //endregion diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 041b9089..d5b94caf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] android-gradle-plugin = "8.13.0" -google-ksp = "2.2.20-2.0.2" -kotlin = "2.2.20" +google-ksp = "2.3.0" +kotlin = "2.2.21" androidx-core-ktx = "1.17.0" androidx-core-splashscreen = "1.0.1" -androidx-room = "2.8.2" +androidx-room = "2.8.3" -compose-bom = "2025.10.00" +compose-bom = "2025.10.01" compose-activity = "1.11.0" compose-lifecycle = "2.9.4" compose-navigation = "2.9.5" other-coroutines = "1.10.2" other-json = "20250517" -other-okhttp = "5.2.1" +other-okhttp = "5.3.0" other-osmdroid = "6.1.20" test-junit4 = "4.13.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0fc4db2d..beb18bd1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Sat Oct 11 13:47:56 BST 2025 +#Sat Nov 01 16:31:15 GMT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME