Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Added a function to clear the database #79

Arty Bishope9dc166e1e73
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt
index 8f600c0b..468a6026 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/local/LocalSource.kt
@@ -69,4 +69,9 @@ class LocalSource(
override suspend fun updateTransmitters(transmitters: List<Transmitter>) {
transmittersDao.updateTransmitters(transmitters.toFramework())
}
+
+ override suspend fun clearData() {
+ entriesDao.deleteEntries()
+ transmittersDao.deleteTransmitters()
+ }
}
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
index 16b5eb88..206f5290 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
@@ -116,6 +116,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
binding.prefsData.updateBtnWeb.setOnClickListener {
findNavController().navigateSafe(R.id.action_prefs_to_sources)
}
+ binding.prefsData.updateBtnClear.setOnClickListener { viewModel.clearData() }
getNavResult<List<String>>(R.id.nav_settings, "sources") { sources ->
viewModel.updateDataFromWeb(sources)
}
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
index 1754a2c7..7304a05c 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsViewModel.kt
@@ -25,6 +25,10 @@ class SettingsViewModel @Inject constructor(
repository.updateDataFromWeb(sources)
}
+ fun clearData() {
+ repository.clearData()
+ }
+
fun getUseUTC(): Boolean = settings.getUseUTC()
fun setUseUTC(value: Boolean) = settings.setUseUTC(value)
diff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xml
index 414ae195..e305ba97 100644
--- a/app/src/main/res/layout/card_prefs_update.xml
+++ b/app/src/main/res/layout/card_prefs_update.xml
@@ -35,11 +35,11 @@
style="@style/AppButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="4dp"
+ android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:drawableStart="@drawable/ic_update_web"
- android:text="@string/update_web"
+ android:text="Web"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/update_btn_file"
app:layout_constraintHorizontal_bias="0.5"
@@ -51,14 +51,28 @@
style="@style/AppButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginEnd="4dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:drawableStart="@drawable/ic_update_file"
- android:text="@string/update_file"
+ android:text="File"
app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/update_btn_clear"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/update_btn_web" />
+ <Button
+ android:id="@+id/update_btn_clear"
+ style="@style/AppButton"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:drawableStart="@drawable/ic_update_file"
+ android:text="Clear"
+ app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/update_btn_file" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8420a89b..b29c5815 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,9 +20,11 @@
<item name="android:windowBackground">@color/surfaceBg</item>
</style>
- <style name="AppButton">
+ <style name="AppButton" parent="Widget.Material3.Button">
<item name="android:backgroundTint">@color/surfaceButton</item>
<item name="android:ellipsize">end</item>
+ <item name="cornerRadius">@dimen/card_corner_high</item>
+ <item name="rippleColor">@color/themeLight</item>
<item name="android:maxLines">1</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">@color/themeLight</item>
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt
index 3c8d2bb4..69f72db3 100644
--- a/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt
+++ b/core/src/main/java/com/rtbishop/look4sat/data/DataRepository.kt
@@ -102,6 +102,14 @@ class DataRepository(
}
}
+ override fun clearData() {
+ repositoryScope.launch {
+ _updateState.value = DataState.Loading
+ localSource.clearData()
+ _updateState.value = DataState.Success(0L)
+ }
+ }
+
override fun getSatelliteItems(): Flow<List<SatItem>> = localSource.getSatelliteItems()
override suspend fun getSelectedSatellites() = localSource.getSelectedSatellites()
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt b/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt
index 1cff87f7..839714d7 100644
--- a/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt
+++ b/core/src/main/java/com/rtbishop/look4sat/data/ILocalSource.kt
@@ -39,4 +39,6 @@ interface ILocalSource {
suspend fun updateEntriesSelection(catnums: List<Int>, isSelected: Boolean)
suspend fun updateTransmitters(transmitters: List<Transmitter>)
+
+ suspend fun clearData()
}
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt b/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt
index 3959e87b..2eb2734d 100644
--- a/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt
+++ b/core/src/main/java/com/rtbishop/look4sat/domain/IDataRepository.kt
@@ -34,6 +34,8 @@ interface IDataRepository {
fun updateDataFromWeb(sources: List<String>)
+ fun clearData()
+
fun getSatelliteItems(): Flow<List<SatItem>>
suspend fun getSelectedSatellites(): List<Satellite>