Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed recent InflationException, version code bumped
Arty Bishopb2deab0d7ceb
diff --git a/app/build.gradle b/app/build.gradleindex 0c872475..476dd35c 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -13,8 +13,8 @@ android {applicationId "com.rtbishop.look4sat"minSdkVersion 21targetSdkVersion 30- versionCode 230- versionName "2.3.0"+ versionCode 231+ versionName "2.3.1"kapt {arguments {arg("room.schemaLocation", "$projectDir/schemas")diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex c343c338..f4754b24 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -25,6 +25,7 @@ import androidx.fragment.app.viewModelsimport androidx.navigation.fragment.findNavControllerimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.SimpleItemAnimator+import com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.data.model.Resultimport com.rtbishop.look4sat.data.model.SatItem@@ -32,7 +33,6 @@ import com.rtbishop.look4sat.data.model.TleSourceimport com.rtbishop.look4sat.databinding.FragmentEntriesBindingimport com.rtbishop.look4sat.utility.RecyclerDividerimport com.rtbishop.look4sat.utility.getNavResult-import com.rtbishop.look4sat.utility.showSnackimport dagger.hilt.android.AndroidEntryPoint@AndroidEntryPoint@@ -94,7 +94,8 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {is Result.Error -> {binding.entriesProgress.visibility = View.INVISIBLEbinding.entriesRecycler.visibility = View.VISIBLE- requireView().showSnack(getString(R.string.entries_update_error))+ Snackbar.make(requireView(), R.string.entries_update_error, Snackbar.LENGTH_SHORT)+ .setAnchorView(R.id.nav_bottom).show()}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.ktindex f0c17610..6ad30638 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesViewModel.kt@@ -142,7 +142,6 @@ class EntriesViewModel @Inject constructor(}private fun filterByQuery(items: List<SatItem>, query: String): List<SatItem> {- shouldSelectAll = trueif (query.isBlank()) return itemsreturn try {items.filter { it.catNum == query.toInt() }diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.ktindex 64533961..54a409cc 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/prefsScreen/PrefsFragment.kt@@ -26,61 +26,64 @@ import androidx.activity.result.contract.ActivityResultContractsimport androidx.core.content.ContextCompatimport androidx.preference.Preferenceimport androidx.preference.PreferenceFragmentCompat+import com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.utility.PrefsManagerimport com.rtbishop.look4sat.utility.QthConverterimport com.rtbishop.look4sat.utility.round-import com.rtbishop.look4sat.utility.showSnackimport dagger.hilt.android.AndroidEntryPointimport javax.inject.Inject@AndroidEntryPointclass PrefsFragment : PreferenceFragmentCompat() {-+@Injectlateinit var locationManager: LocationManager@Injectlateinit var prefsManager: PrefsManager@Injectlateinit var qthConverter: QthConverter-+private val requestPermissionLauncher =registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->- if (isGranted) setPositionFromGPS()- else requireView().showSnack(getString(R.string.pref_pos_gps_error))+ if (isGranted) {+ setPositionFromGPS()+ } else {+ showSnack(getString(R.string.pref_pos_gps_error))+ }}-+override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {setPreferencesFromResource(R.xml.preference, rootKey)}-+override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)-+findPreference<Preference>(PrefsManager.keyPositionGPS)?.apply {setOnPreferenceClickListener {setPositionFromGPS()return@setOnPreferenceClickListener true}}-+findPreference<Preference>(PrefsManager.keyPositionQTH)?.apply {setOnPreferenceChangeListener { _, newValue ->setPositionFromQth(newValue.toString())}}}-+private fun setPositionFromQth(qthString: String): Boolean {qthConverter.qthToLocation(qthString)?.let { gsp ->prefsManager.setStationPosition(gsp.latitude, gsp.longitude, gsp.heightAMSL)- requireView().showSnack(getString(R.string.pref_pos_success))+ showSnack(getString(R.string.pref_pos_success))return true}- requireView().showSnack(getString(R.string.pref_pos_qth_error))+ showSnack(getString(R.string.pref_pos_qth_error))return false}-+private fun setPositionFromGPS() {val locPermString = Manifest.permission.ACCESS_FINE_LOCATIONval locPermResult = ContextCompat.checkSelfPermission(requireContext(), locPermString)@@ -91,8 +94,14 @@ class PrefsFragment : PreferenceFragmentCompat() {val longitude = location.longitude.round(4)val altitude = location.altitude.round(1)prefsManager.setStationPosition(latitude, longitude, altitude)- requireView().showSnack(getString(R.string.pref_pos_success))- } else requireView().showSnack(getString(R.string.pref_pos_gps_null))+ showSnack(getString(R.string.pref_pos_success))+ } else showSnack(getString(R.string.pref_pos_gps_null))} else requestPermissionLauncher.launch(locPermString)}++ private fun showSnack(message: String) {+ Snackbar.make(requireView(), message, Snackbar.LENGTH_SHORT)+ .setAnchorView(R.id.nav_bottom)+ .show()+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt b/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.ktindex 99c6dc99..d3857932 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt@@ -23,7 +23,6 @@ import android.net.Networkimport android.net.NetworkCapabilitiesimport android.net.NetworkRequestimport android.os.Bundle-import android.view.Viewimport androidx.annotation.IdResimport androidx.fragment.app.Fragmentimport androidx.lifecycle.Lifecycle@@ -34,8 +33,6 @@ import androidx.navigation.Navigatorimport androidx.navigation.fragment.findNavControllerimport com.github.amsacode.predict4java.GroundStationPositionimport com.github.amsacode.predict4java.Satellite-import com.google.android.material.snackbar.Snackbar-import com.rtbishop.look4sat.Rimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.channels.awaitCloseimport kotlinx.coroutines.flow.Flow@@ -80,12 +77,6 @@ fun Satellite.getPredictor(stationPosition: GroundStationPosition): PassPredictoreturn PassPredictor(this, stationPosition)}-fun View.showSnack(message: String) {- Snackbar.make(this, message, Snackbar.LENGTH_SHORT)- .setAnchorView(R.id.nav_bottom)- .show()-}-fun NavController.navigateSafe(@IdRes resId: Int,args: Bundle? = null,diff --git a/fastlane/metadata/android/en-US/changelogs/231.txt b/fastlane/metadata/android/en-US/changelogs/231.txtnew file mode 100644index 00000000..160b0eb9--- /dev/null+++ b/fastlane/metadata/android/en-US/changelogs/231.txt@@ -0,0 +1,7 @@+Added satellite items filtering by transmitter mode+Now updating recyclers views asyncronously+Switched to concurrent satellite data update+Minor visual changes to map info+Separated application screens logic+Bug fixes, huge code cleanup+Fixed recent InflatingException\ No newline at end of filediff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-USindex 395b171e..160b0eb9 100644--- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US+++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US@@ -3,4 +3,5 @@ Now updating recyclers views asyncronouslySwitched to concurrent satellite data updateMinor visual changes to map infoSeparated application screens logic-Bug fixes, huge code cleanup\ No newline at end of file+Bug fixes, huge code cleanup+Fixed recent InflatingException\ No newline at end of file