Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Fixed pass preferences values handling

Arty Bishop72f71b21538e
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt
index 838d5ce1..f5b20e22 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsHandler.kt
@@ -21,6 +21,7 @@ import android.content.SharedPreferences
import androidx.core.content.edit
import com.rtbishop.look4sat.data.ISettingsHandler
import com.rtbishop.look4sat.domain.predict.GeoPos
+import com.rtbishop.look4sat.presentation.getDouble
import com.rtbishop.look4sat.presentation.putDouble
import javax.inject.Inject
import javax.inject.Singleton
@@ -68,7 +69,7 @@ class SettingsHandler @Inject constructor(private val prefs: SharedPreferences)
}
override fun getMinElevation(): Double {
- return prefs.getInt(keyMinElevation, 16).toDouble()
+ return prefs.getDouble(keyMinElevation, 16.0)
}
override fun setMinElevation(minElevation: Double) {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt
index c3bb2de8..b714324b 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesPrefsDialog.kt
@@ -33,11 +33,17 @@ class PassesPrefsDialog : AppCompatDialogFragment() {
hoursAheadEdit.setText(preferences.getHoursAhead().toString())
minElevEdit.setText(preferences.getMinElevation().toString())
passPrefBtnPos.setOnClickListener {
- val hoursAheadText = hoursAheadEdit.text.toString()
- val hoursAhead = if (hoursAheadText.isNotEmpty()) hoursAheadText.toInt() else 8
- val minElevText = minElevEdit.text.toString()
- val minElev = if (minElevText.isNotEmpty()) minElevText.toDouble() else 16.0
- setNavResult("prefs", Pair(hoursAhead, minElev))
+ val hoursAhead = try {
+ hoursAheadEdit.text.toString().toInt()
+ } catch (exception: Exception) {
+ 8
+ }
+ val minElevation = try {
+ minElevEdit.text.toString().toDouble()
+ } catch (exception: Exception) {
+ 16.0
+ }
+ setNavResult("prefs", Pair(hoursAhead, minElevation))
dismiss()
}
passPrefBtnNeg.setOnClickListener { dismiss() }
diff --git a/app/src/main/res/layout/card_prefs_tracking.xml b/app/src/main/res/layout/card_prefs_tracking.xml
index cc4630ef..1302cf60 100644
--- a/app/src/main/res/layout/card_prefs_tracking.xml
+++ b/app/src/main/res/layout/card_prefs_tracking.xml
@@ -36,7 +36,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
- android:layout_marginEnd="4dp"
+ android:layout_marginEnd="6dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tracking_port"