Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Now showing progress bar while calculating passes

Arty Bishope9424ad99767
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
index 6e037a0b..13133186 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassesFragment.kt
@@ -19,7 +19,6 @@
package com.rtbishop.look4sat.ui.fragments
-import android.animation.ObjectAnimator
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
@@ -35,7 +34,6 @@ import com.rtbishop.look4sat.ui.adapters.PassesAdapter
import com.rtbishop.look4sat.utility.PrefsManager
import com.rtbishop.look4sat.utility.RecyclerDivider
import com.rtbishop.look4sat.utility.Utilities
-import com.rtbishop.look4sat.utility.Utilities.getRotationAnimator
import dagger.hilt.android.AndroidEntryPoint
import java.util.*
import javax.inject.Inject
@@ -47,7 +45,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes) {
lateinit var prefsManager: PrefsManager
private lateinit var binding: FragmentPassesBinding
- private lateinit var animator: ObjectAnimator
private lateinit var passesAdapter: PassesAdapter
private val viewModel: SharedViewModel by activityViewModels()
private var passes = mutableListOf<SatPass>()
@@ -62,10 +59,14 @@ class PassesFragment : Fragment(R.layout.fragment_passes) {
private fun setupObservers() {
viewModel.getPasses().observe(viewLifecycleOwner, { result ->
if (result is Result.Success) {
- animator.cancel()
+ binding.passesProgress.visibility = View.INVISIBLE
+ binding.passesRecycler.visibility = View.VISIBLE
passes = result.data
passesAdapter.setList(passes)
- } else if (result is Result.InProgress) animator.start()
+ } else if (result is Result.InProgress) {
+ binding.passesRecycler.visibility = View.INVISIBLE
+ binding.passesProgress.visibility = View.VISIBLE
+ }
})
viewModel.getCurrentTimeMillis().observe(viewLifecycleOwner, { currentTime ->
tickMainTimer(currentTime)
@@ -84,14 +85,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes) {
(itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
addItemDecoration(RecyclerDivider(R.drawable.rec_divider_dark))
}
- animator = passesFab.getRotationAnimator()
- passesFab.setOnClickListener {
- if (animator.isRunning) {
- animator.cancel()
- } else {
- viewModel.calculatePasses()
- }
- }
+ passesFab.setOnClickListener { viewModel.calculatePasses() }
}
viewModel.triggerCalculation()
}
diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/Utilities.kt b/app/src/main/java/com/rtbishop/look4sat/utility/Utilities.kt
index fd521fbe..77d4d6be 100644
--- a/app/src/main/java/com/rtbishop/look4sat/utility/Utilities.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/utility/Utilities.kt
@@ -1,9 +1,7 @@
package com.rtbishop.look4sat.utility
-import android.animation.ObjectAnimator
import android.content.SharedPreferences
import android.view.View
-import android.view.animation.LinearInterpolator
import com.google.android.material.snackbar.Snackbar
import java.util.concurrent.TimeUnit
import kotlin.math.round
@@ -28,15 +26,6 @@ object Utilities {
return round(this * multiplier) / multiplier
}
- fun View.getRotationAnimator(): ObjectAnimator {
- return ObjectAnimator.ofFloat(this, "rotation", 0f, 360f).apply {
- duration = 333
- repeatCount = ObjectAnimator.INFINITE
- repeatMode = ObjectAnimator.RESTART
- interpolator = LinearInterpolator()
- }
- }
-
fun SharedPreferences.Editor.putDouble(key: String, double: Double) {
putLong(key, double.toRawBits())
}
diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index 3aebb7ea..e06faca7 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -20,8 +20,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:keepScreenOn="true">
+ android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -49,7 +48,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
- android:id="@+id/textView"
+ android:id="@+id/stub_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
@@ -63,7 +62,7 @@
app:layout_constraintTop_toTopOf="@+id/passes_timer" />
<com.google.android.material.textview.MaterialTextView
- android:id="@+id/textView2"
+ android:id="@+id/stub_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
@@ -88,6 +87,17 @@
</androidx.recyclerview.widget.RecyclerView>
+ <ProgressBar
+ android:id="@+id/passes_progress"
+ style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Large"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="invisible"
+ app:layout_constraintBottom_toBottomOf="@+id/passes_recycler"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/passes_bar" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xml
index ed9449a5..ba59003a 100644
--- a/app/src/main/res/layout/fragment_polar.xml
+++ b/app/src/main/res/layout/fragment_polar.xml
@@ -45,7 +45,7 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
- android:id="@+id/textView"
+ android:id="@+id/stub_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"
@@ -59,7 +59,7 @@
app:layout_constraintTop_toTopOf="@+id/polar_timer" />
<com.google.android.material.textview.MaterialTextView
- android:id="@+id/textView2"
+ android:id="@+id/stub_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="4dp"