mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-04 11:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added preferences values checks against null

Browse Source
This commit is contained in:
Arty Bishop committed 2020-01-03 18:57:02 +00:00
1 parent 3f96fb0933
commit f9438eb5f7
2 files changed
+41 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/rtbishop/look4sat/ui/SettingsFragment.kt
+4 -4
View File
@@ -58,7 +58,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
InputType.TYPE_NUMBER_FLAG_SIGNED InputType.TYPE_NUMBER_FLAG_SIGNED
} }
latPref?.setOnPreferenceChangeListener { _, newValue -> latPref?.setOnPreferenceChangeListener { _, newValue ->
if (newValue.toString().toDouble() < -90.0 || newValue.toString().toDouble() > 90.0) { if (newValue.toString().isEmpty() || newValue.toString().toDouble() < -90.0 || newValue.toString().toDouble() > 90.0) {
Toast.makeText( Toast.makeText(
mainActivity, mainActivity,
getString(R.string.pref_lat_input_error), getString(R.string.pref_lat_input_error),
@@ -75,7 +75,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
InputType.TYPE_NUMBER_FLAG_SIGNED InputType.TYPE_NUMBER_FLAG_SIGNED
} }
lonPref?.setOnPreferenceChangeListener { _, newValue -> lonPref?.setOnPreferenceChangeListener { _, newValue ->
if (newValue.toString().toDouble() < -180.0 || newValue.toString().toDouble() > 180.0) { if (newValue.toString().isEmpty() || newValue.toString().toDouble() < -180.0 || newValue.toString().toDouble() > 180.0) {
Toast.makeText( Toast.makeText(
mainActivity, mainActivity,
getString(R.string.pref_lon_input_error), getString(R.string.pref_lon_input_error),
@@ -92,7 +92,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
InputType.TYPE_NUMBER_FLAG_SIGNED InputType.TYPE_NUMBER_FLAG_SIGNED
} }
altPref?.setOnPreferenceChangeListener { _, newValue -> altPref?.setOnPreferenceChangeListener { _, newValue ->
if (newValue.toString().toDouble() < -413.0 || newValue.toString().toDouble() > 8850.0) { if (newValue.toString().isEmpty() || newValue.toString().toDouble() < -413.0 || newValue.toString().toDouble() > 8850.0) {
Toast.makeText( Toast.makeText(
mainActivity, mainActivity,
getString(R.string.pref_alt_input_error), getString(R.string.pref_alt_input_error),
@@ -105,7 +105,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
delayPref?.setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER } delayPref?.setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER }
delayPref?.setOnPreferenceChangeListener { _, newValue -> delayPref?.setOnPreferenceChangeListener { _, newValue ->
if (newValue.toString().toLong() < 250 || newValue.toString().toLong() > 10000) { if (newValue.toString().isEmpty() || newValue.toString().toLong() < 250 || newValue.toString().toLong() > 10000) {
Toast.makeText( Toast.makeText(
mainActivity, mainActivity,
getString(R.string.pref_update_freq_input_error), getString(R.string.pref_update_freq_input_error),
app/src/main/java/com/rtbishop/look4sat/ui/SkyFragment.kt
+37 -22
View File
@@ -100,7 +100,9 @@ class SkyFragment : Fragment() {
swipeLayout.setProgressBackgroundColorSchemeResource(R.color.themeAccent) swipeLayout.setProgressBackgroundColorSchemeResource(R.color.themeAccent)
swipeLayout.setColorSchemeResources(R.color.darkOnLight) swipeLayout.setColorSchemeResources(R.color.darkOnLight)
swipeLayout.setOnRefreshListener { calculatePasses() } swipeLayout.setOnRefreshListener { calculatePasses() }
btnPassPrefs.setOnClickListener { showSatPassPrefsDialog() } btnPassPrefs.setOnClickListener {
showSatPassPrefsDialog(viewModel.hoursAhead, viewModel.minEl)
}
fab.setOnClickListener { fab.setOnClickListener {
showSelectSatDialog(viewModel.tleMainList, viewModel.tleSelection) showSelectSatDialog(viewModel.tleMainList, viewModel.tleSelection)
} }
@@ -120,34 +122,47 @@ class SkyFragment : Fragment() {
}) })
} }
private fun showSatPassPrefsDialog() { private fun showSatPassPrefsDialog(hoursAhead: Int, minEl: Double) {
val satPassPrefView = View.inflate(mainActivity, R.layout.sat_pass_pref, null) val satPassPrefView = View.inflate(mainActivity, R.layout.sat_pass_pref, null)
val etHoursAhead = satPassPrefView.findViewById<EditText>(R.id.pref_hours_ahead_et) val etHoursAhead = satPassPrefView.findViewById<EditText>(R.id.pref_hours_ahead_et)
val etMinEl = satPassPrefView.findViewById<EditText>(R.id.pref_min_el_et) val etMinEl = satPassPrefView.findViewById<EditText>(R.id.pref_min_el_et)
etHoursAhead.setText(viewModel.hoursAhead.toString()) etHoursAhead.setText(hoursAhead.toString())
etMinEl.setText(viewModel.minEl.toString()) etMinEl.setText(minEl.toString())
val builder = AlertDialog.Builder(mainActivity) val builder = AlertDialog.Builder(mainActivity)
builder.setTitle(getString(R.string.dialog_pass_prefs)) builder.setTitle(getString(R.string.dialog_pass_prefs))
.setPositiveButton(getString(R.string.btn_ok)) { _, _ -> .setPositiveButton(getString(R.string.btn_ok)) { _, _ ->
val hoursAhead = etHoursAhead.text.toString().toInt() val hoursStr = etHoursAhead.text.toString()
val minEl = etMinEl.text.toString().toDouble() val elevationStr = etMinEl.text.toString()
if (hoursAhead < 1 || hoursAhead > 168) { if (hoursStr.isNotEmpty() && elevationStr.isNotEmpty()) {
Toast.makeText( val hours = hoursStr.toInt()
mainActivity, val elevation = elevationStr.toDouble()
"Value should be within 1-168 hours", when {
Toast.LENGTH_SHORT hours < 1 || hours > 168 -> {
).show() Toast.makeText(
} else if (minEl < 0 || minEl > 90) { mainActivity,
Toast.makeText( "Value should be within 1-168 hours",
mainActivity, Toast.LENGTH_SHORT
"Value should be within 0-90 deg", ).show()
Toast.LENGTH_SHORT }
).show() elevation < 0 || elevation > 90 -> {
} else { Toast.makeText(
viewModel.setPassPrefs(hoursAhead, minEl) mainActivity,
calculatePasses() "Value should be within 0-90 deg",
} Toast.LENGTH_SHORT
).show()
}
else -> {
viewModel.setPassPrefs(hours, elevation)
calculatePasses()
}
}
} else Toast.makeText(
mainActivity,
"Please, enter the value",
Toast.LENGTH_SHORT
).show()
} }
.setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ -> .setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ ->
dialog.cancel() dialog.cancel()