Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Removed safeargs plugin as it's not being used
Arty Bishop8b1901fd489f
diff --git a/app/build.gradle b/app/build.gradleindex b6962572..90af9684 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -22,7 +22,6 @@ apply plugin: "kotlin-android"apply plugin: "kotlin-kapt"apply plugin: "kotlin-android-extensions"apply plugin: "dagger.hilt.android.plugin"-apply plugin: "androidx.navigation.safeargs.kotlin"android {compileSdkVersion 30diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.ktindex b2fb0c95..3c312c1e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt@@ -23,13 +23,13 @@ import android.content.Contextimport android.view.LayoutInflaterimport android.view.Viewimport android.view.ViewGroup+import androidx.core.os.bundleOfimport androidx.navigation.findNavControllerimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.databinding.ItemPassGeoBindingimport com.rtbishop.look4sat.databinding.ItemPassLeoBinding-import com.rtbishop.look4sat.ui.fragments.PassesFragmentDirectionsimport java.text.SimpleDateFormatimport java.util.*@@ -123,9 +123,8 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false)itemView.setOnClickListener {if (satPass.progress < 100) {- val passIndex = satPassList.indexOf(satPass)- val action = PassesFragmentDirections.actionPassToPolar(passIndex)- itemView.findNavController().navigate(action)+ val bundle = bundleOf("index" to satPassList.indexOf(satPass))+ itemView.findNavController().navigate(R.id.action_passes_to_polar, bundle)}}}@@ -146,9 +145,8 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false)}itemView.setOnClickListener {- val passIndex = satPassList.indexOf(satPass)- val action = PassesFragmentDirections.actionPassToPolar(passIndex)- itemView.findNavController().navigate(action)+ val bundle = bundleOf("index" to satPassList.indexOf(satPass))+ itemView.findNavController().navigate(R.id.action_passes_to_polar, bundle)}}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.ktindex 65550f82..edd47179 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarFragment.kt@@ -29,7 +29,6 @@ import android.view.Viewimport androidx.fragment.app.Fragmentimport androidx.fragment.app.activityViewModelsimport androidx.navigation.fragment.findNavController-import androidx.navigation.fragment.navArgsimport androidx.recyclerview.widget.LinearLayoutManagerimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.SharedViewModel@@ -57,7 +56,6 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {private lateinit var satPass: SatPassprivate lateinit var sensorManager: SensorManagerprivate val viewModel: SharedViewModel by activityViewModels()- private val args: PolarFragmentArgs by navArgs()private var magneticDeclination = 0fprivate var polarView: PolarView? = null@@ -112,7 +110,7 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {private fun observePasses() {viewModel.getPasses().observe(viewLifecycleOwner, { result ->if (result is Result.Success) {- satPass = result.data[args.satPassIndex]+ satPass = result.data[requireArguments().getInt("index")]polarView = PolarView(requireContext(), satPass)binding.frame.addView(polarView)observeTransmitters()@@ -163,7 +161,7 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {binding.polarTimer.text = Utilities.formatForTimer(millisBeforeEnd)if (dateNow.after(satPass.pass.endTime)) {binding.polarTimer.text = Utilities.formatForTimer(0L)- findNavController().navigateUp()+ findNavController().navigate(R.id.action_polar_to_passes)}}}diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 206e45dc..583e2c9a 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -41,7 +41,7 @@android:name="com.rtbishop.look4sat.ui.fragments.PassesFragment"tools:layout="@layout/fragment_passes"><action- android:id="@+id/action_pass_to_polar"+ android:id="@+id/action_passes_to_polar"app:destination="@id/nav_polar"app:enterAnim="@anim/nav_default_enter_anim"app:exitAnim="@anim/nav_default_exit_anim"@@ -53,9 +53,15 @@android:id="@+id/nav_polar"android:name="com.rtbishop.look4sat.ui.fragments.PolarFragment"tools:layout="@layout/fragment_polar">- <argument- android:name="satPassIndex"- app:argType="integer" />+ <action+ android:id="@+id/action_polar_to_passes"+ app:destination="@id/nav_passes"+ app:enterAnim="@anim/nav_default_enter_anim"+ app:exitAnim="@anim/nav_default_exit_anim"+ app:popEnterAnim="@anim/nav_default_pop_enter_anim"+ app:popExitAnim="@anim/nav_default_pop_exit_anim"+ app:popUpTo="@id/nav_passes"+ app:popUpToInclusive="true" /></fragment><fragmentdiff --git a/build.gradle b/build.gradleindex 85144e24..9aa83a62 100644--- a/build.gradle+++ b/build.gradle@@ -40,7 +40,6 @@ buildscript {classpath "com.android.tools.build:gradle:$gradle_version"classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$gradle_plugin_version"- classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"}}