Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Removed PassPref edit dialog. Access to PassPrefs is now via Settings menu.

Arty Bishop571164cdd5bb
diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt
index a13b3530..1122c0da 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/SkyFragment.kt
@@ -5,7 +5,10 @@ import android.os.CountDownTimer
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.*
+import android.widget.ImageButton
+import android.widget.ProgressBar
+import android.widget.TextView
+import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
@@ -29,7 +32,7 @@ class SkyFragment : Fragment() {
private lateinit var recAdapterCurrent: RecyclerView.Adapter<*>
private lateinit var recAdapterFuture: SatPassAdapter
private lateinit var timeToAos: TextView
- private lateinit var btnPassPrefs: ImageButton
+ private lateinit var btnRefresh: ImageButton
private lateinit var progressBar: ProgressBar
private lateinit var fab: FloatingActionButton
private lateinit var aosTimer: CountDownTimer
@@ -55,7 +58,7 @@ class SkyFragment : Fragment() {
private fun setupViews(view: View) {
timeToAos = (activity as MainActivity).findViewById(R.id.toolbar_time_to_aos)
- btnPassPrefs = (activity as MainActivity).findViewById(R.id.toolbar_btn_refresh)
+ btnRefresh = (activity as MainActivity).findViewById(R.id.toolbar_btn_refresh)
progressBar = view.findViewById(R.id.sky_progressbar)
recViewFuture = view.findViewById(R.id.sky_recycler_future)
fab = view.findViewById(R.id.sky_fab)
@@ -71,34 +74,10 @@ class SkyFragment : Fragment() {
resetTimer()
}
- btnPassPrefs.setOnClickListener { showSatPassPrefsDialog() }
+ btnRefresh.setOnClickListener { calculatePasses() }
fab.setOnClickListener { showSelectSatDialog() }
}
- private fun showSatPassPrefsDialog() {
- val context = activity as MainActivity
- val satPassPrefView = View.inflate(context, R.layout.sat_pass_pref, null)
- val etHours = satPassPrefView.findViewById<EditText>(R.id.pass_pref_et_hours)
- val etMaxEl = satPassPrefView.findViewById<EditText>(R.id.pass_pref_et_maxEl)
- etHours.setText(viewModel.passPrefs.hoursAhead.toString())
- etMaxEl.setText(viewModel.passPrefs.maxEl.toString())
-
- val builder = AlertDialog.Builder(context)
- builder.setTitle(getString(R.string.title_pass_pref))
- .setPositiveButton(getString(R.string.btn_ok)) { _, _ ->
- val hoursAhead = etHours.text.toString().toInt()
- val maxEl = etMaxEl.text.toString().toDouble()
- viewModel.updatePassPrefs(hoursAhead, maxEl)
- calculatePasses()
- }
- .setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ ->
- dialog.cancel()
- }
- .setView(satPassPrefView)
- .create()
- .show()
- }
-
private fun showSelectSatDialog() {
val tleMainList = viewModel.tleMainList
val tleNameArray = arrayOfNulls<String>(tleMainList.size)
diff --git a/app/src/main/res/drawable/ic_pass_prefs.xml b/app/src/main/res/drawable/ic_pass_prefs.xml
deleted file mode 100644
index 16e5164d..00000000
--- a/app/src/main/res/drawable/ic_pass_prefs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:fillColor="#C0C0C0"
- android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 00000000..3a766bc2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#C0C0C0"
+ android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
+</vector>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b9a38867..1f5a1288 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,7 +62,7 @@
<style name="ToolbarButton">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
- <item name="android:src">@drawable/ic_pass_prefs</item>
+ <item name="android:src">@drawable/ic_refresh</item>
<item name="android:backgroundTint">@color/toolbarButton</item>
</style>