Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Updated dependencies and libraries versions
Arty Bishop7e2b3bc7123c
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt b/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.ktindex 2a8931ff..3ed0b167 100644--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt+++ b/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt@@ -31,7 +31,7 @@ interface ISettingsRepo {"All" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=active&FORMAT=csv","Amsat" to "https://amsat.org/tle/current/nasabare.txt","Amateur" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",- "Classified" to "https://www.prismnet.com/~mmccants/tles/classfd.zip",+ "Classified" to "https://www.mmccants.org/tles/classfd.zip","Cubesat" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv","Education" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=education&FORMAT=csv","Engineer" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=engineering&FORMAT=csv",@@ -40,7 +40,7 @@ interface ISettingsRepo {"GNSS" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=gnss&FORMAT=csv","Intelsat" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=csv","Iridium" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=csv",- "McCants" to "https://www.prismnet.com/~mmccants/tles/inttles.zip",+ "McCants" to "https://www.mmccants.org/tles/inttles.zip","Military" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=military&FORMAT=csv","New" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=csv","OneWeb" to "https://celestrak.com/NORAD/elements/gp.php?GROUP=oneweb&FORMAT=csv",diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsSource.kt b/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsSource.ktdeleted file mode 100644index 6fedf431..00000000--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsSource.kt+++ /dev/null@@ -1,125 +0,0 @@-/*- * Look4Sat. Amateur radio satellite tracker and pass predictor.- * Copyright (C) 2019-2022 Arty Bishop ([email protected])- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU General Public License as published by- * the Free Software Foundation, either version 3 of the License, or- * (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU General Public License for more details.- *- * You should have received a copy of the GNU General Public License- * along with this program. If not, see <https://www.gnu.org/licenses/>.- */-package com.rtbishop.look4sat.domain--import com.rtbishop.look4sat.model.GeoPos--interface ISettingsSource {-- val sourcesMap: Map<String, String>- get() = mapOf(- "All" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=active&FORMAT=csv",- "Amateur" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=amateur&FORMAT=csv",- "Classified" to "https://www.mmccants.org/~mmccants/tles/classfd.zip",- "Cubesat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=cubesat&FORMAT=csv",- "Education" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=education&FORMAT=csv",- "Engineer" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=engineering&FORMAT=csv",- "Geostationary" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=geo&FORMAT=csv",- "Globalstar" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=globalstar&FORMAT=csv",- "GNSS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=gnss&FORMAT=csv",- "Intelsat" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=intelsat&FORMAT=csv",- "Iridium" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=iridium-NEXT&FORMAT=csv",- "McCants" to "https://www.mmccants.org/tles/inttles.zip",- "Military" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=military&FORMAT=csv",- "New" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=last-30-days&FORMAT=csv",- "OneWeb" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=oneweb&FORMAT=csv",- "Orbcomm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=orbcomm&FORMAT=csv",- "R4UAB" to "https://r4uab.ru/satonline.txt",- "Resource" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=resource&FORMAT=csv",- "SatNOGS" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=satnogs&FORMAT=csv",- "Science" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=science&FORMAT=csv",- "Spire" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=spire&FORMAT=csv",- "Starlink" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=starlink&FORMAT=csv",- "Swarm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=swarm&FORMAT=csv",- "Weather" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=csv",- "X-Comm" to "https://celestrak.org/NORAD/elements/gp.php?GROUP=x-comm&FORMAT=csv",- "Amsat" to "https://amsat.org/tle/current/nasabare.txt"- )-- fun loadStationPosition(): GeoPos-- fun saveStationPosition(stationPos: GeoPos)-- fun getHoursAhead(): Int-- fun setHoursAhead(hoursAhead: Int)-- fun getMinElevation(): Double-- fun setMinElevation(minElevation: Double)-- fun isUtcEnabled(): Boolean-- fun setUtcState(value: Boolean)-- fun getLastUpdateTime(): Long-- fun setLastUpdateTime(updateTime: Long)-- fun isUpdateEnabled(): Boolean-- fun setUpdateState(value: Boolean)-- fun isSensorEnabled(): Boolean-- fun setSensorState(value: Boolean)-- fun isSweepEnabled(): Boolean-- fun setSweepState(value: Boolean)-- fun saveModesSelection(modes: List<String>)-- fun loadModesSelection(): List<String>-- fun saveEntriesSelection(catnums: List<Int>)-- fun loadEntriesSelection(): List<Int>-- fun saveSatType(type: String, catnums: List<Int>)-- fun loadSatType(type: String): List<Int>-- fun getRotatorEnabled(): Boolean-- fun setRotatorEnabled(value: Boolean)-- fun getRotatorServer(): String-- fun setRotatorServer(value: String)-- fun getRotatorPort(): String-- fun setRotatorPort(value: String)-- fun getBTEnabled(): Boolean-- fun setBTEnabled(value: Boolean)-- fun getBTDeviceAddr(): String-- fun setBTDeviceAddr(value: String)-- fun getBTDeviceName(): String-- fun setBTDeviceName(value: String)-- fun getBTFormat(): String-- fun setBTFormat(value: String)-}diff --git a/build.gradle b/build.gradleindex cab1902a..6314c9d8 100644--- a/build.gradle+++ b/build.gradle@@ -1,6 +1,6 @@buildscript {ext {- gradle_plugin_version = '7.4.2'+ gradle_plugin_version = '8.0.0'library_plugin_version = '7.1.2'ksp_version = '1.8.10-1.0.9'kotlin_android_version = '1.8.10'@@ -9,18 +9,18 @@ buildscript {room_version = '2.5.1'// Composeactivity_compose_version = '1.7.0'- compose_version = '1.4.0'- compose_compiler_version = '1.4.4'+ compose_version = '1.4.1'+ compose_compiler_version = '1.4.5'material3_version = '1.0.1'lifecycle_version = '2.6.1'navigation_version = '2.5.3'// Utility- osmdroid_version = '6.1.14'+ osmdroid_version = '6.1.16'json_version = '20230227'leakcanary_version = '2.10'// Testjunit_version = '4.13.2'- mockk_version = '1.13.4'+ mockk_version = '1.13.5'coroutines_test_version = '1.6.4'}}diff --git a/gradle.properties b/gradle.propertiesindex b08d9e91..10e1ded4 100644--- a/gradle.properties+++ b/gradle.properties@@ -21,7 +21,9 @@# 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=true+android.defaults.buildfeatures.buildconfig=falseandroid.enableJetifier=false+android.nonFinalResIds=falseandroid.nonTransitiveRClass=trueandroid.useAndroidX=truekotlin.code.style=officialdiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex e4c44573..e1571ed3 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@-#Mon Mar 20 10:37:41 GMT 2023+#Fri Apr 14 10:44:38 BST 2023distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zipzipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists