Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added toast extension function
Arty Bishopa5c08c2614c1
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex e12c3838..f6622129 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -30,7 +30,6 @@ import android.net.Uriimport android.os.Bundleimport android.view.Viewimport android.view.WindowManager-import android.widget.Toastimport androidx.appcompat.app.AppCompatActivityimport androidx.core.app.ActivityCompatimport androidx.core.content.ContextCompat@@ -50,6 +49,7 @@ import com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.databinding.ActivityMainBindingimport com.rtbishop.look4sat.databinding.DialogTleUrlBindingimport com.rtbishop.look4sat.databinding.DrawerHeaderBinding+import com.rtbishop.look4sat.utility.GeneralUtils.toastimport kotlinx.coroutines.delayimport kotlinx.coroutines.launchimport javax.inject.Inject@@ -131,8 +131,10 @@ class MainActivity : AppCompatActivity() {}is Result.Error -> {when (result.exception) {- is SecurityException -> toast(getString(R.string.err_no_permissions))- is IllegalArgumentException -> toast(getString(R.string.update_loc_failure))+ is SecurityException ->+ getString(R.string.err_no_permissions).toast(this)+ is IllegalArgumentException ->+ getString(R.string.update_loc_failure).toast(this)}}}@@ -141,11 +143,11 @@ class MainActivity : AppCompatActivity() {when (result) {is Result.Success -> {when (result.data) {- 0 -> toast(getString(R.string.update_tle_success))- 1 -> toast(getString(R.string.update_trans_success))+ 0 -> getString(R.string.update_tle_success).toast(this)+ 1 -> getString(R.string.update_trans_success).toast(this)}}- is Result.Error -> toast(getString(R.string.update_failure))+ is Result.Error -> getString(R.string.update_failure).toast(this)}})}@@ -202,10 +204,6 @@ class MainActivity : AppCompatActivity() {}}- private fun toast(message: String) {- Toast.makeText(this, message, Toast.LENGTH_SHORT).show()- }-private fun View.lockButton() {lifecycleScope.launch {[email protected] = false@@ -217,7 +215,7 @@ class MainActivity : AppCompatActivity() {private fun requestLocationUpdate() {if (ContextCompat.checkSelfPermission(this, permLocation) != permGranted) {if (ActivityCompat.shouldShowRequestPermissionRationale(this, permLocation)) {- toast(getString(R.string.err_no_permissions))+ getString(R.string.err_no_permissions).toast(this)} else {ActivityCompat.requestPermissions(this, arrayOf(permLocation), permLocationCode)}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.ktindex 5ab9dbbe..2f1023db 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt@@ -21,7 +21,6 @@ package com.rtbishop.look4sat.ui.fragmentsimport android.os.Bundleimport android.view.View-import android.widget.Toastimport androidx.appcompat.app.AlertDialogimport androidx.fragment.app.Fragmentimport androidx.lifecycle.ViewModelProvider@@ -38,6 +37,7 @@ import com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModelimport com.rtbishop.look4sat.ui.views.MapViewimport com.rtbishop.look4sat.utility.GeneralUtils+import com.rtbishop.look4sat.utility.GeneralUtils.toastimport com.rtbishop.look4sat.utility.PassPredictorimport kotlinx.coroutines.delayimport kotlinx.coroutines.launch@@ -69,9 +69,7 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) {private fun setupObservers(binding: FragmentMapViewBinding) {viewModel.getGSP().observe(viewLifecycleOwner, androidx.lifecycle.Observer { result ->when (result) {- is Result.Success -> {- gsp = result.data- }+ is Result.Success -> gsp = result.data}})@@ -99,11 +97,7 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) {refreshView()} else {binding.fabMap.setOnClickListener {- Toast.makeText(- mainActivity,- getString(R.string.err_no_sat_selected),- Toast.LENGTH_SHORT- ).show()+ getString(R.string.err_no_sat_selected).toast(mainActivity)}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.ktindex 18d1a48b..8effc0f5 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PreferencesFragment.kt@@ -22,13 +22,13 @@ package com.rtbishop.look4sat.ui.fragmentsimport android.content.SharedPreferencesimport android.os.Bundleimport android.text.InputType-import android.widget.Toastimport androidx.lifecycle.ViewModelProviderimport androidx.preference.EditTextPreferenceimport androidx.preference.PreferenceFragmentCompatimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.ui.MainActivityimport com.rtbishop.look4sat.ui.SharedViewModel+import com.rtbishop.look4sat.utility.GeneralUtils.toastclass PreferencesFragment : PreferenceFragmentCompat(),SharedPreferences.OnSharedPreferenceChangeListener {@@ -54,21 +54,15 @@ class PreferencesFragment : PreferenceFragmentCompat(),findPreference<EditTextPreference>(keyLat)?.apply {summaryProvider = provider-setOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL orInputType.TYPE_NUMBER_FLAG_SIGNED}-setOnPreferenceChangeListener { _, newValue ->val valueStr = newValue.toString()if (valueStr.isEmpty() || valueStr == "-" || valueStr.toDouble() < -90.0 || valueStr.toDouble() > 90.0) {- Toast.makeText(- mainActivity,- getString(R.string.pref_lat_input_error),- Toast.LENGTH_SHORT- ).show()+ getString(R.string.pref_lat_input_error).toast(mainActivity)return@setOnPreferenceChangeListener false}return@setOnPreferenceChangeListener true@@ -77,61 +71,45 @@ class PreferencesFragment : PreferenceFragmentCompat(),findPreference<EditTextPreference>(keyLon)?.apply {summaryProvider = provider-setOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL orInputType.TYPE_NUMBER_FLAG_SIGNED}-setOnPreferenceChangeListener { _, newValue ->val valueStr = newValue.toString()if (valueStr.isEmpty() || valueStr == "-" || valueStr.toDouble() < -180.0 || valueStr.toDouble() > 180.0) {- Toast.makeText(- mainActivity,- getString(R.string.pref_lon_input_error),- Toast.LENGTH_SHORT- ).show()+ getString(R.string.pref_lon_input_error).toast(mainActivity)return@setOnPreferenceChangeListener false}return@setOnPreferenceChangeListener true}}+findPreference<EditTextPreference>(keyAlt)?.apply {summaryProvider = provider-setOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL orInputType.TYPE_NUMBER_FLAG_SIGNED}-setOnPreferenceChangeListener { _, newValue ->val valueStr = newValue.toString()if (valueStr.isEmpty() || valueStr == "-" || valueStr.toDouble() < -413.0 || valueStr.toDouble() > 8850.0) {- Toast.makeText(- mainActivity,- getString(R.string.pref_alt_input_error),- Toast.LENGTH_SHORT- ).show()+ getString(R.string.pref_alt_input_error).toast(mainActivity)return@setOnPreferenceChangeListener false}return@setOnPreferenceChangeListener true}}+findPreference<EditTextPreference>(keyDelay)?.apply {summaryProvider = provider-setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER }-setOnPreferenceChangeListener { _, newValue ->val valueStr = newValue.toString()if (valueStr.isEmpty() || valueStr.toLong() < 250 || valueStr.toLong() > 10000) {- Toast.makeText(- mainActivity,- getString(R.string.pref_refresh_rate_input_error),- Toast.LENGTH_SHORT- ).show()+ getString(R.string.pref_refresh_rate_input_error).toast(mainActivity)return@setOnPreferenceChangeListener false}return@setOnPreferenceChangeListener truediff --git a/app/src/main/java/com/rtbishop/look4sat/utility/GeneralUtils.kt b/app/src/main/java/com/rtbishop/look4sat/utility/GeneralUtils.ktindex 7da294da..837f0ea9 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/GeneralUtils.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/GeneralUtils.kt@@ -1,5 +1,7 @@package com.rtbishop.look4sat.utility+import android.content.Context+import android.widget.Toastimport java.util.*import kotlin.math.cosimport kotlin.math.sin@@ -25,4 +27,8 @@ object GeneralUtils {val radius = r * (piDiv2 - elevation) / piDiv2return (radius * sin(piDiv2 - azimuth)).toFloat()}++ fun Any.toast(context: Context, duration: Int = Toast.LENGTH_SHORT): Toast {+ return Toast.makeText(context, this.toString(), duration).apply { show() }+ }}\ No newline at end of filediff --git a/app/src/main/res/layout/dialog_tle_url.xml b/app/src/main/res/layout/dialog_tle_url.xmlindex 98a768a8..da106c7c 100644--- a/app/src/main/res/layout/dialog_tle_url.xml+++ b/app/src/main/res/layout/dialog_tle_url.xml@@ -6,7 +6,7 @@android:layout_height="wrap_content"><TextView- android:id="@+id/dialotTleTitle"+ android:id="@+id/dialogTleTitle"android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_marginStart="16dp"@@ -24,8 +24,8 @@android:importantForAutofill="no"android:inputType="textWebEditText"app:layout_constraintEnd_toEndOf="@+id/dialogTlePos"- app:layout_constraintStart_toStartOf="@+id/dialotTleTitle"- app:layout_constraintTop_toBottomOf="@+id/dialotTleTitle" />+ app:layout_constraintStart_toStartOf="@+id/dialogTleTitle"+ app:layout_constraintTop_toBottomOf="@+id/dialogTleTitle" /><TextViewandroid:id="@+id/dialogTleNeg"