mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-04 03:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily restored BottomNavigationBar

Browse Source
This commit is contained in:
Arty Bishop committed 2022-01-10 22:15:21 +00:00
1 parent 82032109dd
commit f559c60154
16 files changed
+125 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/rtbishop/look4sat/presentation/Look4SatActivity.kt
+7 -1
View File
@@ -22,6 +22,9 @@ 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
@@ -33,6 +36,9 @@ class Look4SatActivity : AppCompatActivity() {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
super.onCreate(savedInstanceState)
installSplashScreen()
setContentView(ActivityMainBinding.inflate(layoutInflater).root)
val binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
val navHost = supportFragmentManager.findFragmentById(R.id.main_nav_host) as NavHostFragment
binding.mainNavBottom.setupWithNavController(navHost.navController)
}
}
app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
viewModel.satData.observe(viewLifecycleOwner, { satData ->
handleSatData(satData, binding, entriesAdapter)
})
getNavResult<List<String>>(R.id.nav_entries, "sources") { sources ->
getNavResult<List<String>>(R.id.nav_satellites, "sources") { sources ->
viewModel.updateDataFromWeb(sources)
}
}
app/src/main/java/com/rtbishop/look4sat/presentation/passesScreen/PassesFragment.kt
+2 -2
View File
@@ -79,8 +79,8 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
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) }
passesSettings.setOnClickListener { findNavController().navigate(R.id.nav_settings) }
passesFab.setOnClickListener { findNavController().navigate(R.id.nav_satellites) }
}
passesViewModel.passes.observe(viewLifecycleOwner, { passesResult ->
handleNewPasses(passesResult, passesAdapter, binding)
app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt
+1 -2
View File
@@ -133,8 +133,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
binding.radarTimer.text = millisBeforeEnd.toTimerString()
if (timeNow > satPass.losTime) {
binding.radarTimer.text = 0L.toTimerString()
// findNavController().navigateSafe(R.id.action_radar_to_passes)
findNavController().popBackStack(R.id.nav_passes, true)
findNavController().navigateUp()
}
}
} else {
app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt
+1 -1
View File
@@ -132,7 +132,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
binding.prefsData.updateBtnWeb.setOnClickListener {
findNavController().navigateSafe(R.id.action_prefs_to_sources)
}
getNavResult<List<String>>(R.id.nav_prefs, "sources") { sources ->
getNavResult<List<String>>(R.id.nav_settings, "sources") { sources ->
lifecycleScope.launchWhenResumed { dataRepository.updateDataFromWeb(sources) }
}
}