Removed redundant data class modifiers, minor cleanup

This commit is contained in:
Arty Bishop committed 2021-03-06 15:31:47 +00:00
1 parent b169af4883
commit 8df2334cd6
8 files changed
+7 -20

No files matched your search

@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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())
class TleSource(var url: String = String())
@@ -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() {
@@ -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"
@@ -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