Restored bottom navigation bar for comparison

app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt

@@ -23,6 +23,9 @@ import android.os.Bundle
 import androidx.activity.viewModels
 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,7 +39,10 @@ class MainActivity : AppCompatActivity() {
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         installSplashScreen()
         super.onCreate(savedInstanceState)
-        setContentView(ActivityMainBinding.inflate(layoutInflater).root)
+        val binding = ActivityMainBinding.inflate(layoutInflater)
+        val host = supportFragmentManager.findFragmentById(R.id.navigation_host) as NavHostFragment
+        setContentView(binding.root)
+        binding.navigationBar.setupWithNavController(host.navController)
         mainViewModel.calculatePasses()
     }
 }

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt

@@ -74,12 +74,12 @@ class MapViewModel @Inject constructor(
         }
     }
 
-    fun selectDefaultSatellite(catnum: Int?) {
+    fun selectDefaultSatellite(catnum: Int) {
         viewModelScope.launch {
             dataRepository.getSelectedSatellites().also { satellites ->
                 if (satellites.isNotEmpty()) {
                     allSatList = satellites
-                    if (catnum == null) {
+                    if (catnum == -1) {
                         selectSatellite(satellites.first())
                     } else {
                         satellites.find { it.params.catnum == catnum }?.let { selectSatellite(it) }

app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt

@@ -19,13 +19,11 @@ package com.rtbishop.look4sat.presentation.passesScreen
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 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
@@ -57,12 +55,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
                 this.layoutManager = layoutManager
                 addItemDecoration(itemDecoration)
                 (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
-                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()
-                    }
-                })
             }
             passesSwipe.apply {
                 setColorSchemeResources(R.color.surfaceToolbar)
@@ -75,17 +67,6 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
         passesViewModel.passes.observe(viewLifecycleOwner) { passesResult ->
             handleNewPasses(passesResult, adapter, binding)
         }
-        passesViewModel.satellites.observe(viewLifecycleOwner) { satellites ->
-            satellites?.let {
-                if (satellites.isEmpty()) {
-                    binding.passesFab.setOnClickListener {
-                        Toast.makeText(requireContext(), "Nothing to show", Toast.LENGTH_SHORT).show()
-                    }
-                } else {
-                    binding.passesFab.setOnClickListener { findNavController().navigate(R.id.nav_entries) }
-                }
-            }
-        }
         getNavResult<Pair<Int, Double>>(R.id.nav_passes, "prefs") { prefs ->
             passesViewModel.saveCalculationPrefs(prefs.first, prefs.second)
             passesViewModel.forceCalculation(prefs.first, prefs.second)

app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesViewModel.kt

@@ -17,7 +17,10 @@
  */
 package com.rtbishop.look4sat.presentation.passesScreen
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.rtbishop.look4sat.data.ISettingsHandler
 import com.rtbishop.look4sat.domain.IDataRepository
 import com.rtbishop.look4sat.domain.model.DataState
@@ -37,7 +40,6 @@ class PassesViewModel @Inject constructor(
     private var passesProcessing: Job? = null
     private val _passes = MutableLiveData<DataState<List<SatPass>>>()
     val passes: LiveData<DataState<List<SatPass>>> = _passes
-    val satellites = repository.getSatelliteItems().asLiveData()
 
     init {
         viewModelScope.launch {