Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added SwipeToRefresh layout for the passes recycler
Arty Bishopbb8a060ef372
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SkyFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SkyFragment.ktindex 68c66604..17115ee2 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SkyFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SkyFragment.kt@@ -25,7 +25,6 @@ import android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroupimport android.widget.ImageButton-import android.widget.ProgressBarimport android.widget.TextViewimport android.widget.Toastimport androidx.appcompat.app.AlertDialog@@ -34,6 +33,7 @@ import androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScopeimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.RecyclerView+import androidx.swiperefreshlayout.widget.SwipeRefreshLayoutimport com.github.amsacode.predict4java.TLEimport com.google.android.material.floatingactionbutton.FloatingActionButtonimport com.rtbishop.look4sat.MainViewModel@@ -46,21 +46,21 @@ import java.util.concurrent.TimeUnitclass SkyFragment : Fragment() {private lateinit var viewModel: MainViewModel- private lateinit var recViewCurrent: RecyclerViewprivate lateinit var recViewFuture: RecyclerView- private lateinit var recAdapterCurrent: RecyclerView.Adapter<*>private lateinit var recAdapterFuture: SatPassAdapterprivate lateinit var timeToAos: TextViewprivate lateinit var btnRefresh: ImageButton- private lateinit var progressBar: ProgressBarprivate lateinit var fab: FloatingActionButtonprivate lateinit var aosTimer: CountDownTimer+ private lateinit var swipeLayout: SwipeRefreshLayoutprivate lateinit var satPassList: List<SatPass>+ private lateinit var mainActivity: MainActivityprivate var isTimerSet: Boolean = falseoverride fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)- viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)+ mainActivity = activity as MainActivity+ viewModel = ViewModelProvider(mainActivity).get(MainViewModel::class.java)recAdapterFuture = SatPassAdapter()}@@ -76,15 +76,15 @@ class SkyFragment : Fragment() {}private fun setupViews(view: View) {- timeToAos = (activity as MainActivity).findViewById(R.id.toolbar_time_to_aos)- btnRefresh = (activity as MainActivity).findViewById(R.id.toolbar_btn_refresh)- progressBar = view.findViewById(R.id.sky_progressbar)+ timeToAos = (mainActivity).findViewById(R.id.toolbar_time_to_aos)+ btnRefresh = (mainActivity).findViewById(R.id.toolbar_btn_refresh)+ swipeLayout = view.findViewById(R.id.swipeRefreshLayout)recViewFuture = view.findViewById(R.id.sky_recycler_future)fab = view.findViewById(R.id.sky_fab)satPassList = viewModel.satPassListrecViewFuture.apply {- layoutManager = LinearLayoutManager(activity as MainActivity)+ layoutManager = LinearLayoutManager(mainActivity)adapter = recAdapterFuture}recAdapterFuture.setList(satPassList)@@ -93,6 +93,7 @@ class SkyFragment : Fragment() {resetTimer()}+ swipeLayout.setOnRefreshListener { calculatePasses() }btnRefresh.setOnClickListener { calculatePasses() }fab.setOnClickListener {showSelectSatDialog(viewModel.tleMainList, viewModel.selectionList)@@ -106,7 +107,7 @@ class SkyFragment : Fragment() {val tleCheckedArray = BooleanArray(tleMainList.size).apply {selectionList.forEach { this[it] = true }}- val builder = AlertDialog.Builder(activity as MainActivity)+ val builder = AlertDialog.Builder(mainActivity)builder.setTitle(getString(R.string.dialog_select_sat)).setMultiChoiceItems(tleNameArray, tleCheckedArray) { _, which, isChecked ->if (isChecked) selectionList.add(which)@@ -130,18 +131,16 @@ class SkyFragment : Fragment() {private fun calculatePasses() {lifecycleScope.launch(Dispatchers.Main) {- recViewFuture.visibility = View.INVISIBLE- progressBar.visibility = View.VISIBLE- progressBar.isIndeterminate = trueviewModel.getPasses()satPassList = viewModel.satPassListrecAdapterFuture.setList(satPassList)recAdapterFuture.notifyDataSetChanged()- progressBar.isIndeterminate = false- progressBar.visibility = View.INVISIBLE- recViewFuture.visibility = View.VISIBLEif (satPassList.isNotEmpty()) setTimer(satPassList.first().pass.startTime.time)- else resetTimer()+ else {+ resetTimer()+ timeToAos.text = String.format(getString(R.string.pattern_aos), 0, 0, 0)+ }+ swipeLayout.isRefreshing = false}}@@ -171,7 +170,6 @@ class SkyFragment : Fragment() {if (isTimerSet) {aosTimer.cancel()isTimerSet = false- }- timeToAos.text = String.format(getString(R.string.pattern_aos), 0, 0, 0)+ } else timeToAos.text = String.format(getString(R.string.pattern_aos), 0, 0, 0)}}\ No newline at end of filediff --git a/app/src/main/res/layout/fragment_sky.xml b/app/src/main/res/layout/fragment_sky.xmlindex c8676f80..fba283a2 100644--- a/app/src/main/res/layout/fragment_sky.xml+++ b/app/src/main/res/layout/fragment_sky.xml@@ -4,37 +4,21 @@android:layout_width="match_parent"android:layout_height="match_parent">- <ProgressBar- android:id="@+id/sky_progressbar"- style="?android:attr/progressBarStyle"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:visibility="invisible"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />-- <androidx.recyclerview.widget.RecyclerView- android:id="@+id/sky_recycler_current"+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout+ android:id="@+id/swipeRefreshLayout"android:layout_width="match_parent"- android:layout_height="wrap_content"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent">-- </androidx.recyclerview.widget.RecyclerView>+ android:layout_height="match_parent">- <androidx.recyclerview.widget.RecyclerView- android:id="@+id/sky_recycler_future"- android:layout_width="0dp"- android:layout_height="0dp"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/sky_recycler_current">+ <androidx.recyclerview.widget.RecyclerView+ android:id="@+id/sky_recycler_future"+ android:layout_width="0dp"+ android:layout_height="0dp"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />- </androidx.recyclerview.widget.RecyclerView>+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout><com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/sky_fab"