Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Changes to location and settings handlers
Arty Bishop72f78e5c6bda
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/LocationHandler.kt b/app/src/main/java/com/rtbishop/look4sat/framework/LocationHandler.ktindex 28b4f7dd..a4b79a90 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/LocationHandler.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/LocationHandler.kt@@ -29,9 +29,9 @@ import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.data.ISettingsHandlerimport com.rtbishop.look4sat.domain.ILocationHandlerimport com.rtbishop.look4sat.domain.QthConverter+import com.rtbishop.look4sat.domain.QthConverter.roundimport com.rtbishop.look4sat.domain.model.DataStateimport com.rtbishop.look4sat.domain.predict.GeoPos-import com.rtbishop.look4sat.presentation.roundimport dagger.hilt.android.qualifiers.ApplicationContextimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlow@@ -51,10 +51,13 @@ class LocationHandler @Inject constructor(private val locationCoarse = Manifest.permission.ACCESS_COARSE_LOCATIONprivate val locationFine = Manifest.permission.ACCESS_FINE_LOCATIONprivate val _stationPosition = MutableStateFlow<DataState<GeoPos>>(DataState.Handled)+ private var currentLocator = settingsHandler.loadStationLocator()private var currentPosition = settingsHandler.loadStationPosition()override val stationPosition: StateFlow<DataState<GeoPos>> = _stationPosition+ override fun getStationLocator(): String = currentLocator+override fun getStationPosition(): GeoPos = currentPositionoverride fun setStationPosition(latitude: Double, longitude: Double) {@@ -62,11 +65,17 @@ class LocationHandler @Inject constructor(val tempLon = if (longitude > 180.0) longitude - 180 else longitudeval newLat = latitude.round(4)val newLon = tempLon.round(4)- currentPosition = GeoPos(newLat, newLon)- settingsHandler.saveStationPosition(newLat, newLon)- _stationPosition.value = DataState.Success(currentPosition)- } else _stationPosition.value =- DataState.Error(context.getString(R.string.pref_pos_manual_error))+ QthConverter.positionToQth(newLat, newLon)?.let { locator ->+ currentLocator = locator+ currentPosition = GeoPos(newLat, newLon)+ settingsHandler.saveStationLocator(locator)+ settingsHandler.saveStationPosition(currentPosition)+ _stationPosition.value = DataState.Success(currentPosition)+ }+ } else {+ _stationPosition.value =+ DataState.Error(context.getString(R.string.pref_pos_manual_error))+ }}override fun setPositionFromGps() {@@ -79,8 +88,9 @@ class LocationHandler @Inject constructor(_stationPosition.value = DataState.Loadingmanager.requestLocationUpdates(providerGps, 0L, 0f, this)}- } else _stationPosition.value =- DataState.Error(context.getString(R.string.pref_pos_gps_null))+ } else {+ _stationPosition.value = DataState.Error(context.getString(R.string.pref_pos_gps_null))+ }}override fun setPositionFromNet() {@@ -93,16 +103,22 @@ class LocationHandler @Inject constructor(_stationPosition.value = DataState.Loadingmanager.requestLocationUpdates(providerNet, 0L, 0f, this)}- } else _stationPosition.value =- DataState.Error(context.getString(R.string.pref_pos_gps_null))+ } else {+ _stationPosition.value = DataState.Error(context.getString(R.string.pref_pos_gps_null))+ }}- override fun setPositionFromQth(qthString: String) {- val position = QthConverter.qthToPosition(qthString)+ override fun setPositionFromQth(locator: String) {+ val position = QthConverter.qthToPosition(locator)if (position != null) {- setStationPosition(position.latitude, position.longitude)- } else _stationPosition.value =- DataState.Error(context.getString(R.string.pref_pos_qth_error))+ currentLocator = locator+ currentPosition = position+ settingsHandler.saveStationLocator(locator)+ settingsHandler.saveStationPosition(currentPosition)+ _stationPosition.value = DataState.Success(currentPosition)+ } else {+ _stationPosition.value = DataState.Error(context.getString(R.string.pref_pos_qth_error))+ }}override fun setPositionHandled() {diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.ktindex 0620130c..4ffea66a 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt@@ -42,11 +42,18 @@ class SettingsHandler @Inject constructor(private val prefs: SharedPreferences)const val keyRotatorPort = "rotatorPort"const val keyLatitude = "stationLat"const val keyLongitude = "stationLon"-// const val keyPositionGPS = "setPositionGPS"-// const val keyPositionQTH = "setPositionQTH"+ const val keyLocator = "stationQTH"const val keySelection = "selection"}+ override fun loadStationLocator(): String {+ return prefs.getString(keyLocator, null) ?: "null"+ }++ override fun saveStationLocator(locator: String) {+ prefs.edit { putString(keyLocator, locator) }+ }+override fun loadStationPosition(): GeoPos {val defaultSP = "0.0"val latitude = prefs.getString(keyLatitude, null) ?: defaultSP@@ -54,10 +61,10 @@ class SettingsHandler @Inject constructor(private val prefs: SharedPreferences)return GeoPos(latitude.toDouble(), longitude.toDouble())}- override fun saveStationPosition(latitude: Double, longitude: Double) {+ override fun saveStationPosition(position: GeoPos) {prefs.edit {- putString(keyLatitude, latitude.toString())- putString(keyLongitude, longitude.toString())+ putString(keyLatitude, position.latitude.toString())+ putString(keyLongitude, position.longitude.toString())}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocationDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocationDialog.ktindex f5fcf277..4bee695b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocationDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocationDialog.kt@@ -7,8 +7,8 @@ import android.view.ViewGroupimport android.view.WindowManagerimport androidx.appcompat.app.AppCompatDialogFragmentimport com.rtbishop.look4sat.R+import com.rtbishop.look4sat.data.ISettingsHandlerimport com.rtbishop.look4sat.databinding.DialogLocationBinding-import com.rtbishop.look4sat.domain.ILocationHandlerimport com.rtbishop.look4sat.presentation.setNavResultimport dagger.hilt.android.AndroidEntryPointimport javax.inject.Inject@@ -17,7 +17,7 @@ import javax.inject.Injectclass LocationDialog : AppCompatDialogFragment() {@Inject- lateinit var locationHandler: ILocationHandler+ lateinit var preferences: ISettingsHandleroverride fun onCreateView(inflater: LayoutInflater, group: ViewGroup?, state: Bundle?): View? {return inflater.inflate(R.layout.dialog_location, group, false)@@ -31,7 +31,7 @@ class LocationDialog : AppCompatDialogFragment() {(resources.displayMetrics.widthPixels * 0.94).toInt(),WindowManager.LayoutParams.WRAP_CONTENT)- val location = locationHandler.getStationPosition()+ val location = preferences.loadStationPosition()locationLatEdit.setText(location.latitude.toString())locationLonEdit.setText(location.longitude.toString())locationPosBtn.setOnClickListener {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocatorDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocatorDialog.ktindex 6ffc8e6a..5808913c 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocatorDialog.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/LocatorDialog.kt@@ -31,7 +31,7 @@ class LocatorDialog : AppCompatDialogFragment() {(resources.displayMetrics.widthPixels * 0.94).toInt(),WindowManager.LayoutParams.WRAP_CONTENT)-// locatorEdit.setText(preferences.getQthLocator())+ locatorEdit.setText(preferences.loadStationLocator())locatorPosBtn.setOnClickListener {setNavResult("locator", locatorEdit.text.toString())dismiss()diff --git a/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt b/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.ktindex f43333b8..7904118b 100644--- a/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt+++ b/core/src/main/java/com/rtbishop/look4sat/data/ISettingsHandler.kt@@ -29,9 +29,13 @@ interface ISettingsHandler {"https://amsat.org/tle/current/nasabare.txt")+ fun loadStationLocator(): String++ fun saveStationLocator(locator: String)+fun loadStationPosition(): GeoPos- fun saveStationPosition(latitude: Double, longitude: Double)+ fun saveStationPosition(position: GeoPos)fun getHoursAhead(): Intdiff --git a/core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt b/core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.ktindex 31907102..23a7979a 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt@@ -8,6 +8,8 @@ interface ILocationHandler {val stationPosition: SharedFlow<DataState<GeoPos>>+ fun getStationLocator(): String+fun getStationPosition(): GeoPosfun setStationPosition(latitude: Double, longitude: Double)@@ -16,7 +18,7 @@ interface ILocationHandler {fun setPositionFromNet()- fun setPositionFromQth(qthString: String)+ fun setPositionFromQth(locator: String)fun setPositionHandled()}diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt b/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.ktindex e9ee8e66..ab37165e 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt@@ -22,17 +22,17 @@ import kotlin.math.roundobject QthConverter {- fun qthToPosition(qthString: String): GeoPos? {- val trimmedQth = qthString.take(6)- if (!isValidQth(trimmedQth)) return null+ fun qthToPosition(locator: String): GeoPos? {+ val trimmedQth = locator.take(6)+ if (!isValidLocator(trimmedQth)) return nullval lonFirst = (trimmedQth[0].uppercaseChar().code - 65) * 20val latFirst = (trimmedQth[1].uppercaseChar().code - 65) * 10val lonSecond = trimmedQth[2].toString().toInt() * 2val latSecond = trimmedQth[3].toString().toInt()val lonThird = (((trimmedQth[4].lowercaseChar().code - 97) / 12.0) + (1.0 / 24.0)) - 180val latThird = (((trimmedQth[5].lowercaseChar().code - 97) / 24.0) + (1.0 / 48.0)) - 90- val longitude = (lonFirst + lonSecond + lonThird).roundToDecimals(4)- val latitude = (latFirst + latSecond + latThird).roundToDecimals(4)+ val longitude = (lonFirst + lonSecond + lonThird).round(4)+ val latitude = (latFirst + latSecond + latThird).round(4)return GeoPos(latitude, longitude)}@@ -53,15 +53,14 @@ object QthConverter {}fun isValidPosition(lat: Double, lon: Double): Boolean {- return (lat > -90.0 && lat < 90.0) && (lon > -180.0 && lon < 360.0)+ return (lat >= -90.0 && lat <= 90.0) && (lon >= -180.0 && lon <= 360.0)}- private fun isValidQth(qthString: String): Boolean {- val qthPattern = "[a-xA-X][a-xA-X][0-9][0-9][a-xA-X][a-xA-X]".toRegex()- return qthString.matches(qthPattern)+ fun isValidLocator(locator: String): Boolean {+ return locator.matches("[a-xA-X][a-xA-X][0-9][0-9][a-xA-X][a-xA-X]".toRegex())}- private fun Double.roundToDecimals(decimals: Int): Double {+ fun Double.round(decimals: Int): Double {var multiplier = 1.0repeat(decimals) { multiplier *= 10 }return round(this * multiplier) / multiplier