mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-03 03:17:21 +00:00
Fixed IllegalArgException on pass to polar navigation. Triggering github actions on tags push.
This commit is contained in:
1 parent
c37537bd67
commit
d493e3e87b
7 files changed
+39
-23
No files matched your search
@@ -30,6 +30,7 @@ import com.rtbishop.look4sat.R
|
||||
import com.rtbishop.look4sat.databinding.FragmentEntriesBinding
|
||||
import com.rtbishop.look4sat.ui.SharedViewModel
|
||||
import com.rtbishop.look4sat.utility.RecyclerDivider
|
||||
import com.rtbishop.look4sat.utility.navigateSafe
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
||||
@AndroidEntryPoint
|
||||
@@ -38,9 +39,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
|
||||
private val viewModel: SharedViewModel by activityViewModels()
|
||||
private val filePicker =
|
||||
registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
|
||||
uri?.let {
|
||||
viewModel.updateEntriesFromFile(uri)
|
||||
}
|
||||
uri?.let { viewModel.updateEntriesFromFile(uri) }
|
||||
}
|
||||
private var binding: FragmentEntriesBinding? = null
|
||||
private var entriesAdapter: EntriesAdapter? = null
|
||||
@@ -73,8 +72,9 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
|
||||
private fun setupObservers() {
|
||||
setLoading()
|
||||
viewModel.getSatItems().observe(viewLifecycleOwner, { satItems ->
|
||||
if (satItems.isNullOrEmpty()) setError()
|
||||
else {
|
||||
if (satItems.isNullOrEmpty()) {
|
||||
setError()
|
||||
} else {
|
||||
entriesAdapter?.setItems(satItems)
|
||||
setLoaded()
|
||||
}
|
||||
@@ -131,7 +131,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
|
||||
val satItems = it.getItems()
|
||||
if (satItems.isNotEmpty()) {
|
||||
viewModel.updateItemsSelection(satItems)
|
||||
requireView().findNavController().navigate(R.id.action_entries_to_passes)
|
||||
requireView().findNavController().navigateSafe(R.id.action_entries_to_passes)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ import com.rtbishop.look4sat.R
|
||||
import com.rtbishop.look4sat.data.SatPass
|
||||
import com.rtbishop.look4sat.databinding.ItemPassGeoBinding
|
||||
import com.rtbishop.look4sat.databinding.ItemPassLeoBinding
|
||||
import com.rtbishop.look4sat.utility.navigateSafe
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
|
||||
@@ -131,7 +132,7 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false)
|
||||
itemView.setOnClickListener {
|
||||
if (satPass.progress < 100) {
|
||||
val bundle = bundleOf("index" to satPassList.indexOf(satPass))
|
||||
itemView.findNavController().navigate(R.id.action_passes_to_polar, bundle)
|
||||
itemView.findNavController().navigateSafe(R.id.action_passes_to_polar, bundle)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -152,7 +153,7 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false)
|
||||
|
||||
itemView.setOnClickListener {
|
||||
val bundle = bundleOf("index" to satPassList.indexOf(satPass))
|
||||
itemView.findNavController().navigate(R.id.action_passes_to_polar, bundle)
|
||||
itemView.findNavController().navigateSafe(R.id.action_passes_to_polar, bundle)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,15 +77,13 @@ class PrefsFragment : PreferenceFragmentCompat() {
|
||||
}
|
||||
|
||||
private fun setPositionFromQth(qthString: String): Boolean {
|
||||
val loc = qthConverter.qthToLocation(qthString)
|
||||
return if (loc == null) {
|
||||
showSnack(getString(R.string.pref_pos_qth_error))
|
||||
false
|
||||
} else {
|
||||
prefsRepo.setStationPosition(loc.latitude, loc.longitude, loc.heightAMSL)
|
||||
qthConverter.qthToLocation(qthString)?.let { gsp ->
|
||||
prefsRepo.setStationPosition(gsp.latitude, gsp.longitude, gsp.heightAMSL)
|
||||
showSnack(getString(R.string.pref_pos_success))
|
||||
true
|
||||
return true
|
||||
}
|
||||
showSnack(getString(R.string.pref_pos_qth_error))
|
||||
return false
|
||||
}
|
||||
|
||||
private fun setPositionFromGPS() {
|
||||
|
||||
Reference in new issue
Block a user