From 8df2334cd6ddb73a270d231eeb2b8537a1159e4f Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 6 Mar 2021 15:31:47 +0000 Subject: [PATCH] Removed redundant data class modifiers, minor cleanup --- app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt | 2 +- app/src/main/java/com/rtbishop/look4sat/data/SatPass.kt | 2 +- app/src/main/java/com/rtbishop/look4sat/data/SatTrans.kt | 2 +- .../main/java/com/rtbishop/look4sat/data/SelectedSat.kt | 2 +- app/src/main/java/com/rtbishop/look4sat/data/TleSource.kt | 6 +----- .../rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt | 3 ++- app/src/main/res/layout/fragment_entries.xml | 3 --- app/src/main/res/navigation/nav_graph.xml | 7 ------- 8 files changed, 7 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/data/SatEntry.kt index 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.PrimaryKey import 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.kt index 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.SatPassTime import com.github.amsacode.predict4java.TLE import 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.kt index 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.PrimaryKey import 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.kt index 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.data import com.github.amsacode.predict4java.Position import 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.kt index 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 file diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/entriesScreen/EntriesFragment.kt index 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.xml index 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.xml index 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" /> -