Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Removed redundant data class modifiers, minor cleanup
Arty Bishop8df2334cd6dd
diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.ktindex 347da288..13348b14 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt@@ -24,7 +24,7 @@ import androidx.room.PrimaryKeyimport com.github.amsacode.predict4java.TLE@Entity(tableName = "entries")-data class SatEntry(+class SatEntry(val tle: TLE,var isSelected: Boolean = false,@PrimaryKey val catNum: Int = tle.catnum,diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatPass.ktindex fb944361..b1f146c1 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt@@ -23,7 +23,7 @@ import com.github.amsacode.predict4java.SatPassTimeimport com.github.amsacode.predict4java.TLEimport com.rtbishop.look4sat.utility.PassPredictor-data class SatPass(+class SatPass(val tle: TLE,val predictor: PassPredictor,val pass: SatPassTime,diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.ktindex 03b3adbb..d172905c 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt@@ -24,7 +24,7 @@ import androidx.room.PrimaryKeyimport com.squareup.moshi.Json@Entity(tableName = "transmitters")-data class SatTrans(+class SatTrans(@PrimaryKey @field:Json(name = "uuid") val uuid: String,@field:Json(name = "description") val description: String,@field:Json(name = "alive") val isAlive: Boolean,diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.kt b/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.ktindex 74c2a4f0..134842d1 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/SelectedSat.kt@@ -22,7 +22,7 @@ package com.rtbishop.look4sat.dataimport com.github.amsacode.predict4java.Positionimport org.osmdroid.views.overlay.Overlay-data class SelectedSat(+class SelectedSat(val pass: SatPass,val catNum: Int,val name: String,diff --git a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt b/app/src/main/java/com/rtbishop/look4sat/data/TleSource.ktindex 10869cf4..5cff5792 100644--- a/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt@@ -19,8 +19,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,package com.rtbishop.look4sat.data-import androidx.room.Entity-import androidx.room.PrimaryKey--@Entity(tableName = "sources")-data class TleSource(@PrimaryKey var url: String = String())\ No newline at end of file+class TleSource(var url: String = String())\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.ktindex 63d1ff62..bbdb212b 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt@@ -74,6 +74,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {}private fun observeEntries() {+ setLoading()viewModel.getEntries().observe(viewLifecycleOwner, { entries ->if (entries.isNullOrEmpty()) setError()else {@@ -123,7 +124,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {}private fun showImportFromWebDialog() {- findNavController().navigate(R.id.action_entries_to_dialog_sources)+ findNavController().navigate(R.id.nav_dialog_sources)}private fun navigateToPasses() {diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex c4a3b32b..2afed24e 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -76,7 +76,6 @@android:id="@+id/entries_recycler"android:layout_width="0dp"android:layout_height="0dp"- android:visibility="invisible"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"@@ -87,7 +86,6 @@style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Large"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:visibility="visible"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"@@ -99,7 +97,6 @@android:layout_height="wrap_content"android:text="@string/entries_no_data"android:textSize="20sp"- android:visibility="invisible"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xmlindex 68825a0a..0506c579 100644--- a/app/src/main/res/navigation/nav_graph.xml+++ b/app/src/main/res/navigation/nav_graph.xml@@ -16,13 +16,6 @@app:exitAnim="@anim/nav_default_exit_anim"app:popEnterAnim="@anim/nav_default_pop_enter_anim"app:popExitAnim="@anim/nav_default_pop_exit_anim" />- <action- android:id="@+id/action_entries_to_dialog_sources"- app:destination="@id/nav_dialog_sources"- 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" /></fragment><fragment