From 0f4a70b204fa0423565b67fcc85156c7957fb1d7 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Thu, 30 Dec 2021 19:37:49 +0000 Subject: [PATCH] Further changes to layouts and fragments --- .../look4sat/presentation/Look4SatActivity.kt | 8 +-- .../entriesScreen/EntriesFragment.kt | 14 ++-- .../passesScreen/PassesFragment.kt | 33 +++++---- .../main/res/drawable-nodpi/card_pass_bg.webp | Bin 3122 -> 0 bytes app/src/main/res/drawable/ic_filter.xml | 6 +- app/src/main/res/drawable/ic_nav_info.xml | 9 --- app/src/main/res/drawable/ic_nav_prefs.xml | 2 +- app/src/main/res/drawable/ic_qth.xml | 6 +- app/src/main/res/drawable/ic_refresh.xml | 9 --- .../main/res/drawable/rec_divider_dark.xml | 4 +- .../main/res/drawable/rec_divider_light.xml | 11 --- app/src/main/res/drawable/rounded_corner.xml | 8 --- app/src/main/res/layout/activity_main.xml | 34 ++------- app/src/main/res/layout/fragment_entries.xml | 67 +++++------------- app/src/main/res/layout/fragment_map.xml | 8 +-- app/src/main/res/layout/fragment_passes.xml | 56 +++++++++++---- .../main/res/layout/fragment_passes_new.xml | 64 ----------------- app/src/main/res/layout/fragment_radar.xml | 10 +-- app/src/main/res/layout/item_entry.xml | 2 +- app/src/main/res/layout/item_pass_geo.xml | 15 +--- app/src/main/res/layout/item_pass_leo.xml | 15 +--- app/src/main/res/menu/nav_menu.xml | 19 ----- app/src/main/res/values/colors.xml | 13 ++-- app/src/main/res/values/dimens.xml | 3 +- app/src/main/res/values/styles.xml | 19 +++-- .../com/rtbishop/look4sat/DataParserTest.kt | 21 +++--- 26 files changed, 140 insertions(+), 316 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/card_pass_bg.webp delete mode 100644 app/src/main/res/drawable/ic_nav_info.xml delete mode 100644 app/src/main/res/drawable/ic_refresh.xml delete mode 100644 app/src/main/res/drawable/rec_divider_light.xml delete mode 100644 app/src/main/res/drawable/rounded_corner.xml delete mode 100644 app/src/main/res/layout/fragment_passes_new.xml delete mode 100644 app/src/main/res/menu/nav_menu.xml diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt index 2d8bc996..8d4ed819 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt @@ -22,9 +22,6 @@ import android.content.pm.ActivityInfo import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.ui.setupWithNavController -import com.rtbishop.look4sat.R import com.rtbishop.look4sat.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint @@ -36,9 +33,6 @@ class Look4SatActivity : AppCompatActivity() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT super.onCreate(savedInstanceState) installSplashScreen() - val binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - val navHost = supportFragmentManager.findFragmentById(R.id.main_nav_host) as NavHostFragment - binding.mainNavBottom.setupWithNavController(navHost.navController) + setContentView(ActivityMainBinding.inflate(layoutInflater).root) } } diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt index 67c911a5..1e5758b2 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt @@ -24,17 +24,15 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import com.google.android.material.snackbar.Snackbar import com.rtbishop.look4sat.R import com.rtbishop.look4sat.databinding.FragmentEntriesBinding -import com.rtbishop.look4sat.domain.model.SatItem import com.rtbishop.look4sat.domain.model.DataState +import com.rtbishop.look4sat.domain.model.SatItem import com.rtbishop.look4sat.presentation.ItemDivider import com.rtbishop.look4sat.presentation.getNavResult -import com.rtbishop.look4sat.presentation.navigateSafe import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -59,12 +57,12 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) { adapter = entriesAdapter layoutManager = GridLayoutManager(requireContext(), 2) (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false - addItemDecoration(ItemDivider(R.drawable.rec_divider_light)) + addItemDecoration(ItemDivider(R.drawable.rec_divider_dark)) } - entriesImportWeb.setOnClickListener { - findNavController().navigateSafe(R.id.action_entries_to_sources) - } - entriesImportFile.setOnClickListener { filePicker.launch("*/*") } +// entriesImportWeb.setOnClickListener { +// findNavController().navigateSafe(R.id.action_entries_to_sources) +// } +// entriesImportFile.setOnClickListener { filePicker.launch("*/*") } entriesSelectMode.setOnClickListener { showModesDialog() } entriesSelectAll.setOnClickListener { viewModel.selectCurrentItems() } entriesSearchBar.setOnQueryTextListener(viewModel) 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 31e2b438..aa07fe61 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 @@ -26,6 +26,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator import com.rtbishop.look4sat.R import com.rtbishop.look4sat.databinding.FragmentPassesBinding @@ -67,19 +68,21 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC layoutManager = LinearLayoutManager(context) (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false addItemDecoration(ItemDivider(R.drawable.rec_divider_dark)) -// addOnScrollListener(object : RecyclerView.OnScrollListener() { -// override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { -// if (dy > 0 && passesFab.visibility == View.VISIBLE) passesFab.hide() -// else if (dy < 0 && passesFab.visibility != View.VISIBLE) passesFab.show() -// } -// }) + addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + if (dy > 0 && passesFab.visibility == View.VISIBLE) passesFab.hide() + else if (dy < 0 && passesFab.visibility != View.VISIBLE) passesFab.show() + } + }) } - passesRefresh.setOnClickListener { findNavController().navigate(R.id.nav_pass_prefs) } -// passesSwipe.apply { -// setColorSchemeResources(R.color.greySurface) -// setProgressBackgroundColorSchemeResource(R.color.themeLight) -// setOnRefreshListener { passesViewModel.forceCalculation() } -// } + passesSwipe.apply { + setColorSchemeResources(R.color.greySurface) + setProgressBackgroundColorSchemeResource(R.color.themeLight) + setOnRefreshListener { passesViewModel.forceCalculation() } + } + passesFilter.setOnClickListener { findNavController().navigate(R.id.nav_pass_prefs) } + passesSettings.setOnClickListener { findNavController().navigate(R.id.nav_prefs) } + passesFab.setOnClickListener { findNavController().navigate(R.id.nav_entries) } } // val appBarConfiguration = AppBarConfiguration(setOf(R.id.nav_passes)) // binding.passesToolbar.setupWithNavController(findNavController(), appBarConfiguration) @@ -109,7 +112,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC is DataState.Success -> { passesAdapter.submitList(dataState.data) binding.apply { -// passesSwipe.isRefreshing = false + passesSwipe.isRefreshing = false passesError.visibility = View.INVISIBLE passesProgress.visibility = View.INVISIBLE passesRecycler.visibility = View.VISIBLE @@ -118,7 +121,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC } is DataState.Loading -> { binding.apply { -// passesSwipe.isRefreshing = true + passesSwipe.isRefreshing = true passesTimer.text = 0L.toTimerString() passesError.visibility = View.INVISIBLE passesRecycler.visibility = View.INVISIBLE @@ -127,7 +130,7 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC } else -> { binding.apply { -// passesSwipe.isRefreshing = false + passesSwipe.isRefreshing = false passesTimer.text = 0L.toTimerString() passesProgress.visibility = View.INVISIBLE passesRecycler.visibility = View.INVISIBLE diff --git a/app/src/main/res/drawable-nodpi/card_pass_bg.webp b/app/src/main/res/drawable-nodpi/card_pass_bg.webp deleted file mode 100644 index 221fed0a5005288fa390ee4641bff572e53bb223..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3122 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 M`}@|up-1e{0M=COPyhe` diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml index 0104d2e7..ced58887 100644 --- a/app/src/main/res/drawable/ic_filter.xml +++ b/app/src/main/res/drawable/ic_filter.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_nav_info.xml b/app/src/main/res/drawable/ic_nav_info.xml deleted file mode 100644 index 8cab94ea..00000000 --- a/app/src/main/res/drawable/ic_nav_info.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_nav_prefs.xml b/app/src/main/res/drawable/ic_nav_prefs.xml index 9e35f67f..97cb7ab9 100644 --- a/app/src/main/res/drawable/ic_nav_prefs.xml +++ b/app/src/main/res/drawable/ic_nav_prefs.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_qth.xml b/app/src/main/res/drawable/ic_qth.xml index 27a095ca..debc95e7 100644 --- a/app/src/main/res/drawable/ic_qth.xml +++ b/app/src/main/res/drawable/ic_qth.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml deleted file mode 100644 index a96341a9..00000000 --- a/app/src/main/res/drawable/ic_refresh.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/rec_divider_dark.xml b/app/src/main/res/drawable/rec_divider_dark.xml index db635e1a..2beb01ac 100644 --- a/app/src/main/res/drawable/rec_divider_dark.xml +++ b/app/src/main/res/drawable/rec_divider_dark.xml @@ -4,8 +4,8 @@ + android:height="1dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/rec_divider_light.xml b/app/src/main/res/drawable/rec_divider_light.xml deleted file mode 100644 index f0bd72fb..00000000 --- a/app/src/main/res/drawable/rec_divider_light.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/rounded_corner.xml b/app/src/main/res/drawable/rounded_corner.xml deleted file mode 100644 index 5c149456..00000000 --- a/app/src/main/res/drawable/rounded_corner.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 76c8961b..8b97bd9c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,31 +1,9 @@ - - - - - - - \ No newline at end of file + android:layout_height="match_parent" + app:defaultNavHost="true" + app:navGraph="@navigation/nav_graph" /> diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml index 1fb95f8c..35696546 100644 --- a/app/src/main/res/layout/fragment_entries.xml +++ b/app/src/main/res/layout/fragment_entries.xml @@ -1,76 +1,42 @@ + android:layout_height="match_parent" + android:background="@color/greyCard"> - - - - - - - + app:layout_constraintTop_toTopOf="@+id/entries_bar" /> + app:layout_constraintTop_toTopOf="@+id/entries_bar" /> + app:layout_constraintBottom_toBottomOf="@+id/entries_select_mode" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/entries_select_mode" /> + app:layout_constraintTop_toBottomOf="@+id/entries_bar" /> - @@ -17,7 +18,7 @@ style="@style/TimerText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:elevation="4dp" + android:elevation="16dp" android:text="@string/timer_zero" android:textSize="40sp" app:layout_constraintBottom_toBottomOf="@+id/passes_bar" @@ -26,29 +27,46 @@ app:layout_constraintTop_toTopOf="parent" /> - + + - + + + @@ -73,4 +91,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/passes_bar" /> + + diff --git a/app/src/main/res/layout/fragment_passes_new.xml b/app/src/main/res/layout/fragment_passes_new.xml deleted file mode 100644 index bc99bf92..00000000 --- a/app/src/main/res/layout/fragment_passes_new.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml index 3bb7c43a..0c3ada06 100644 --- a/app/src/main/res/layout/fragment_radar.xml +++ b/app/src/main/res/layout/fragment_radar.xml @@ -7,9 +7,10 @@ android:layout_height="match_parent" android:keepScreenOn="true"> - @@ -19,7 +20,7 @@ style="@style/TimerText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:elevation="4dp" + android:elevation="16dp" android:text="@string/timer_zero" android:textSize="40sp" app:layout_constraintBottom_toBottomOf="@+id/radar_bar" @@ -99,7 +100,7 @@ android:layout_marginEnd="4dp" android:backgroundTint="@color/greyDark" android:contentDescription="@string/placeholder" - android:elevation="4dp" + android:elevation="16dp" android:src="@drawable/ic_nav_map" app:layout_constraintBottom_toBottomOf="@+id/radar_bar" app:layout_constraintEnd_toEndOf="@+id/radar_bar" @@ -111,7 +112,6 @@ android:layout_width="0dp" android:layout_height="0dp" android:overScrollMode="never" - android:padding="2dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xml index 80a71875..7a7f615c 100644 --- a/app/src/main/res/layout/item_entry.xml +++ b/app/src/main/res/layout/item_entry.xml @@ -3,7 +3,7 @@ android:id="@+id/entry_checkbox" android:layout_width="match_parent" android:layout_height="36dp" - android:background="@null" + android:background="@color/greyCard" android:ellipsize="end" android:lines="1" android:text="@string/placeholder" diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xml index 879c891e..feafc44b 100644 --- a/app/src/main/res/layout/item_pass_geo.xml +++ b/app/src/main/res/layout/item_pass_geo.xml @@ -4,7 +4,7 @@ android:id="@+id/pass_geo_card" android:layout_width="match_parent" android:layout_height="wrap_content" - android:backgroundTint="@color/greyDark" + android:backgroundTint="@color/greyCard" app:cardCornerRadius="0dp"> - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 45563536..e8bcda47 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,14 +2,15 @@ #FFE082 #FFCA28 - #121212 - #121212 - #1E1E1E - #2A2A2A + #D0D0D0 #808080 - #1e1e1e + #242424 + #1E1E1E + #181818 + #121212 #99000000 + + @color/greyButton @color/greyLight - @color/bgDark diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bc49b13f..63cfa1f6 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,5 @@ - 48dp 12sp 12sp - \ 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 0a09e726..ee0780bc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,17 +12,16 @@ @color/themeLight @color/themeLight @color/greyLight - @color/greyDark + @color/greyCard @color/greyDark - @color/greyDark + @color/greySurface false -