Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Switched to SafeArgs plugin. Libraries update.
Arty Bishop37a567b47f39
diff --git a/app/build.gradle b/app/build.gradleindex bd2f5dd4..3f32a9db 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -21,6 +21,7 @@ apply plugin: 'com.android.application'apply plugin: 'kotlin-android'apply plugin: 'kotlin-android-extensions'apply plugin: 'kotlin-kapt'+apply plugin: "androidx.navigation.safeargs.kotlin"apply plugin: 'com.google.android.gms.oss-licenses-plugin'android {diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/RadarFragment.ktindex 7086dea8..32f58c3e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/RadarFragment.kt@@ -32,6 +32,7 @@ import android.widget.TextViewimport androidx.fragment.app.Fragmentimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScope+import androidx.navigation.fragment.navArgsimport androidx.recyclerview.widget.LinearLayoutManagerimport androidx.recyclerview.widget.RecyclerViewimport com.github.amsacode.predict4java.SatPos@@ -48,6 +49,7 @@ import kotlin.math.sinclass RadarFragment : Fragment() {private val service = Executors.newSingleThreadScheduledExecutor()+ private val args: RadarFragmentArgs by navArgs()private lateinit var viewModel: MainViewModelprivate lateinit var satPass: SatPass@@ -79,7 +81,7 @@ class RadarFragment : Fragment() {override fun onViewCreated(view: View, savedInstanceState: Bundle?) {super.onViewCreated(view, savedInstanceState)val delay = viewModel.delay- satPass = arguments?.get("satPass") as SatPass+ satPass = args.satPassmainActivity.supportActionBar?.title = satPass.tle.nameradarSkyFrame = view.findViewById(R.id.radar_sky_frame)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.ktindex 47badd73..c159c048 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SatPassAdapter.kt@@ -24,7 +24,6 @@ import android.view.Viewimport android.view.ViewGroupimport android.widget.ProgressBarimport android.widget.TextView-import androidx.core.os.bundleOfimport androidx.navigation.findNavControllerimport androidx.recyclerview.widget.RecyclerViewimport com.rtbishop.look4sat.R@@ -77,8 +76,8 @@ class SatPassAdapter : RecyclerView.Adapter<SatPassAdapter.PassHolder>() {passEnd.text = String.format("LOS - %s", losTime)holder.itemView.setOnClickListener {- val bundle = bundleOf("satPass" to satPass)- holder.itemView.findNavController().navigate(R.id.action_nav_sky_to_nav_radar, bundle)+ val action = SkyFragmentDirections.actionNavSkyToNavRadar(satPass)+ holder.itemView.findNavController().navigate(action)}}}\ No newline at end of filediff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 83a65ee7..393ce1b2 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -23,7 +23,11 @@android:id="@+id/nav_radar"android:name="com.rtbishop.look4sat.ui.RadarFragment"android:label="@string/menu_radar"- tools:layout="@layout/fragment_radar" />+ tools:layout="@layout/fragment_radar">+ <argument+ android:name="satPass"+ app:argType="com.rtbishop.look4sat.repo.SatPass" />+ </fragment><fragmentandroid:id="@+id/nav_map"diff --git a/build.gradle b/build.gradleindex f2e07728..c7be2df0 100644--- a/build.gradle+++ b/build.gradle@@ -29,6 +29,7 @@ buildscript {classpath "com.android.tools.build:gradle:3.5.3"classpath "com.google.android.gms:oss-licenses-plugin:0.10.0"classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"+ classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0"}}@@ -44,7 +45,7 @@ task clean(type: Delete) {}ext {- material = '1.2.0-alpha02'+ material = '1.2.0-alpha03'supportLib = '1.0.0'constraintLayout = '1.1.3'@@ -54,7 +55,7 @@ ext {navigation = '2.1.0'lifecycle = '2.2.0-rc03'- room = '2.2.2'+ room = '2.2.3'retrofit = '2.6.2'