Added entries update states and error handling

This commit is contained in:
Arty Bishop committed 2020-10-18 20:40:58 +01:00
1 parent e9424ad997
commit 628a01b530
7 files changed
+117 -76

No files matched your search

+25 -1
View File
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:elevation="4dp"
android:text="@string/sat_import"
android:text="@string/entries_update"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@+id/import_web"
app:layout_constraintStart_toStartOf="parent"
@@ -94,11 +94,35 @@
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"
app:layout_constraintTop_toBottomOf="@+id/search_bar" />
<ProgressBar
android:id="@+id/entries_progress"
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"
app:layout_constraintTop_toBottomOf="@+id/entries_bar" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/entries_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entries_error"
android:textSize="20sp"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/entries_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
+2 -1
View File
@@ -104,5 +104,6 @@
<string name="tle_source">Источник TLE</string>
<string name="https_only">Используйте HTTPS</string>
<string name="sat_import">Импорт спутников</string>
<string name="entries_update">Обновить данные TLE:</string>
<string name="entries_error">Пожалуйста, обновите данные TLE</string>
</resources>
+2 -1
View File
@@ -118,7 +118,8 @@
<string name="https_only">Please use HTTPS URLs only</string>
<string name="placeholder" translatable="false">Placeholder</string>
<string name="osmCopyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>
<string name="sat_import">Import satellite data</string>
<string name="timer_zero" translatable="false">00:00:00</string>
<string name="timer_placeholder" translatable="false">-</string>
<string name="entries_update">TLE data update:</string>
<string name="entries_error">Please update TLE data</string>
</resources>