From e11e4863d376889e80fc89acc53eb257e17ad60d Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Tue, 21 Jan 2020 16:35:23 +0000 Subject: [PATCH] Showing the information layout when no satellites are selected --- .../com/rtbishop/look4sat/MainViewModel.kt | 1 - .../rtbishop/look4sat/ui/PassListFragment.kt | 10 ++ app/src/main/res/drawable/ic_arrow_swipe.xml | 28 +++ app/src/main/res/drawable/ic_sputnik.xml | 31 ++++ app/src/main/res/layout/card_pass.xml | 2 +- .../main/res/layout/fragment_pass_list.xml | 162 ++++++++++++++++-- app/src/main/res/values/strings.xml | 14 +- app/src/main/res/values/styles.xml | 24 +++ 8 files changed, 250 insertions(+), 22 deletions(-) create mode 100644 app/src/main/res/drawable/ic_arrow_swipe.xml create mode 100644 app/src/main/res/drawable/ic_sputnik.xml diff --git a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt index 489c37bb..daed0361 100644 --- a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt +++ b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt @@ -69,7 +69,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { private val urlList = listOf( "https://celestrak.com/NORAD/elements/amateur.txt", - "https://celestrak.com/NORAD/elements/starlink.txt", "https://celestrak.com/NORAD/elements/weather.txt" ) diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt index 464dab78..da79e6aa 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/PassListFragment.kt @@ -29,6 +29,7 @@ import android.widget.ImageButton import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AlertDialog +import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider @@ -55,6 +56,7 @@ class PassListFragment : Fragment() { private lateinit var aosTimer: CountDownTimer private lateinit var aosTimerText: TextView private lateinit var swipeLayout: SwipeRefreshLayout + private lateinit var infoLayout: ConstraintLayout private lateinit var mainActivity: MainActivity private lateinit var satPassList: MutableList private var isTimerSet: Boolean = false @@ -86,6 +88,7 @@ class PassListFragment : Fragment() { aosTimerText = mainActivity.findViewById(R.id.toolbar_timer) btnPassPrefs = mainActivity.findViewById(R.id.toolbar_filter) swipeLayout = view.findViewById(R.id.pass_list_refresh) + infoLayout = view.findViewById(R.id.pass_info_layout) satPassRecycler = view.findViewById(R.id.pass_list_recycler) passListFab = view.findViewById(R.id.pass_list_fab) } @@ -114,6 +117,13 @@ class PassListFragment : Fragment() { viewModel.passSatList.observe(viewLifecycleOwner, Observer { satPassList = it satPassAdapter.setList(satPassList) + if (satPassList.isNotEmpty()) { + infoLayout.visibility = View.INVISIBLE + satPassRecycler.visibility = View.VISIBLE + } else { + infoLayout.visibility = View.VISIBLE + satPassRecycler.visibility = View.INVISIBLE + } setTimer() swipeLayout.isRefreshing = false }) diff --git a/app/src/main/res/drawable/ic_arrow_swipe.xml b/app/src/main/res/drawable/ic_arrow_swipe.xml new file mode 100644 index 00000000..82dd1415 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_swipe.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_sputnik.xml b/app/src/main/res/drawable/ic_sputnik.xml new file mode 100644 index 00000000..fd5675fa --- /dev/null +++ b/app/src/main/res/drawable/ic_sputnik.xml @@ -0,0 +1,31 @@ + + + + + + diff --git a/app/src/main/res/layout/card_pass.xml b/app/src/main/res/layout/card_pass.xml index ee40e721..fe2f4dfa 100644 --- a/app/src/main/res/layout/card_pass.xml +++ b/app/src/main/res/layout/card_pass.xml @@ -48,7 +48,7 @@ style="@style/CardPassName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="4dp" + android:layout_marginStart="2dp" android:text="@string/pass_satName" app:layout_constraintBaseline_toBaselineOf="@+id/pass_satId" app:layout_constraintStart_toEndOf="@+id/pass_img" /> diff --git a/app/src/main/res/layout/fragment_pass_list.xml b/app/src/main/res/layout/fragment_pass_list.xml index d2235dbc..4eef9a69 100644 --- a/app/src/main/res/layout/fragment_pass_list.xml +++ b/app/src/main/res/layout/fragment_pass_list.xml @@ -1,11 +1,29 @@ - - + + - @@ -14,22 +32,132 @@ android:layout_width="0dp" android:layout_height="0dp" android:paddingBottom="4dp" + android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"> - + - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a905fc7..1c9659a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - - + + +