Added BottomAppBar to several fragments, various ui changes

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

@@ -24,8 +24,6 @@ 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.NavigationUI
-import androidx.navigation.ui.setupWithNavController
 import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -43,14 +41,14 @@ class MainActivity : AppCompatActivity() {
         val binding = ActivityMainBinding.inflate(layoutInflater)
         val host = supportFragmentManager.findFragmentById(R.id.navigation_host) as NavHostFragment
         setContentView(binding.root)
-        binding.navigationBar.apply {
-            setupWithNavController(host.navController)
-            setOnItemSelectedListener { item ->
-                NavigationUI.onNavDestinationSelected(item, host.navController)
-                host.navController.popBackStack(item.itemId, inclusive = false)
-                true
-            }
-        }
+//        binding.navigationBar.apply {
+//            setupWithNavController(host.navController)
+//            setOnItemSelectedListener { item ->
+//                NavigationUI.onNavDestinationSelected(item, host.navController)
+//                host.navController.popBackStack(item.itemId, inclusive = false)
+//                true
+//            }
+//        }
         mainViewModel.calculatePasses()
     }
 }

app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesFragment.kt

@@ -32,6 +32,7 @@ import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.databinding.FragmentEntriesBinding
 import com.rtbishop.look4sat.domain.model.DataState
 import com.rtbishop.look4sat.domain.model.SatItem
+import com.rtbishop.look4sat.presentation.setNavResult
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -59,11 +60,15 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {
                 addItemDecoration(itemDecoration)
                 (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
             }
-            entriesBack.setOnClickListener { findNavController().navigateUp() }
+            entriesBackBtn.setOnClickListener { findNavController().navigateUp() }
             entriesSearch.doOnTextChanged { text, _, _, _ -> viewModel.setQuery(text.toString()) }
-            entriesMode.setOnClickListener { showModesDialog() }
-            entriesSelectAll.setOnClickListener { viewModel.selectCurrentItems() }
-            entriesAccept.setOnClickListener { viewModel.saveSelection() }
+            entriesModesBtn.setOnClickListener { showModesDialog() }
+            entriesSelectBtn.setOnClickListener { viewModel.selectCurrentItems(true) }
+            entriesClearBtn.setOnClickListener { viewModel.selectCurrentItems(false) }
+            entriesAcceptBtn.setOnClickListener {
+                setNavResult("selection", viewModel.saveSelection())
+                findNavController().popBackStack()
+            }
         }
         viewModel.satData.observe(viewLifecycleOwner) { satData ->
             handleSatData(satData, binding, adapter)

app/src/main/java/com/rtbishop/look4sat/presentation/entriesScreen/EntriesViewModel.kt

@@ -41,13 +41,13 @@ class EntriesViewModel @Inject constructor(
     private val itemsWithQuery = currentQuery.switchMap { query ->
         itemsWithModes.map { items -> filterByQuery(items, query) }
     }
-    private var shouldSelectAll = true
+//    private var shouldSelectAll = true
     val satData = itemsWithQuery.map { items -> DataState.Success(items) }
 
-    fun selectCurrentItems() {
+    fun selectCurrentItems(selectAll: Boolean) {
         itemsWithQuery.value?.let { itemsWithQuery ->
-            updateSelection(itemsWithQuery.map { item -> item.catnum }, shouldSelectAll)
-            shouldSelectAll = shouldSelectAll.not()
+            updateSelection(itemsWithQuery.map { item -> item.catnum }, selectAll)
+//            shouldSelectAll = shouldSelectAll.not()
         }
     }
 
@@ -61,15 +61,16 @@ class EntriesViewModel @Inject constructor(
     }
 
     fun setQuery(query: String) {
-        shouldSelectAll = true
+//        shouldSelectAll = true
         currentQuery.value = query
     }
 
-    fun saveSelection() {
-        itemsFromRepo.value?.let { itemsAll ->
+    fun saveSelection(): List<Int> {
+        return itemsFromRepo.value?.let { itemsAll ->
             val filteredItems = itemsAll.filter { item -> item.isSelected }
-            repository.setEntriesSelection(filteredItems.map { item -> item.catnum })
-        }
+//            repository.setEntriesSelection(filteredItems.map { item -> item.catnum })
+            filteredItems.map { item -> item.catnum }
+        } ?: emptyList()
     }
 
     override fun updateSelection(catNums: List<Int>, isSelected: Boolean) {

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

@@ -92,9 +92,9 @@ class MapFragment : Fragment(R.layout.fragment_map) {
                 // add overlays: 0 - GSP, 1 - SatTrack, 2 - SatFootprint, 3 - SatIcons
                 overlays.addAll(Array(4) { FolderOverlay() })
             }
-            mapBack.setOnClickListener { findNavController().navigateUp() }
-            mapBtnPrev.setOnClickListener { viewModel.scrollSelection(true) }
-            mapBtnNext.setOnClickListener { viewModel.scrollSelection(false) }
+            mapBackBtn.setOnClickListener { findNavController().navigateUp() }
+            mapPrevBtn.setOnClickListener { viewModel.scrollSelection(true) }
+            mapNextBtn.setOnClickListener { viewModel.scrollSelection(false) }
         }
     }
 

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

@@ -24,6 +24,7 @@ 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
@@ -51,59 +52,59 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
         val layoutManager = LinearLayoutManager(context)
         val itemDecoration = DividerItemDecoration(context, layoutManager.orientation)
         binding.run {
-            passesList.apply {
+            passesRecycler.apply {
                 setHasFixedSize(true)
                 this.adapter = adapter
                 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)
-                setProgressBackgroundColorSchemeResource(R.color.themeAccent)
-                setOnRefreshListener { passesViewModel.forceCalculation() }
-            }
-            passesFilter.setOnClickListener { navigateToPassPrefs() }
-            passesSettings.setOnClickListener { navigateToSettings() }
+            passesRefreshBtn.setOnClickListener { refreshPasses() }
+            passesMapBtn.setOnClickListener { navigateToMap() }
+            passesFilterBtn.setOnClickListener { navigateToPassPrefs() }
+            passesFab.setOnClickListener { navigateToEntries() }
+            passesSettingsBtn.setOnClickListener { navigateToSettings() }
         }
         passesViewModel.passes.observe(viewLifecycleOwner) { passesResult ->
-            handleNewPasses(passesResult, adapter, binding)
+            handleNewPasses(passesResult, adapter)
         }
         getNavResult<Pair<Int, Double>>(R.id.nav_passes, "prefs") { prefs ->
             passesViewModel.saveCalculationPrefs(prefs.first, prefs.second)
             passesViewModel.forceCalculation(prefs.first, prefs.second)
         }
+        getNavResult<List<Int>>(R.id.nav_passes, "selection") { selection ->
+            passesViewModel.saveSelectionAndRecalc(selection)
+        }
     }
 
-    private fun handleNewPasses(
-        dataState: DataState<List<SatPass>>,
-        passesAdapter: PassesAdapter,
-        binding: FragmentPassesBinding
-    ) {
-        when (dataState) {
+    private fun handleNewPasses(state: DataState<List<SatPass>>, adapter: PassesAdapter) {
+        when (state) {
             is DataState.Success -> {
-                passesAdapter.submitList(dataState.data)
+                adapter.submitList(state.data)
                 binding.apply {
-                    passesSwipe.isRefreshing = false
-                    passesList.visibility = View.VISIBLE
-                    passesError.visibility = View.INVISIBLE
+                    passesRecycler.visibility = View.VISIBLE
+                    passesErrorMsg.visibility = View.INVISIBLE
                 }
-                tickMainTimer(dataState.data, binding)
+                tickMainTimer(state.data, binding)
             }
             is DataState.Loading -> {
                 binding.apply {
                     passesTimer.text = 0L.toTimerString()
-                    passesSwipe.isRefreshing = true
-                    passesList.visibility = View.INVISIBLE
-                    passesError.visibility = View.INVISIBLE
+                    passesRecycler.visibility = View.INVISIBLE
+                    passesErrorMsg.visibility = View.INVISIBLE
                 }
             }
             else -> {
                 binding.apply {
                     passesTimer.text = 0L.toTimerString()
-                    passesSwipe.isRefreshing = false
-                    passesList.visibility = View.INVISIBLE
-                    passesError.visibility = View.VISIBLE
+                    passesRecycler.visibility = View.INVISIBLE
+                    passesErrorMsg.visibility = View.VISIBLE
                 }
             }
         }
@@ -126,11 +127,25 @@ class PassesFragment : Fragment(R.layout.fragment_passes), PassesAdapter.PassesC
         }
     }
 
+    private fun refreshPasses() {
+        passesViewModel.forceCalculation()
+    }
+
+    private fun navigateToMap() {
+        val direction = PassesFragmentDirections.actionGlobalMapFragment()
+        findNavController().navigate(direction)
+    }
+
     private fun navigateToPassPrefs() {
         val direction = PassesFragmentDirections.actionPassesToPassPrefs()
         findNavController().navigate(direction)
     }
 
+    private fun navigateToEntries() {
+        val direction = PassesFragmentDirections.actionGlobalEntriesFragment()
+        findNavController().navigate(direction)
+    }
+
     private fun navigateToSettings() {
         val direction = PassesFragmentDirections.actionGlobalSettingsFragment()
         findNavController().navigate(direction)

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

@@ -57,6 +57,13 @@ class PassesViewModel @Inject constructor(
         }
     }
 
+    fun saveSelectionAndRecalc(selection: List<Int>) {
+        viewModelScope.launch {
+            repository.setEntriesSelection(selection)
+            forceCalculation()
+        }
+    }
+
     fun forceCalculation(
         hoursAhead: Int = settings.getHoursAhead(),
         minElevation: Double = settings.getMinElevation(),

app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt

@@ -53,7 +53,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
 
     private fun setupViews() {
         val context = requireContext()
-        val adapter = RadiosAdapter()
+        val adapter = RadioAdapter()
         val layoutManager = LinearLayoutManager(context)
         val itemDecoration = DividerItemDecoration(context, layoutManager.orientation)
         binding.run {
@@ -68,7 +68,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
         }
     }
 
-    private fun setupObservers(radiosAdapter: RadiosAdapter) {
+    private fun setupObservers(radioAdapter: RadioAdapter) {
         viewModel.getPass(args.catNum, args.aosTime).observe(viewLifecycleOwner) { pass ->
             radarView = RadarView(requireContext()).apply {
                 setShowAim(preferences.getUseCompass())
@@ -82,7 +82,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {
             }
             viewModel.transmitters.observe(viewLifecycleOwner) { list ->
                 if (list.isNotEmpty()) {
-                    radiosAdapter.submitList(list)
+                    radioAdapter.submitList(list)
                     binding.radarRecyclerMsg.text = getString(R.string.trans_data)
                 } else {
                     binding.radarRecyclerMsg.text = getString(R.string.trans_no_data)

app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadioAdapter.kt

@@ -23,11 +23,11 @@ import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.databinding.ItemTransBinding
+import com.rtbishop.look4sat.databinding.ItemRadioBinding
 import com.rtbishop.look4sat.domain.model.SatRadio
 import java.util.*
 
-class RadiosAdapter : RecyclerView.Adapter<RadiosAdapter.TransHolder>() {
+class RadioAdapter : RecyclerView.Adapter<RadioAdapter.TransHolder>() {
 
     private val diffCallback = object : DiffUtil.ItemCallback<SatRadio>() {
         override fun areItemsTheSame(oldItem: SatRadio, newItem: SatRadio): Boolean {
@@ -40,9 +40,7 @@ class RadiosAdapter : RecyclerView.Adapter<RadiosAdapter.TransHolder>() {
     }
     private val differ = AsyncListDiffer(this, diffCallback)
 
-    fun submitList(radios: List<SatRadio>) {
-        differ.submitList(radios)
-    }
+    fun submitList(items: List<SatRadio>) = differ.submitList(items)
 
     override fun getItemCount() = differ.currentList.size
 
@@ -54,56 +52,51 @@ class RadiosAdapter : RecyclerView.Adapter<RadiosAdapter.TransHolder>() {
         holder.bind(differ.currentList[position])
     }
 
-    class TransHolder private constructor(private val binding: ItemTransBinding) :
+    class TransHolder private constructor(private val binding: ItemRadioBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
         private val divider = 1000000f
-        private val strNo = itemView.context.getString(R.string.no)
-        private val strYes = itemView.context.getString(R.string.yes)
+        private val stringYes = itemView.context.getString(R.string.yes)
+        private val stringNo = itemView.context.getString(R.string.no)
+        private val link = itemView.context.getString(R.string.trans_link_low)
+        private val linkNull = itemView.context.getString(R.string.trans_no_link)
         private val mode = itemView.context.getString(R.string.trans_mode)
-        private val formatLink = itemView.context.getString(R.string.trans_link_low)
-        private val formatLinkNull = itemView.context.getString(R.string.trans_no_link)
-        private val isInverted = itemView.context.getString(R.string.trans_inverted)
+        private val inverted = itemView.context.getString(R.string.trans_inverted)
 
         fun bind(radio: SatRadio) {
-            binding.transDesc.text = radio.info
-
-            radio.downlink.let { downlink ->
-                if (downlink != null) {
-                    val downlinkFreq = downlink / divider
-                    binding.transDownlink.text =
-                        String.format(Locale.ENGLISH, formatLink, downlinkFreq)
-                } else {
-                    binding.transDownlink.text = formatLinkNull
+            binding.run {
+                radioInfo.text = radio.info
+                radio.downlink.let { downlink ->
+                    if (downlink != null) {
+                        radioDownlink.text = String.format(Locale.ENGLISH, link, downlink / divider)
+                    } else {
+                        radioDownlink.text = linkNull
+                    }
                 }
-            }
-
-            radio.uplink.let { uplink ->
-                if (uplink != null) {
-                    val uplinkFreq = uplink / divider
-                    binding.transUplink.text = String.format(Locale.ENGLISH, formatLink, uplinkFreq)
-                } else {
-                    binding.transUplink.text = formatLinkNull
+                radio.uplink.let { uplink ->
+                    if (uplink != null) {
+                        radioUplink.text = String.format(Locale.ENGLISH, link, uplink / divider)
+                    } else {
+                        radioUplink.text = linkNull
+                    }
+                }
+                if (radio.mode != null) {
+                    radioMode.text = String.format(mode, radio.mode)
+                } else {
+                    radioMode.text = String.format(mode, stringNo)
+                }
+                if (radio.isInverted) {
+                    radioInverted.text = String.format(inverted, stringYes)
+                } else {
+                    radioInverted.text = String.format(inverted, stringNo)
                 }
-            }
-
-            if (radio.mode != null) {
-                binding.transMode.text = String.format(mode, radio.mode)
-            } else {
-                binding.transMode.text = String.format(mode, strNo)
-            }
-
-            if (radio.isInverted) {
-                binding.transInverted.text = String.format(isInverted, strYes)
-            } else {
-                binding.transInverted.text = String.format(isInverted, strNo)
             }
         }
 
         companion object {
             fun from(parent: ViewGroup): TransHolder {
                 val inflater = LayoutInflater.from(parent.context)
-                return TransHolder(ItemTransBinding.inflate(inflater, parent, false))
+                return TransHolder(ItemRadioBinding.inflate(inflater, parent, false))
             }
         }
     }

app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt

@@ -27,6 +27,7 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.NestedScrollView
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -71,6 +72,11 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
     }
 
     private fun setupViews() {
+        binding.settingsScroll.apply {
+            setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, y, _, newY ->
+                if (y > newY) binding.settingsFab.hide() else binding.settingsFab.show()
+            })
+        }
         binding.prefsBack.setOnClickListener { findNavController().navigateUp() }
         setupAboutCard()
         setupDataCard()

app/src/main/res/drawable/ic_add.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_arrow_left.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,5v14l-11,-7z" />
+</vector>

app/src/main/res/drawable/ic_arrow_right.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M8,5v14l11,-7z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_back.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_checkbox.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>

app/src/main/res/drawable/ic_checkbox_out.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>

app/src/main/res/drawable/ic_delete.xml

@@ -7,4 +7,4 @@
   <path
       android:fillColor="@android:color/white"
       android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_fdroid.xml

@@ -18,4 +18,4 @@
         android:strokeColor="#00000000"
         android:strokeLineCap="round"
         android:strokeLineJoin="miter" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_file.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_filter.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_github.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_list.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M2,21h19v-3H2v3zM20,8H3c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h17c0.55,0 1,-0.45 1,-1V9c0,-0.55 -0.45,-1 -1,-1zM2,3v3h19V3H2z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_notify_1.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+</vector>

app/src/main/res/drawable/ic_notify_2.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/>
+</vector>

app/src/main/res/drawable/ic_play.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM9.5,16.5v-9l7,4.5L9.5,16.5z"/>
+</vector>

app/src/main/res/drawable/ic_pos.xml

@@ -6,4 +6,4 @@
     <path
         android:fillColor="@color/themeAccent"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_prefs.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_qth.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_refresh.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,8l-4,4h3c0,3.31 -2.69,6 -6,6 -1.01,0 -1.97,-0.25 -2.8,-0.7l-1.46,1.46C8.97,19.54 10.43,20 12,20c4.42,0 8,-3.58 8,-8h3l-4,-4zM6,12c0,-3.31 2.69,-6 6,-6 1.01,0 1.97,0.25 2.8,0.7l1.46,-1.46C15.03,4.46 13.57,4 12,4c-4.42,0 -8,3.58 -8,8H1l4,4 4,-4H6z"/>
+</vector>

app/src/main/res/drawable/ic_satellite.xml

@@ -19,4 +19,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_splash.xml

@@ -10,4 +10,4 @@
             android:fillColor="@color/themeAccent"
             android:pathData="m104.005,111.936q0.504,0 0.958,-0.063 0.467,-0.076 0.87,-0.176l0,1.674q-0.202,0.101 -0.555,0.214 -0.34,0.113 -0.807,0.201 -0.454,0.101 -1.034,0.164 -0.58,0.063 -1.261,0.063 -0.87,0 -1.576,-0.214 -0.706,-0.201 -1.198,-0.68 -0.492,-0.491 -0.757,-1.259 -0.265,-0.78 -0.265,-1.913l0,-8.244l-1.942,0l0,-1.322q0.832,0 1.488,-0.327 0.656,-0.327 1.047,-0.755 0.794,-0.831 1.185,-2.555l2.144,0l0,3.197l3.304,0l0,1.762l-3.304,0l0,7.98q0,1.171 0.391,1.712 0.404,0.541 1.311,0.541zM85.595,109.922q0,1.108 0.353,1.661 0.353,0.554 1.11,0.554 0.555,0 0.996,-0.227 0.454,-0.239 0.769,-0.667 0.328,-0.428 0.492,-1.032 0.177,-0.617 0.177,-1.372l0,-1.938l-1.16,0.076q-0.769,0.038 -1.299,0.252 -0.53,0.201 -0.845,0.566 -0.315,0.365 -0.454,0.894 -0.139,0.529 -0.139,1.233zM87.89,101.188q-0.492,0 -0.832,0.214 -0.328,0.201 -0.53,0.579 -0.202,0.365 -0.29,0.881 -0.076,0.503 -0.076,1.108 -1.74,0 -2.623,-0.39 -0.87,-0.39 -0.87,-1.334 0,-0.705 0.416,-1.208 0.429,-0.503 1.147,-0.818 0.731,-0.315 1.69,-0.453 0.971,-0.151 2.068,-0.151 1.362,0 2.371,0.239 1.021,0.227 1.69,0.743 0.681,0.516 1.021,1.359 0.34,0.831 0.34,2.039l0,6.57q0,0.529 0.076,0.881 0.088,0.352 0.265,0.566 0.177,0.201 0.479,0.289 0.303,0.088 0.731,0.088l0.101,0l0,1.372l-4.804,0l-0.542,-1.775l-0.227,0q-0.429,0.516 -0.807,0.906 -0.378,0.378 -0.807,0.629 -0.429,0.252 -0.971,0.365 -0.53,0.126 -1.261,0.126 -0.857,0 -1.601,-0.252 -0.731,-0.252 -1.286,-0.768 -0.542,-0.529 -0.857,-1.309 -0.315,-0.793 -0.315,-1.863 0,-2.102 1.438,-3.109 1.45,-1.007 4.35,-1.095l2.118,-0.076l0,-1.422q0,-0.642 -0.05,-1.183 -0.05,-0.541 -0.214,-0.931 -0.164,-0.39 -0.492,-0.604 -0.315,-0.214 -0.845,-0.214zM72.115,114.013q-1.74,0 -2.9,-0.327 -1.16,-0.327 -1.866,-0.843 -0.694,-0.516 -0.996,-1.158 -0.29,-0.642 -0.29,-1.271 0,-0.667 0.24,-1.12 0.252,-0.453 0.656,-0.743 0.416,-0.289 0.933,-0.415 0.53,-0.126 1.097,-0.126 0,1.108 0.265,1.951 0.265,0.831 0.731,1.397 0.467,0.554 1.11,0.843 0.656,0.277 1.425,0.277 0.757,0 1.349,-0.214 0.593,-0.214 1.009,-0.592 0.416,-0.378 0.63,-0.881 0.214,-0.516 0.214,-1.108 0,-0.654 -0.265,-1.158 -0.265,-0.516 -0.807,-0.944 -0.53,-0.441 -1.349,-0.831 -0.807,-0.403 -1.891,-0.856 -1.349,-0.554 -2.282,-1.133 -0.921,-0.592 -1.488,-1.271 -0.567,-0.68 -0.82,-1.473 -0.24,-0.793 -0.24,-1.737 0,-1.183 0.479,-2.14 0.479,-0.957 1.324,-1.636 0.845,-0.68 2.005,-1.045 1.16,-0.365 2.522,-0.365 1.425,0 2.459,0.239 1.034,0.227 1.702,0.629 0.681,0.403 1.009,0.957 0.328,0.541 0.328,1.171 0,0.453 -0.202,0.843 -0.189,0.39 -0.593,0.68 -0.391,0.289 -0.996,0.453 -0.593,0.164 -1.387,0.164 0,-0.541 -0.151,-1.158 -0.139,-0.629 -0.467,-1.158 -0.328,-0.541 -0.857,-0.894 -0.517,-0.352 -1.261,-0.352 -0.517,0 -0.984,0.151 -0.467,0.151 -0.82,0.453 -0.34,0.302 -0.542,0.755 -0.202,0.441 -0.202,1.019 0,0.541 0.177,1.019 0.177,0.478 0.643,0.944 0.479,0.453 1.299,0.919 0.832,0.453 2.144,0.982 1.324,0.541 2.257,1.108 0.933,0.566 1.526,1.221 0.605,0.642 0.87,1.422 0.277,0.768 0.277,1.712 0,1.246 -0.492,2.291 -0.492,1.032 -1.412,1.775 -0.921,0.743 -2.219,1.158 -1.286,0.415 -2.9,0.415zM62.115,108.966l0,1.573q0,0.604 0.164,0.969 0.177,0.365 0.454,0.566 0.29,0.189 0.681,0.252 0.391,0.063 0.82,0.063l0.328,0l0,1.372l-9.054,0l0,-1.372l0.719,0q0.441,0 0.82,-0.063 0.391,-0.063 0.668,-0.252 0.29,-0.201 0.454,-0.566 0.177,-0.365 0.177,-0.969l0,-1.573l-7.15,0l0,-1.573l7.326,-12.032l3.594,0l0,11.906l2.686,0l0,1.699zM58.345,102.761q0,-1.133 0.038,-2.442 0.038,-1.309 0.139,-2.517 -0.126,0.302 -0.404,0.831 -0.277,0.529 -0.593,1.095 -0.315,0.554 -0.605,1.057 -0.29,0.491 -0.441,0.73l-3.48,5.752l5.347,0zM50.855,113.761l-0.366,0q-1.412,0 -2.371,-0.063 -0.958,-0.063 -1.652,-0.289 -0.694,-0.227 -1.198,-0.68 -0.504,-0.466 -1.009,-1.259l-2.295,-3.612 -1.034,0.768l0,2.089q0,0.554 0.177,0.881 0.189,0.327 0.454,0.503 0.277,0.176 0.605,0.239 0.328,0.05 0.605,0.05l0.303,0l0,1.372L34.866,113.761l0,-1.372l0.303,0q0.29,0 0.605,-0.05 0.328,-0.063 0.593,-0.239 0.277,-0.176 0.454,-0.503 0.189,-0.327 0.189,-0.881l0,-13.606q0,-0.516 -0.189,-0.818 -0.177,-0.315 -0.454,-0.478 -0.277,-0.176 -0.605,-0.227 -0.315,-0.05 -0.593,-0.05l-0.303,0l0,-1.359l6.065,0l0,9.943q0,0.352 -0.025,0.818 -0.013,0.453 -0.038,0.868 -0.038,0.491 -0.063,0.994l3.253,-3.637q0.429,-0.478 0.555,-0.755 0.139,-0.289 0.139,-0.478 0,-0.327 -0.353,-0.503 -0.34,-0.189 -0.984,-0.189l0,-1.296l6.507,0l0,1.296q-0.895,0 -1.765,0.529 -0.857,0.516 -1.879,1.661l-1.627,1.85 3.43,5.11q0.681,1.019 1.374,1.51 0.694,0.491 1.311,0.491l0.088,0zM33.517,106.31q0,1.007 -0.29,1.901 -0.29,0.894 -0.82,1.573 -0.517,0.667 -1.261,1.057 -0.731,0.39 -1.627,0.39 -1.198,0 -2.333,-0.73 -1.122,-0.743 -2.055,-2.417 -0.794,1.523 -1.828,2.303 -1.034,0.768 -2.181,0.768 -0.883,0 -1.627,-0.34 -0.744,-0.352 -1.286,-0.982 -0.542,-0.642 -0.845,-1.548 -0.29,-0.919 -0.29,-2.052 0,-1.032 0.29,-1.926 0.29,-0.906 0.82,-1.561 0.53,-0.667 1.274,-1.045 0.744,-0.39 1.664,-0.39 0.593,0 1.173,0.176 0.593,0.164 1.147,0.541 0.567,0.365 1.072,0.944 0.517,0.579 0.946,1.41 0.794,-1.498 1.791,-2.24 0.996,-0.755 2.295,-0.755Line truncated
     </group>
-</vector>
+</vector>

app/src/main/res/drawable/ic_sputnik.xml

@@ -10,4 +10,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_support.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
-</vector>
+</vector>

app/src/main/res/drawable/ic_world.xml

@@ -7,4 +7,4 @@
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" />
-</vector>
+</vector>

app/src/main/res/drawable/item_divider.xml

@@ -5,4 +5,4 @@
         android:width="1dp"
         android:height="1dp" />
     <solid android:color="@color/surfaceBg" />
-</shape>
+</shape>

app/src/main/res/drawable/rounded_corners.xml

@@ -5,4 +5,4 @@
         android:color="@color/surfaceCard" />
     <solid android:color="@color/surfaceCard" />
     <corners android:radius="@dimen/card_corner_high" />
-</shape>
+</shape>

app/src/main/res/layout/activity_main.xml

@@ -20,6 +20,7 @@
         android:id="@+id/navigation_bar"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:visibility="gone"
         app:itemBackground="@color/surfaceToolbar"
         app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -27,4 +28,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/navigation_menu" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/card_prefs_about.xml

@@ -98,4 +98,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/card_prefs_location.xml

@@ -86,4 +86,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/card_prefs_other.xml

@@ -58,4 +58,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/card_prefs_tracking.xml

@@ -73,4 +73,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/card_prefs_update.xml

@@ -70,4 +70,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/card_prefs_warranty.xml

@@ -45,4 +45,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/dialog_sources.xml

@@ -79,4 +79,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/sources_recycler" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_entries.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/entries_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/entries_toolbar"
+        android:id="@+id/entries_top_bar"
         style="@style/ToolbarCard"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginEnd="8dp">
 
         <ImageButton
-            android:id="@+id/entries_back"
+            android:id="@+id/entries_back_btn"
             style="@style/ToolbarButton"
             android:layout_gravity="start|center_vertical"
             android:src="@drawable/ic_back" />
 
         <EditText
             android:id="@+id/entries_search"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_marginStart="32dp"
+            android:layout_marginStart="52dp"
             android:layout_marginTop="4dp"
-            android:layout_marginEnd="32dp"
+            android:layout_marginEnd="52dp"
             android:layout_marginBottom="4dp"
             android:background="@android:color/transparent"
+            android:gravity="center"
             android:hint="@string/entries_search_hint"
             android:importantForAutofill="no"
             android:includeFontPadding="false"
@@ -40,7 +40,7 @@
             android:textSize="@dimen/text_size_large" />
 
         <ImageButton
-            android:id="@+id/entries_mode"
+            android:id="@+id/entries_modes_btn"
             style="@style/ToolbarButton"
             android:layout_gravity="end|center_vertical"
             android:src="@drawable/ic_satellite" />
@@ -48,18 +48,13 @@
     </androidx.cardview.widget.CardView>
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/entries_list_card"
         style="@style/SurfaceCard"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="64dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="2dp"
-        app:layout_constraintBottom_toTopOf="@+id/entries_select_all"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/entries_toolbar">
+        android:layout_marginBottom="64dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/entries_recycler"
@@ -69,48 +64,41 @@
 
         <ProgressBar
             android:id="@+id/entries_progress"
-            style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Large"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center" />
 
     </androidx.cardview.widget.CardView>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/entries_select_all"
-        style="@style/Widget.MaterialComponents.Button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
-        android:backgroundTint="@color/surfaceCard"
-        android:text="@string/entries_select_all"
-        android:textAllCaps="false"
-        android:textColor="@color/themeAccent"
-        android:textSize="@dimen/text_size_medium"
-        app:cornerRadius="@dimen/card_corner_high"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/entries_accept"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/entries_bottom_bar"
+        style="@style/BottomAppBar">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/entries_accept"
-        style="@style/Widget.MaterialComponents.Button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="8dp"
-        android:backgroundTint="@color/themeAccent"
-        android:text="@string/btn_accept"
-        android:textColor="@color/surfaceBg"
-        android:textAllCaps="false"
-        android:textSize="@dimen/text_size_medium"
-        app:cornerRadius="@dimen/card_corner_high"
-        app:layout_constraintBaseline_toBaselineOf="@+id/entries_select_all"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/entries_select_all" />
+        <Button
+            android:id="@+id/entries_select_btn"
+            style="@style/AppButton"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:text="Select"
+            app:icon="@drawable/ic_checkbox" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <Button
+            android:id="@+id/entries_clear_btn"
+            style="@style/AppButton"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:text="Clear"
+            app:icon="@drawable/ic_checkbox_out"
+            app:iconGravity="end" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/entries_accept_btn"
+        style="@style/FloatingActionButton"
+        android:src="@drawable/ic_play"
+        app:layout_anchor="@id/entries_bottom_bar" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_map.xml

@@ -6,7 +6,7 @@
     android:keepScreenOn="true">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/map_toolbar"
+        android:id="@+id/map_top_bar"
         style="@style/ToolbarCard"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
-            android:id="@+id/map_back"
+            android:id="@+id/map_back_btn"
             style="@style/ToolbarButton"
             android:layout_gravity="start|center_vertical"
             android:src="@drawable/ic_back" />
@@ -37,11 +37,11 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="2dp"
-        app:layout_constraintBottom_toTopOf="@+id/map_btn_prev"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/map_card_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/map_toolbar">
+        app:layout_constraintTop_toBottomOf="@+id/map_top_bar">
 
         <org.osmdroid.views.MapView
             android:id="@+id/map_view"
@@ -51,20 +51,22 @@
     </androidx.cardview.widget.CardView>
 
     <TextView
-        android:id="@+id/map_data_name"
-        style="@style/WorldMapText"
+        android:id="@+id/map_copyright"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="2dp"
         android:ellipsize="end"
-        android:gravity="center_horizontal"
+        android:gravity="center"
+        android:includeFontPadding="false"
         android:maxLines="1"
-        android:text="@string/pat_osm_idName"
-        app:layout_constraintBottom_toTopOf="@+id/map_card_info"
-        app:layout_constraintEnd_toStartOf="@+id/map_btn_next"
-        app:layout_constraintStart_toEndOf="@+id/map_btn_prev"
-        app:layout_constraintTop_toBottomOf="@+id/map_card" />
+        android:text="@string/map_copyright"
+        android:textColor="@color/themeDisabled"
+        android:textSize="@dimen/text_size_copyright"
+        app:layout_constraintEnd_toEndOf="@+id/map_card"
+        app:layout_constraintStart_toStartOf="@+id/map_card"
+        app:layout_constraintTop_toTopOf="@+id/map_card" />
 
     <androidx.cardview.widget.CardView
         android:id="@+id/map_card_info"
@@ -73,8 +75,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/map_copyright"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/map_coordinator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
@@ -147,47 +149,56 @@
 
     </androidx.cardview.widget.CardView>
 
-    <ImageButton
-        android:id="@+id/map_btn_prev"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginBottom="2dp"
-        android:backgroundTint="@color/surfaceToolbar"
-        android:rotation="180"
-        android:src="@drawable/ic_arrow"
-        app:layout_constraintBottom_toTopOf="@+id/map_card_info"
-        app:layout_constraintStart_toStartOf="parent"
-        app:tint="@color/themeLight" />
-
-    <ImageButton
-        android:id="@+id/map_btn_next"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="12dp"
-        android:backgroundTint="@color/surfaceToolbar"
-        android:src="@drawable/ic_arrow"
-        app:layout_constraintBottom_toBottomOf="@+id/map_btn_prev"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/map_btn_prev"
-        app:tint="@color/themeLight" />
-
-    <TextView
-        android:id="@+id/map_copyright"
-        android:layout_width="0dp"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/map_coordinator"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:text="@string/map_copyright"
-        android:textColor="@color/themeLight"
-        android:includeFontPadding="false"
-        android:textSize="@dimen/text_size_copyright"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <com.google.android.material.bottomappbar.BottomAppBar
+            android:id="@+id/map_bottom_bar"
+            style="@style/BottomAppBar" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <Button
+        android:id="@+id/map_prev_btn"
+        style="@style/AppButton"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:text="Prev"
+        app:icon="@drawable/ic_arrow_left"
+        app:layout_constraintBottom_toBottomOf="@+id/map_coordinator"
+        app:layout_constraintStart_toStartOf="@+id/map_coordinator"
+        app:layout_constraintTop_toTopOf="@+id/map_coordinator" />
+
+    <TextView
+        android:id="@+id/map_data_name"
+        style="@style/WorldMapText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:gravity="center_horizontal"
+        android:maxLines="1"
+        android:text="@string/pat_osm_idName"
+        app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"
+        app:layout_constraintEnd_toStartOf="@+id/map_next_btn"
+        app:layout_constraintStart_toEndOf="@+id/map_prev_btn" />
+
+    <Button
+        android:id="@+id/map_next_btn"
+        style="@style/AppButton"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:text="Next"
+        app:icon="@drawable/ic_arrow_right"
+        app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"
+        app:layout_constraintEnd_toEndOf="@+id/map_coordinator" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_passes.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/passes_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/passes_toolbar"
+        android:id="@+id/passes_top_bar"
         style="@style/ToolbarCard"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginEnd="8dp">
 
         <ImageButton
-            android:id="@+id/passes_filter"
+            android:id="@+id/passes_refresh_btn"
             style="@style/ToolbarButton"
+            android:rotation="45"
             android:layout_gravity="start|center_vertical"
-            android:src="@drawable/ic_filter" />
+            android:src="@drawable/ic_refresh" />
 
         <TextView
             android:id="@+id/passes_timer"
@@ -27,42 +27,37 @@
             android:layout_gravity="center" />
 
         <ImageButton
-            android:id="@+id/passes_settings"
+            android:id="@+id/passes_map_btn"
             style="@style/ToolbarButton"
             android:layout_gravity="end|center_vertical"
-            android:src="@drawable/ic_prefs" />
+            android:src="@drawable/ic_world" />
 
     </androidx.cardview.widget.CardView>
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/passes_list_card"
         style="@style/SurfaceCard"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="64dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/passes_toolbar">
+        android:layout_marginBottom="64dp">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/passes_swipe"
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/passes_recycler"
+            style="@style/AppRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/passes_list"
-                style="@style/AppRecycler"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        <ProgressBar
+            android:visibility="invisible"
+            android:id="@+id/passes_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
 
         <TextView
-            android:id="@+id/passes_error"
+            android:id="@+id/passes_error_msg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -72,4 +67,35 @@
 
     </androidx.cardview.widget.CardView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/passes_bottomBar"
+        style="@style/BottomAppBar">
+
+        <Button
+            android:id="@+id/passes_filter_btn"
+            style="@style/AppButton"
+            android:layout_width="136dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:text="Filter"
+            app:icon="@drawable/ic_filter" />
+
+        <Button
+            android:id="@+id/passes_settings_btn"
+            style="@style/AppButton"
+            android:layout_width="136dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:text="Настройки"
+            app:icon="@drawable/ic_prefs"
+            app:iconGravity="end" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/passes_fab"
+        style="@style/FloatingActionButton"
+        android:src="@drawable/ic_sputnik"
+        app:layout_anchor="@id/passes_bottomBar" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_radar.xml

@@ -37,7 +37,6 @@
     <TextView
         android:id="@+id/radar_name"
         android:layout_width="0dp"
-        android:visibility="gone"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="2dp"
@@ -45,6 +44,7 @@
         android:gravity="center"
         android:includeFontPadding="false"
         android:textSize="@dimen/text_size_medium"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" />
@@ -115,7 +115,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/radar_coordinator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/radar_recycler_msg">
@@ -131,7 +131,6 @@
     <TextView
         android:id="@+id/radar_recycler_msg"
         android:layout_width="0dp"
-        android:visibility="gone"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="2dp"
@@ -140,8 +139,66 @@
         android:includeFontPadding="false"
         android:text="@string/trans_no_data"
         android:textSize="@dimen/text_size_medium"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/radar_card" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/radar_coordinator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.bottomappbar.BottomAppBar
+            android:id="@+id/radar_bottom_bar"
+            style="@style/BottomAppBar" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <Button
+        android:id="@+id/radar_prev_btn"
+        style="@style/AppButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:text="Notify"
+        app:icon="@drawable/ic_notify_2"
+        app:layout_constraintBottom_toBottomOf="@+id/radar_coordinator"
+        app:layout_constraintEnd_toStartOf="@+id/radar_data_name"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/radar_coordinator"
+        app:layout_constraintStart_toStartOf="@+id/radar_coordinator"
+        app:layout_constraintTop_toTopOf="@+id/radar_coordinator" />
+
+    <TextView
+        android:id="@+id/radar_data_name"
+        style="@style/WorldMapText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:gravity="center_horizontal"
+        android:maxLines="1"
+        android:text="@string/pat_osm_idName"
+        app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"
+        app:layout_constraintEnd_toStartOf="@+id/radar_next_btn"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/radar_prev_btn" />
+
+    <Button
+        android:id="@+id/radar_next_btn"
+        style="@style/AppButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:text="Settings"
+        app:icon="@drawable/ic_prefs"
+        app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"
+        app:layout_constraintEnd_toEndOf="@+id/radar_coordinator"
+        app:layout_constraintStart_toEndOf="@+id/radar_data_name" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_settings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -7,12 +7,12 @@
     <androidx.cardview.widget.CardView
         android:id="@+id/prefs_toolbar"
         style="@style/ToolbarCard"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="top"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginEnd="8dp">
 
         <ImageButton
             android:id="@+id/prefs_back"
@@ -28,85 +28,123 @@
 
     </androidx.cardview.widget.CardView>
 
-    <ScrollView
-        style="@style/AppRecycler"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+    <androidx.cardview.widget.CardView
+        style="@style/ToolbarCard"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="64dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="64dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/prefs_toolbar">
+        android:backgroundTint="@color/surfaceBg">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/settings_scroll"
+            style="@style/AppRecycler"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
-            <include
-                android:id="@+id/prefs_info"
-                layout="@layout/card_prefs_about"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:layout_height="wrap_content">
 
-            <include
-                android:id="@+id/prefs_location"
-                layout="@layout/card_prefs_location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/prefs_info" />
+                <include
+                    android:id="@+id/prefs_info"
+                    layout="@layout/card_prefs_about"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <include
-                android:id="@+id/prefs_data"
-                layout="@layout/card_prefs_update"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/prefs_location" />
+                <include
+                    android:id="@+id/prefs_location"
+                    layout="@layout/card_prefs_location"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/prefs_info" />
 
-            <include
-                android:id="@+id/prefs_tracking"
-                layout="@layout/card_prefs_tracking"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/prefs_data" />
+                <include
+                    android:id="@+id/prefs_data"
+                    layout="@layout/card_prefs_update"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/prefs_location" />
 
-            <include
-                android:id="@+id/prefs_other"
-                layout="@layout/card_prefs_other"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/prefs_tracking" />
+                <include
+                    android:id="@+id/prefs_tracking"
+                    layout="@layout/card_prefs_tracking"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/prefs_data" />
 
-            <include
-                android:id="@+id/prefs_warranty"
-                layout="@layout/card_prefs_warranty"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/prefs_other" />
+                <include
+                    android:id="@+id/prefs_other"
+                    layout="@layout/card_prefs_other"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/prefs_tracking" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <include
+                    android:id="@+id/prefs_warranty"
+                    layout="@layout/card_prefs_warranty"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/prefs_other" />
 
-    </ScrollView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.cardview.widget.CardView>
+
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/settings_bottom_bar"
+        style="@style/BottomAppBar">
+
+        <Button
+            android:id="@+id/settings_prev_btn"
+            style="@style/AppButton"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginStart="4dp"
+            android:text="Notify"
+            app:icon="@drawable/ic_notify_2" />
+
+        <Button
+            android:id="@+id/settings_next_btn"
+            style="@style/AppButton"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="4dp"
+            android:text="Settings"
+            app:icon="@drawable/ic_prefs" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/settings_fab"
+        style="@style/FloatingActionButton"
+        android:src="@drawable/ic_sputnik"
+        app:layout_anchor="@id/settings_bottom_bar" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/item_entry.xml

@@ -6,13 +6,13 @@
     <CheckBox
         android:id="@+id/entry_checkbox"
         android:layout_width="match_parent"
-        android:layout_height="33dp"
-        android:layout_margin="4dp"
+        android:layout_height="43dp"
+        android:layout_marginStart="6dp"
         android:background="@color/surfaceCard"
         android:ellipsize="end"
         android:lines="1"
-        android:padding="1dp"
+        android:padding="4dp"
         android:textColor="@color/themeLight"
         android:textSize="@dimen/text_size_medium" />
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/item_pass.xml

@@ -112,4 +112,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/item_radio.xml

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/trans_card"
     style="@style/RecyclerItemCard">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/trans_root"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/trans_guideline"
+            android:id="@+id/radio_guide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintGuide_percent="0.5" />
 
         <TextView
-            android:id="@+id/trans_desc"
+            android:id="@+id/radio_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="2dp"
@@ -28,57 +26,57 @@
             android:maxLines="1"
             android:text="@string/trans_description"
             android:textSize="@dimen/text_size_small"
-            app:layout_constraintEnd_toStartOf="@+id/trans_uplink_img"
+            app:layout_constraintEnd_toStartOf="@+id/radio_up_img"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintStart_toEndOf="@+id/trans_downlink_img"
+            app:layout_constraintStart_toEndOf="@+id/radio_down_img"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:id="@+id/trans_downlink_img"
+            android:id="@+id/radio_down_img"
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginStart="4dp"
             android:rotation="90"
-            app:layout_constraintBottom_toBottomOf="@+id/trans_desc"
+            app:layout_constraintBottom_toBottomOf="@+id/radio_info"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/trans_desc"
-            app:srcCompat="@drawable/ic_arrow" />
+            app:layout_constraintTop_toTopOf="@+id/radio_info"
+            app:srcCompat="@drawable/ic_arrow_right" />
 
         <TextView
-            android:id="@+id/trans_downlink"
+            android:id="@+id/radio_downlink"
             style="@style/ToolbarTimer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/trans_link_low"
             android:textSize="@dimen/text_size_frequency"
-            app:layout_constraintEnd_toStartOf="@+id/trans_guideline"
+            app:layout_constraintEnd_toStartOf="@+id/radio_guide"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/trans_desc" />
+            app:layout_constraintTop_toBottomOf="@+id/radio_info" />
 
         <ImageView
-            android:id="@+id/trans_uplink_img"
+            android:id="@+id/radio_up_img"
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginEnd="4dp"
             android:rotation="270"
-            app:layout_constraintBottom_toBottomOf="@+id/trans_desc"
+            app:layout_constraintBottom_toBottomOf="@+id/radio_info"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/trans_desc"
-            app:srcCompat="@drawable/ic_arrow" />
+            app:layout_constraintTop_toTopOf="@+id/radio_info"
+            app:srcCompat="@drawable/ic_arrow_right" />
 
         <TextView
-            android:id="@+id/trans_uplink"
+            android:id="@+id/radio_uplink"
             style="@style/ToolbarTimer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/trans_link_low"
             android:textSize="@dimen/text_size_frequency"
-            app:layout_constraintBaseline_toBaselineOf="@+id/trans_downlink"
+            app:layout_constraintBaseline_toBaselineOf="@+id/radio_downlink"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/trans_guideline" />
+            app:layout_constraintStart_toStartOf="@+id/radio_guide" />
 
         <TextView
-            android:id="@+id/trans_mode"
+            android:id="@+id/radio_mode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
@@ -86,22 +84,22 @@
             android:text="@string/trans_mode"
             android:textSize="@dimen/text_size_small"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/trans_inverted"
+            app:layout_constraintEnd_toStartOf="@+id/radio_inverted"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/trans_downlink" />
+            app:layout_constraintTop_toBottomOf="@+id/radio_downlink" />
 
         <TextView
-            android:id="@+id/trans_inverted"
+            android:id="@+id/radio_inverted"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="6dp"
             android:text="@string/trans_inverted"
             android:textSize="@dimen/text_size_small"
-            app:layout_constraintBaseline_toBaselineOf="@+id/trans_mode"
+            app:layout_constraintBaseline_toBaselineOf="@+id/radio_mode"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/trans_mode" />
+            app:layout_constraintStart_toEndOf="@+id/radio_mode" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

app/src/main/res/layout/item_source.xml

@@ -35,4 +35,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/source_input" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/navigation_menu.xml

@@ -20,4 +20,4 @@
         android:id="@+id/nav_settings"
         android:icon="@drawable/ic_prefs"
         android:title="@string/menu_settings" />
-</menu>
+</menu>

app/src/main/res/navigation/navigation_graph.xml

@@ -69,4 +69,4 @@
     <action
         android:id="@+id/action_global_settingsFragment"
         app:destination="@id/nav_settings" />
-</navigation>
+</navigation>

app/src/main/res/values-ru/strings.xml

@@ -125,4 +125,4 @@
     <string name="warranty_license"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Политика конфиденциальности.</a>
         \nЭто ПО поставляется без гарантий. \nПодробности в лицензии <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a>.
     </string>
-</resources>
+</resources>

app/src/main/res/values/colors.xml

@@ -10,9 +10,10 @@
     <color name="surfaceChip">#303030</color>
     <color name="surfaceButton">#242424</color>
     <color name="surfaceToolbar">#1A1A1A</color>
+    <color name="bottomAppBar">#1A1A1A</color>
     <color name="surfaceSystem">#1A1A1A</color>
     <color name="surfaceCard">#1A1A1A</color>
     <color name="surfaceBg">#121212</color>
     <color name="mapInfoLayout">#B3181818</color>
     <color name="transparent">@android:color/transparent</color>
-</resources>
+</resources>

app/src/main/res/values/dimens.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--    View values-->
     <dimen name="btn_corner_low">0dp</dimen>
     <dimen name="btn_corner_high">8dp</dimen>
     <dimen name="card_elev_low">0dp</dimen>
     <dimen name="card_elev_high">8dp</dimen>
     <dimen name="card_corner_low">0dp</dimen>
     <dimen name="card_corner_high">12dp</dimen>
+    <dimen name="view_default_margin">8dp</dimen>
+    <!--    Text values-->
     <dimen name="text_size_copyright">13sp</dimen>
     <dimen name="text_size_small">15sp</dimen>
     <dimen name="text_size_medium">16sp</dimen>
@@ -13,4 +16,4 @@
     <dimen name="text_size_frequency">24sp</dimen>
     <dimen name="text_size_app_timer">42sp</dimen>
     <dimen name="text_size_app_title">48sp</dimen>
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -145,4 +145,4 @@
     <string name="warranty_license"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Privacy Policy.</a>
         The app comes with no warranty. \nSee the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a> license for details.
     </string>
-</resources>
+</resources>

app/src/main/res/values/styles.xml

@@ -14,6 +14,7 @@
         <item name="colorSecondary">@color/themeAccent</item>
 <!--        Bottom bar colors-->
         <item name="colorOnSecondaryContainer">@color/themeLight</item>
+        <item name="colorOnPrimaryContainer">@color/surfaceBg</item>
         <item name="colorOnSurfaceVariant">@color/themeLight</item>
         <item name="colorSecondaryContainer">@color/surfaceIcon</item>
 <!--        -->
@@ -41,6 +42,23 @@
         <item name="android:scrollbars">none</item>
     </style>
 
+    <style name="BottomAppBar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">56dp</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:backgroundTint">@color/bottomAppBar</item>
+        <item name="contentInsetStart">4dp</item>
+        <item name="contentInsetEnd">4dp</item>
+        <item name="fabCradleMargin">8dp</item>
+        <item name="fabCradleRoundedCornerRadius">16dp</item>
+    </style>
+
+    <style name="FloatingActionButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:backgroundTint">@color/themeAccent</item>
+    </style>
+
     <style name="RecyclerItemCard">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -136,4 +154,4 @@
         <item name="android:textSize">@dimen/text_size_medium</item>
     </style>
 
-</resources>
+</resources>