diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt index 5a29d248..3c280a73 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt @@ -141,12 +141,12 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC tickMainTimer(state.data) if (state.data.isNotEmpty()) { // show new passes list passesRecycler.visibility = View.VISIBLE - passesErrorMsg.visibility = View.INVISIBLE + passesEmpty.visibility = View.INVISIBLE passesRefreshBtn.isEnabled = true refreshAnimator?.cancel() } else { // show no passes message passesRecycler.visibility = View.INVISIBLE - passesErrorMsg.visibility = View.VISIBLE + passesEmpty.visibility = View.VISIBLE passesRefreshBtn.isEnabled = true refreshAnimator?.cancel() } @@ -155,7 +155,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC refreshAnimator?.start() passesRefreshBtn.isEnabled = false passesTimer.text = 0L.toTimerString() - passesErrorMsg.visibility = View.INVISIBLE } else -> {} } diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml new file mode 100644 index 00000000..5ab704f7 --- /dev/null +++ b/app/src/main/res/drawable/ic_list.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml index 1ef0a825..459e0d58 100644 --- a/app/src/main/res/layout/fragment_passes.xml +++ b/app/src/main/res/layout/fragment_passes.xml @@ -1,6 +1,7 @@ @@ -44,13 +45,37 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_marginStart="48dp" + android:layout_marginEnd="48dp" + android:layout_marginBottom="32dp" + android:orientation="vertical" + tools:ignore="UseCompoundDrawables"> + + + + + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bc9b94bc..a59c5d57 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -45,7 +45,7 @@ Поиск по Имени / Id Ошибка обновления спутников - Нет предстоящих пролётов + Нет предстоящих пролётов спутников Пожалуйста, обновите базу данных спутников через меню Настроек НПС - %.1f° diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5def0cdd..1e4b6ade 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,7 +47,7 @@ 00:00:00 - No upcoming passes + There are no upcoming satellite passes to display No data to show. Please update the database via Settings menu. %s