Further changes to layouts and fragments

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)
     }
 }

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)

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