Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Further changes to layouts and views #76
Arty Bishop22d0db1d7890
diff --git a/app/build.gradle b/app/build.gradleindex e7dc41fc..93a93aa6 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -56,20 +56,19 @@ android {dependencies {implementation project(":core")- implementation "com.google.android.material:material:1.5.0"- implementation "androidx.appcompat:appcompat:1.4.1"- implementation "androidx.fragment:fragment-ktx:1.4.1"- implementation "androidx.core:core-ktx:1.7.0"implementation "androidx.core:core-splashscreen:1.0.0-beta01"implementation "androidx.constraintlayout:constraintlayout:2.1.3"- implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"+ implementation "androidx.navigation:navigation-runtime-ktx:2.4.1"implementation "androidx.navigation:navigation-fragment-ktx:2.4.1"implementation "androidx.navigation:navigation-ui-ktx:2.4.1"implementation "androidx.room:room-runtime:2.4.1"implementation "androidx.room:room-ktx:2.4.1"kapt "androidx.room:room-compiler:2.4.1"+ implementation "com.google.android.material:material:1.5.0"implementation "com.google.dagger:hilt-android:2.40.5"kapt "com.google.dagger:hilt-compiler:2.40.5"diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.ktindex 273f588c..d2ba5a3b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt@@ -17,14 +17,11 @@*/package com.rtbishop.look4sat.presentation-import android.annotation.SuppressLintimport android.content.pm.ActivityInfoimport android.os.Bundleimport androidx.activity.viewModelsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen-import androidx.navigation.fragment.NavHostFragment-import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.ActivityMainBindingimport dagger.hilt.android.AndroidEntryPoint@@ -33,22 +30,11 @@ class MainActivity : AppCompatActivity() {private val mainViewModel: MainViewModel by viewModels()- @SuppressLint("SourceLockedOrientationActivity")override fun onCreate(savedInstanceState: Bundle?) {requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAITinstallSplashScreen()super.onCreate(savedInstanceState)- 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-// }-// }+ setContentView(ActivityMainBinding.inflate(layoutInflater).root)mainViewModel.calculatePasses()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.ktindex ae29ce32..26e4ab6b 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt@@ -112,7 +112,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {Marker(mapView).apply {setInfoWindow(null)setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)- icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_pos)+ icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_gps)position = GeoPoint(stationPos.latitude, stationPos.longitude)mapView.overlays[0] = thismapView.invalidate()diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.ktindex c918c77d..0e5c4735 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radarScreen/RadarFragment.kt@@ -110,7 +110,7 @@ class RadarFragment : Fragment(R.layout.fragment_radar) {binding.radarEl.text = String.format(polarEl, Math.toDegrees(satPos.elevation))binding.radarDst.text = String.format(polarRng, satPos.range)binding.radarAlt.text = String.format(polarAlt, satPos.altitude)- binding.radarName.text = satPass.name+// binding.radarName.text = satPass.nameif (!satPass.isDeepSpace) {if (timeNow < satPass.aosTime) {diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.ktindex d1bca874..2527df48 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settingsScreen/SettingsFragment.kt@@ -77,7 +77,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {if (y > newY) binding.settingsFab.hide() else binding.settingsFab.show()})}- binding.prefsBack.setOnClickListener { findNavController().navigateUp() }+ binding.settingsBack.setOnClickListener { findNavController().navigateUp() }setupAboutCard()setupDataCard()setupLocationCard()@@ -96,25 +96,25 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {}private fun setupAboutCard() {- binding.prefsInfo.aboutVersion.text =+ binding.settingsInfo.aboutVersion.text =String.format(getString(R.string.about_version), BuildConfig.VERSION_NAME)- binding.prefsInfo.aboutBtnGithub.setOnClickListener {+ binding.settingsInfo.aboutBtnGithub.setOnClickListener {gotoUrl("https://github.com/rt-bishop/Look4Sat/")}- binding.prefsInfo.aboutBtnDonate.setOnClickListener {+ binding.settingsInfo.aboutBtnDonate.setOnClickListener {gotoUrl("https://www.buymeacoffee.com/rtbishop")}- binding.prefsInfo.aboutBtnFdroid.setOnClickListener {+ binding.settingsInfo.aboutBtnFdroid.setOnClickListener {gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")}}private fun setupLocationCard() {setPositionText(viewModel.getStationPosition())- binding.prefsLocation.locationBtnGps.setOnClickListener {+ binding.settingsLocation.locationBtnGps.setOnClickListener {locationRequest.launch(arrayOf(locationFine, locationCoarse))}- binding.prefsLocation.locationBtnQth.setOnClickListener {+ binding.settingsLocation.locationBtnQth.setOnClickListener {val editText = EditText(requireActivity())AlertDialog.Builder(requireContext()).setTitle("Title")@@ -130,80 +130,80 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {}private fun setupDataCard() {- binding.prefsData.updateBtnFile.setOnClickListener { contentRequest.launch("*/*") }- binding.prefsData.updateBtnWeb.setOnClickListener {+ binding.settingsData.updateBtnFile.setOnClickListener { contentRequest.launch("*/*") }+ binding.settingsData.updateBtnWeb.setOnClickListener {val action = SettingsFragmentDirections.actionPrefsToSources()findNavController().navigate(action)}- binding.prefsData.updateBtnClear.setOnClickListener { viewModel.clearData() }+ binding.settingsData.updateBtnClear.setOnClickListener { viewModel.clearData() }getNavResult<List<String>>(R.id.nav_settings, "sources") { sources ->viewModel.updateDataFromWeb(sources)}}private fun setupTrackingCard() {- binding.prefsTracking.trackingSwitch.apply {+ binding.settingsTracking.trackingSwitch.apply {isChecked = viewModel.getRotatorEnabled()- binding.prefsTracking.trackingIp.isEnabled = isChecked- binding.prefsTracking.trackingIpEdit.setText(viewModel.getRotatorServer())- binding.prefsTracking.trackingPort.isEnabled = isChecked- binding.prefsTracking.trackingPortEdit.setText(viewModel.getRotatorPort())+ binding.settingsTracking.trackingIp.isEnabled = isChecked+ binding.settingsTracking.trackingIpEdit.setText(viewModel.getRotatorServer())+ binding.settingsTracking.trackingPort.isEnabled = isChecked+ binding.settingsTracking.trackingPortEdit.setText(viewModel.getRotatorPort())setOnCheckedChangeListener { _, isChecked ->viewModel.setRotatorEnabled(isChecked)- binding.prefsTracking.trackingIp.isEnabled = isChecked- binding.prefsTracking.trackingPort.isEnabled = isChecked+ binding.settingsTracking.trackingIp.isEnabled = isChecked+ binding.settingsTracking.trackingPort.isEnabled = isChecked}}- binding.prefsTracking.trackingIpEdit.doOnTextChanged { text, _, _, _ ->+ binding.settingsTracking.trackingIpEdit.doOnTextChanged { text, _, _, _ ->if (text.toString().isValidIPv4()) viewModel.setRotatorServer(text.toString())}- binding.prefsTracking.trackingPortEdit.doOnTextChanged { text, _, _, _ ->+ binding.settingsTracking.trackingPortEdit.doOnTextChanged { text, _, _, _ ->if (text.toString().isValidPort()) viewModel.setRotatorPort(text.toString())}}private fun setupOtherCard() {- binding.prefsOther.otherSwitchUtc.apply {+ binding.settingsOther.otherSwitchUtc.apply {isChecked = viewModel.getUseUTC()setOnCheckedChangeListener { _, isChecked -> viewModel.setUseUTC(isChecked) }}- binding.prefsOther.otherSwitchSweep.apply {+ binding.settingsOther.otherSwitchSweep.apply {isChecked = viewModel.getShowSweep()setOnCheckedChangeListener { _, isChecked -> viewModel.setShowSweep(isChecked) }}- binding.prefsOther.otherSwitchSensors.apply {+ binding.settingsOther.otherSwitchSensors.apply {isChecked = viewModel.getUseCompass()setOnCheckedChangeListener { _, isChecked -> viewModel.setUseCompass(isChecked) }}}private fun setupWarrantyCard() {- binding.prefsWarranty.warrantyThanks.movementMethod = LinkMovementMethod.getInstance()- binding.prefsWarranty.warrantyLicense.movementMethod = LinkMovementMethod.getInstance()+ binding.settingsWarranty.warrantyThanks.movementMethod = LinkMovementMethod.getInstance()+ binding.settingsWarranty.warrantyLicense.movementMethod = LinkMovementMethod.getInstance()}private fun setPositionText(geoPos: GeoPos) {val latFormat = getString(R.string.location_lat)val lonFormat = getString(R.string.location_lon)- binding.prefsLocation.locationLat.text = String.format(latFormat, geoPos.latitude)- binding.prefsLocation.locationLon.text = String.format(lonFormat, geoPos.longitude)+ binding.settingsLocation.locationLat.text = String.format(latFormat, geoPos.latitude)+ binding.settingsLocation.locationLon.text = String.format(lonFormat, geoPos.longitude)}private fun handleStationPosition(pos: DataState<GeoPos>) {when (pos) {is DataState.Success -> {setPositionText(pos.data)- binding.prefsLocation.locationProgress.isIndeterminate = false+ binding.settingsLocation.locationProgress.isIndeterminate = falseviewModel.setPositionHandled()showToast(getString(R.string.pref_pos_success))}is DataState.Error -> {- binding.prefsLocation.locationProgress.isIndeterminate = false+ binding.settingsLocation.locationProgress.isIndeterminate = falseviewModel.setPositionHandled()showToast(pos.message.toString())}DataState.Loading -> {- binding.prefsLocation.locationProgress.isIndeterminate = true+ binding.settingsLocation.locationProgress.isIndeterminate = true}DataState.Handled -> {}}@@ -212,17 +212,17 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {private fun handleSatState(state: DataState<Long>) {when (state) {is DataState.Success -> {- binding.prefsData.updateProgress.isIndeterminate = false+ binding.settingsData.updateProgress.isIndeterminate = falseviewModel.setUpdateHandled()showToast("Data updated successfully")}is DataState.Error -> {- binding.prefsData.updateProgress.isIndeterminate = false+ binding.settingsData.updateProgress.isIndeterminate = falseviewModel.setUpdateHandled()showToast(state.message.toString())}is DataState.Loading -> {- binding.prefsData.updateProgress.isIndeterminate = true+ binding.settingsData.updateProgress.isIndeterminate = true}is DataState.Handled -> {}}diff --git a/app/src/main/res/drawable-nodpi/worldmap_dark.webp b/app/src/main/res/drawable-nodpi/worldmap_dark.webpdeleted file mode 100644index 9f19b71b..00000000Binary files a/app/src/main/res/drawable-nodpi/worldmap_dark.webp and /dev/null differdiff --git a/app/src/main/res/drawable/ic_checkbox.xml b/app/src/main/res/drawable/ic_checkbox.xmldeleted file mode 100644index cbb9c3e5..00000000--- a/app/src/main/res/drawable/ic_checkbox.xml+++ /dev/null@@ -1,10 +0,0 @@-<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>diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_clear.xmlsimilarity index 100%rename from app/src/main/res/drawable/ic_delete.xmlrename to app/src/main/res/drawable/ic_clear.xmldiff --git a/app/src/main/res/drawable/ic_checkbox_out.xml b/app/src/main/res/drawable/ic_done.xmlsimilarity index 60%rename from app/src/main/res/drawable/ic_checkbox_out.xmlrename to app/src/main/res/drawable/ic_done.xmlindex 8c7ac2de..648f00d7 100644--- a/app/src/main/res/drawable/ic_checkbox_out.xml+++ b/app/src/main/res/drawable/ic_done.xml@@ -6,5 +6,5 @@android:tint="?attr/colorControlNormal"><pathandroid: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"/>+ android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/></vector>diff --git a/app/src/main/res/drawable/ic_fdroid.xml b/app/src/main/res/drawable/ic_fdroid.xmldeleted file mode 100644index 4e56c7e0..00000000--- a/app/src/main/res/drawable/ic_fdroid.xml+++ /dev/null@@ -1,21 +0,0 @@-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:tint="?attr/colorControlNormal"- android:viewportWidth="48"- android:viewportHeight="48">- <path- android:fillColor="@android:color/white"- android:pathData="M8,20.0449C7.7923,20.0449 7.5902,20.0656 7.3945,20.1055C6.8076,20.225 6.2836,20.5152 5.877,20.9219C5.4703,21.3286 5.18,21.8506 5.0605,22.4375C5.0207,22.6331 5,22.8372 5,23.0449L5,30.0449L5,42.2754L5,43.0449C5,43.6682 5.1889,44.246 5.5117,44.7246C6.0498,45.5224 6.9612,46.0449 8,46.0449L40,46.0449C41.0387,46.0449 41.9502,45.5224 42.4883,44.7246C42.5959,44.5651 42.6899,44.3944 42.7656,44.2148C42.917,43.8557 43,43.4604 43,43.0449L43,42.2754L43,36.0449L43,23.8125L43,23.0449C43,22.6294 42.917,22.2342 42.7656,21.875C42.6899,21.6954 42.5959,21.5248 42.4883,21.3652C41.9502,20.5675 41.0387,20.0449 40,20.0449L8,20.0449zM24,22.5254A10.5182,10.5182 0,0 1,34.5176 33.0449A10.5182,10.5182 0,0 1,24 43.5625A10.5182,10.5182 0,0 1,13.4824 33.0449A10.5182,10.5182 0,0 1,24 22.5254zM24,24.4492A8.5958,8.5958 0,0 0,15.4043 33.0449A8.5958,8.5958 0,0 0,24 41.6406A8.5958,8.5958 0,0 0,32.5957 33.0449A8.5958,8.5958 0,0 0,24 24.4492zM24,26.75C27.434,26.75 30.25,29.566 30.25,33C30.25,36.434 27.434,39.25 24,39.25C21.0479,39.25 18.5583,37.1661 17.916,34.4004L21.0703,34.4004C21.5888,35.4973 22.6926,36.25 24,36.25C25.8127,36.25 27.25,34.8127 27.25,33C27.25,31.1873 25.8127,29.75 24,29.75C22.7748,29.75 21.734,30.415 21.1797,31.4004L17.9668,31.4004C18.6802,28.7347 21.1193,26.75 24,26.75z"- android:strokeWidth="2"- android:strokeColor="#00000000"- android:strokeLineCap="round"- android:strokeLineJoin="miter" />- <path- android:fillColor="@android:color/white"- android:pathData="M2.3379,1.5254C1.8997,1.5254 1.378,1.6672 1.5137,2.3242C1.6007,2.7458 4.4144,6.2239 5.4434,7.4902C5.2677,7.7794 5.1304,8.0942 5.0605,8.4375C5.0207,8.6331 5,8.8372 5,9.0449L5,9.582L5,12.0449L5,13.0449L5,15.5059L5,16.0449C5,16.6682 5.1889,17.246 5.5117,17.7246C6.0498,18.5224 6.9612,19.0449 8,19.0449L40,19.0449C41.0387,19.0449 41.9502,18.5224 42.4883,17.7246C42.5959,17.5651 42.6899,17.3944 42.7656,17.2148C42.8413,17.0353 42.8996,16.846 42.9395,16.6504C42.9793,16.4547 43,16.2527 43,16.0449L43,15.5059L43,13.0449L43,12.0449L43,9.582L43,9.0449C43,8.8372 42.9793,8.6331 42.9395,8.4375C42.8696,8.0942 42.7323,7.7794 42.5566,7.4902C43.5856,6.2239 46.3993,2.7458 46.4863,2.3242C46.622,1.6672 46.1003,1.5254 45.6621,1.5254C45.1945,1.5396 44.8462,1.9932 44.5859,2.2832L41.3984,6.4023C40.9796,6.1808 40.5086,6.0449 40,6.0449L8,6.0449C7.7923,6.0449 7.5902,6.0656 7.3945,6.1055C7.1989,6.1453 7.0097,6.2036 6.8301,6.2793C6.7496,6.3132 6.6782,6.3618 6.6016,6.4023L3.4141,2.2832C3.1538,1.9932 2.8055,1.5396 2.3379,1.5254zM14.375,9.75A3.375,3.375 0,0 1,17.75 13.125A3.375,3.375 0,0 1,14.375 16.5A3.375,3.375 0,0 1,11 13.125A3.375,3.375 0,0 1,14.375 9.75zM33.875,9.75A3.375,3.375 0,0 1,37.25 13.125A3.375,3.375 0,0 1,33.875 16.5A3.375,3.375 0,0 1,30.5 13.125A3.375,3.375 0,0 1,33.875 9.75z"- android:strokeWidth="2"- android:strokeColor="#00000000"- android:strokeLineCap="round"- android:strokeLineJoin="miter" />-</vector>diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xmldeleted file mode 100644index 978f5031..00000000--- a/app/src/main/res/drawable/ic_github.xml+++ /dev/null@@ -1,10 +0,0 @@-<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="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>diff --git a/app/src/main/res/drawable/ic_pos.xml b/app/src/main/res/drawable/ic_gps.xmlsimilarity index 100%rename from app/src/main/res/drawable/ic_pos.xmlrename to app/src/main/res/drawable/ic_gps.xmldiff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xmldeleted file mode 100644index 0eb2804f..00000000--- a/app/src/main/res/drawable/ic_list.xml+++ /dev/null@@ -1,10 +0,0 @@-<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="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>diff --git a/app/src/main/res/drawable/ic_world.xml b/app/src/main/res/drawable/ic_map.xmlsimilarity index 100%rename from app/src/main/res/drawable/ic_world.xmlrename to app/src/main/res/drawable/ic_map.xmldiff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_next.xmlsimilarity index 86%rename from app/src/main/res/drawable/ic_arrow_right.xmlrename to app/src/main/res/drawable/ic_next.xmlindex da896608..9c0d721b 100644--- a/app/src/main/res/drawable/ic_arrow_right.xml+++ b/app/src/main/res/drawable/ic_next.xml@@ -6,5 +6,5 @@android:viewportHeight="24"><pathandroid:fillColor="@android:color/white"- android:pathData="M8,5v14l11,-7z" />+ android:pathData="M8,6v14l11,-7z" /></vector>diff --git a/app/src/main/res/drawable/ic_notify_1.xml b/app/src/main/res/drawable/ic_notify_1.xmldeleted file mode 100644index 21cb88d1..00000000--- a/app/src/main/res/drawable/ic_notify_1.xml+++ /dev/null@@ -1,10 +0,0 @@-<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>diff --git a/app/src/main/res/drawable/ic_notify_2.xml b/app/src/main/res/drawable/ic_notify_2.xmldeleted file mode 100644index c3204226..00000000--- a/app/src/main/res/drawable/ic_notify_2.xml+++ /dev/null@@ -1,10 +0,0 @@-<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>diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xmldeleted file mode 100644index bc5dd1e8..00000000--- a/app/src/main/res/drawable/ic_play.xml+++ /dev/null@@ -1,10 +0,0 @@-<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>diff --git a/app/src/main/res/drawable/ic_prefs.xml b/app/src/main/res/drawable/ic_prefs.xmldeleted file mode 100644index c4149ea4..00000000--- a/app/src/main/res/drawable/ic_prefs.xml+++ /dev/null@@ -1,10 +0,0 @@-<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="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>diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_prev.xmlsimilarity index 86%rename from app/src/main/res/drawable/ic_arrow_left.xmlrename to app/src/main/res/drawable/ic_prev.xmlindex 627b772f..8546554e 100644--- a/app/src/main/res/drawable/ic_arrow_left.xml+++ b/app/src/main/res/drawable/ic_prev.xml@@ -6,5 +6,5 @@android:viewportHeight="24"><pathandroid:fillColor="@android:color/white"- android:pathData="M16,5v14l-11,-7z" />+ android:pathData="M16,6v14l-11,-7z" /></vector>diff --git a/app/src/main/res/drawable/ic_support.xml b/app/src/main/res/drawable/ic_support.xmlindex 63351653..7297f11f 100644--- a/app/src/main/res/drawable/ic_support.xml+++ b/app/src/main/res/drawable/ic_support.xml@@ -1,10 +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="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" />+ android:viewportHeight="24"+ android:tint="?attr/colorControlNormal">+ <path+ android:fillColor="@android:color/white"+ android:pathData="M14,21c1.93,0 3.62,-1.17 4,-3l-1.75,-0.88C16,18.21 15.33,19 14,19l-4.9,0c0.83,-1 1.5,-2.34 1.5,-4c0,-0.35 -0.03,-0.69 -0.08,-1L14,14v-2l-4.18,0C9,10.42 8,9.6 8,8c0,-1.93 1.57,-3.5 3.5,-3.5c1.5,0 2.79,0.95 3.28,2.28L16.63,6c-0.8,-2.05 -2.79,-3.5 -5.13,-3.5C8.46,2.5 6,4.96 6,8c0,1.78 0.79,2.9 1.49,4L6,12v2l2.47,0c0.08,0.31 0.13,0.64 0.13,1c0,2.7 -2.6,4 -2.6,4v2H14z"/></vector>diff --git a/app/src/main/res/drawable/rounded_corners.xml b/app/src/main/res/drawable/rounded_corners.xmldeleted file mode 100644index 773768b1..00000000--- a/app/src/main/res/drawable/rounded_corners.xml+++ /dev/null@@ -1,8 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<shape xmlns:android="http://schemas.android.com/apk/res/android">- <stroke- android:width="1dp"- android:color="@color/surfaceCard" />- <solid android:color="@color/surfaceCard" />- <corners android:radius="@dimen/card_corner_high" />-</shape>diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xmlindex f6043fa7..b8038cf2 100644--- a/app/src/main/res/layout/activity_main.xml+++ b/app/src/main/res/layout/activity_main.xml@@ -1,31 +1,9 @@<?xml version="1.0" encoding="utf-8"?>-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"+ android:id="@+id/navigation_host"+ android:name="androidx.navigation.fragment.NavHostFragment"android:layout_width="match_parent"- android:layout_height="match_parent">-- <androidx.fragment.app.FragmentContainerView- android:id="@+id/navigation_host"- android:name="androidx.navigation.fragment.NavHostFragment"- android:layout_width="match_parent"- android:layout_height="0dp"- app:defaultNavHost="true"- app:layout_constraintBottom_toTopOf="@+id/navigation_bar"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent"- app:navGraph="@navigation/navigation_graph" />-- <com.google.android.material.bottomnavigation.BottomNavigationView- 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"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"- app:menu="@menu/navigation_menu" />--</androidx.constraintlayout.widget.ConstraintLayout>+ android:layout_height="match_parent"+ app:defaultNavHost="true"+ app:navGraph="@navigation/navigation_graph" />diff --git a/app/src/main/res/layout/card_prefs_about.xml b/app/src/main/res/layout/card_prefs_about.xmlindex f3099364..74055185 100644--- a/app/src/main/res/layout/card_prefs_about.xml+++ b/app/src/main/res/layout/card_prefs_about.xml@@ -59,14 +59,13 @@<Buttonandroid:id="@+id/about_btn_github"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginStart="4dp"android:layout_marginTop="4dp"android:layout_marginBottom="4dp"android:text="@string/about_github"- app:icon="@drawable/ic_github"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/about_btn_donate"app:layout_constraintHorizontal_chainStyle="spread_inside"@@ -75,7 +74,7 @@<Buttonandroid:id="@+id/about_btn_donate"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:text="@string/about_support"@@ -86,12 +85,11 @@<Buttonandroid:id="@+id/about_btn_fdroid"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginEnd="4dp"android:text="@string/about_fdroid"- app:icon="@drawable/ic_fdroid"app:layout_constraintBaseline_toBaselineOf="@+id/about_btn_github"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/about_btn_donate" />diff --git a/app/src/main/res/layout/card_prefs_location.xml b/app/src/main/res/layout/card_prefs_location.xmlindex ac991c23..5e0db25b 100644--- a/app/src/main/res/layout/card_prefs_location.xml+++ b/app/src/main/res/layout/card_prefs_location.xml@@ -56,13 +56,13 @@<Buttonandroid:id="@+id/location_btn_gps"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginStart="4dp"android:layout_marginTop="4dp"android:layout_marginBottom="4dp"- android:drawableStart="@drawable/ic_pos"+ android:drawableStart="@drawable/ic_gps"android:text="@string/location_gps"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"@@ -73,7 +73,7 @@<Buttonandroid:id="@+id/location_btn_qth"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginEnd="4dp"diff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xmlindex 958d8a48..63915b93 100644--- a/app/src/main/res/layout/card_prefs_update.xml+++ b/app/src/main/res/layout/card_prefs_update.xml@@ -32,14 +32,14 @@<Buttonandroid:id="@+id/update_btn_web"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginStart="4dp"android:layout_marginTop="4dp"android:layout_marginBottom="4dp"android:text="@string/update_web"- app:icon="@drawable/ic_world"+ app:icon="@drawable/ic_map"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/update_btn_file"app:layout_constraintStart_toStartOf="parent"@@ -47,7 +47,7 @@<Buttonandroid:id="@+id/update_btn_file"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:text="@string/update_file"@@ -58,12 +58,12 @@<Buttonandroid:id="@+id/update_btn_clear"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginEnd="4dp"android:text="@string/update_clear"- app:icon="@drawable/ic_delete"+ app:icon="@drawable/ic_clear"app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/update_btn_file" />diff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xmlindex cff3f174..09de92ac 100644--- a/app/src/main/res/layout/dialog_sources.xml+++ b/app/src/main/res/layout/dialog_sources.xml@@ -43,7 +43,7 @@<androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/sources_recycler"- style="@style/AppRecycler"+ style="@style/Recycler"android:layout_width="0dp"android:layout_height="280dp"android:layout_marginStart="16dp"diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 5ed129b8..30cce61d 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -5,14 +5,8 @@android:layout_height="match_parent"><androidx.cardview.widget.CardView- 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">+ android:id="@+id/entries_toolbar"+ style="@style/Toolbar"><ImageButtonandroid:id="@+id/entries_back_btn"@@ -22,22 +16,13 @@<EditTextandroid:id="@+id/entries_search"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:layout_gravity="center"+ style="@style/ToolbarTitle"android:layout_marginStart="52dp"android:layout_marginTop="4dp"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"- android:inputType="text"- android:textColor="@color/themeAccent"- android:textColorHint="@color/themeAccent"- android:textSize="@dimen/text_size_large" />+ android:importantForAutofill="no" /><ImageButtonandroid:id="@+id/entries_modes_btn"@@ -51,54 +36,49 @@style="@style/SurfaceCard"android:layout_width="match_parent"android:layout_height="match_parent"- android:layout_marginStart="8dp"- android:layout_marginTop="64dp"- android:layout_marginEnd="8dp"- android:layout_marginBottom="64dp">+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="@dimen/surface_margin_top"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="@dimen/surface_margin_bot"><androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/entries_recycler"- style="@style/AppRecycler"+ style="@style/Recycler"android:layout_width="match_parent"android:layout_height="match_parent" /><ProgressBarandroid:id="@+id/entries_progress"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_gravity="center" />+ style="@style/RecyclerProgress" /></androidx.cardview.widget.CardView><com.google.android.material.bottomappbar.BottomAppBarandroid:id="@+id/entries_bottom_bar"- style="@style/BottomAppBar">+ style="@style/BottomBar"><Buttonandroid:id="@+id/entries_select_btn"- style="@style/AppButton"- android:layout_width="128dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:text="Select"- app:icon="@drawable/ic_checkbox" />+ android:text="Select" /><Buttonandroid:id="@+id/entries_clear_btn"- style="@style/AppButton"- android:layout_width="128dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:text="Clear"- app:icon="@drawable/ic_checkbox_out"- app:iconGravity="end" />+ android:text="Clear" /></com.google.android.material.bottomappbar.BottomAppBar><com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/entries_accept_btn"style="@style/FloatingActionButton"- android:src="@drawable/ic_play"+ android:src="@drawable/ic_done"app:layout_anchor="@id/entries_bottom_bar" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex 7b07bb90..f580befa 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -6,11 +6,8 @@android:keepScreenOn="true"><androidx.cardview.widget.CardView- android:id="@+id/map_top_bar"- style="@style/ToolbarCard"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"+ android:id="@+id/map_toolbar"+ style="@style/Toolbar"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent">@@ -24,7 +21,6 @@<TextViewandroid:id="@+id/map_title"style="@style/ToolbarTitle"- android:layout_gravity="center"android:text="@string/map_title" /></androidx.cardview.widget.CardView>@@ -34,14 +30,14 @@style="@style/SurfaceCard"android:layout_width="0dp"android:layout_height="0dp"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"- android:layout_marginBottom="8dp"+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="@dimen/view_default_margin"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="@dimen/view_default_margin"app:layout_constraintBottom_toTopOf="@+id/map_card_info"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/map_top_bar">+ app:layout_constraintTop_toBottomOf="@+id/map_toolbar"><org.osmdroid.views.MapViewandroid:id="@+id/map_view"@@ -73,9 +69,9 @@style="@style/SurfaceCard"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginEnd="8dp"- android:layout_marginBottom="8dp"+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="@dimen/view_default_margin"app:layout_constraintBottom_toTopOf="@+id/map_coordinator"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent">@@ -159,18 +155,17 @@<com.google.android.material.bottomappbar.BottomAppBarandroid:id="@+id/map_bottom_bar"- style="@style/BottomAppBar" />+ style="@style/BottomBar" /></androidx.coordinatorlayout.widget.CoordinatorLayout><Buttonandroid:id="@+id/map_prev_btn"- style="@style/AppButton"- android:layout_width="96dp"- android:layout_height="wrap_content"- android:layout_marginStart="4dp"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_med"+ android:layout_marginStart="@dimen/button_margin_side"android:text="Prev"- app:icon="@drawable/ic_arrow_left"+ app:icon="@drawable/ic_prev"app:layout_constraintBottom_toBottomOf="@+id/map_coordinator"app:layout_constraintStart_toStartOf="@+id/map_coordinator"app:layout_constraintTop_toTopOf="@+id/map_coordinator" />@@ -192,12 +187,12 @@<Buttonandroid:id="@+id/map_next_btn"- style="@style/AppButton"- android:layout_width="96dp"- android:layout_height="wrap_content"- android:layout_marginEnd="4dp"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_med"+ android:layout_marginEnd="@dimen/button_margin_side"android:text="Next"- app:icon="@drawable/ic_arrow_right"+ app:icon="@drawable/ic_next"+ app:iconGravity="end"app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"app:layout_constraintEnd_toEndOf="@+id/map_coordinator" />diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xmlindex 4b1c114e..a1e4aa44 100644--- a/app/src/main/res/layout/fragment_passes.xml+++ b/app/src/main/res/layout/fragment_passes.xml@@ -5,14 +5,8 @@android:layout_height="match_parent"><androidx.cardview.widget.CardView- 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">+ android:id="@+id/passes_toolbar"+ style="@style/Toolbar"><ImageButtonandroid:id="@+id/passes_refresh_btn"@@ -23,14 +17,13 @@<TextViewandroid:id="@+id/passes_timer"- style="@style/ToolbarTimer"- android:layout_gravity="center" />+ style="@style/ToolbarTimer" /><ImageButtonandroid:id="@+id/passes_map_btn"style="@style/ToolbarButton"android:layout_gravity="end|center_vertical"- android:src="@drawable/ic_world" />+ android:src="@drawable/ic_map" /></androidx.cardview.widget.CardView>@@ -38,23 +31,21 @@style="@style/SurfaceCard"android:layout_width="match_parent"android:layout_height="match_parent"- android:layout_marginStart="8dp"- android:layout_marginTop="64dp"- android:layout_marginEnd="8dp"- android:layout_marginBottom="64dp">+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="@dimen/surface_margin_top"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="@dimen/surface_margin_bot"><androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/passes_recycler"- style="@style/AppRecycler"+ style="@style/Recycler"android:layout_width="match_parent"android:layout_height="match_parent" /><ProgressBar- android:visibility="invisible"android:id="@+id/passes_progress"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_gravity="center" />+ android:visibility="invisible"+ style="@style/RecyclerProgress" /><TextViewandroid:id="@+id/passes_error_msg"@@ -69,26 +60,23 @@<com.google.android.material.bottomappbar.BottomAppBarandroid:id="@+id/passes_bottomBar"- style="@style/BottomAppBar">+ style="@style/BottomBar"><Buttonandroid:id="@+id/passes_filter_btn"- style="@style/AppButton"- android:layout_width="136dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:text="Filter"- app:icon="@drawable/ic_filter" />+ android:text="Filter" /><Buttonandroid:id="@+id/passes_settings_btn"- style="@style/AppButton"- android:layout_width="136dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:text="Настройки"- app:icon="@drawable/ic_prefs"- app:iconGravity="end" />+ android:text="Настройки" /></com.google.android.material.bottomappbar.BottomAppBar>diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xmlindex b822acbc..c411bdd7 100644--- a/app/src/main/res/layout/fragment_radar.xml+++ b/app/src/main/res/layout/fragment_radar.xml@@ -7,10 +7,7 @@<androidx.cardview.widget.CardViewandroid:id="@+id/radar_toolbar"- style="@style/ToolbarCard"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"+ style="@style/Toolbar"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent">@@ -23,44 +20,28 @@<TextViewandroid:id="@+id/radar_timer"- style="@style/ToolbarTimer"- android:layout_gravity="center" />+ style="@style/ToolbarTimer" /><ImageButtonandroid:id="@+id/radar_map"style="@style/ToolbarButton"android:layout_gravity="end|center_vertical"- android:src="@drawable/ic_world" />+ android:src="@drawable/ic_map" /></androidx.cardview.widget.CardView>- <TextView- android:id="@+id/radar_name"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="2dp"- android:layout_marginEnd="8dp"- 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" />-<androidx.cardview.widget.CardViewandroid:id="@+id/radar_card"style="@style/SurfaceCard"android:layout_width="0dp"android:layout_height="0dp"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="@dimen/view_default_margin"+ android:layout_marginEnd="@dimen/view_default_margin"app:layout_constraintDimensionRatio="1:1"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/radar_name" />+ app:layout_constraintTop_toBottomOf="@+id/radar_toolbar" /><TextViewandroid:id="@+id/radar_az"@@ -111,38 +92,38 @@style="@style/SurfaceCard"android:layout_width="0dp"android:layout_height="0dp"- android:layout_marginStart="8dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"- android:layout_marginBottom="8dp"+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="@dimen/view_default_margin"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="@dimen/view_default_margin"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">+ app:layout_constraintTop_toBottomOf="@+id/radar_card"><androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/radar_recycler"- style="@style/AppRecycler"+ style="@style/Recycler"android:layout_width="match_parent"android:layout_height="match_parent" />- </androidx.cardview.widget.CardView>+ <ProgressBar+ android:id="@+id/radar_progress"+ style="@style/RecyclerProgress"+ android:visibility="invisible" />- <TextView- android:id="@+id/radar_recycler_msg"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginStart="8dp"- android:layout_marginTop="2dp"- android:layout_marginEnd="8dp"- android:gravity="center"- 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" />+ <TextView+ android:id="@+id/radar_recycler_msg"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_gravity="center"+ android:gravity="center"+ android:includeFontPadding="false"+ android:text="@string/trans_no_data"+ android:textSize="@dimen/text_size_medium"+ android:visibility="invisible" />++ </androidx.cardview.widget.CardView><androidx.coordinatorlayout.widget.CoordinatorLayoutandroid:id="@+id/radar_coordinator"@@ -154,18 +135,16 @@<com.google.android.material.bottomappbar.BottomAppBarandroid:id="@+id/radar_bottom_bar"- style="@style/BottomAppBar" />+ style="@style/BottomBar" /></androidx.coordinatorlayout.widget.CoordinatorLayout><Buttonandroid:id="@+id/radar_prev_btn"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginStart="4dp"+ android:layout_marginStart="@dimen/button_margin_side"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"@@ -191,12 +170,10 @@<Buttonandroid:id="@+id/radar_next_btn"- style="@style/AppButton"+ style="@style/NormalButton"android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginEnd="4dp"+ android:layout_marginEnd="@dimen/button_margin_side"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" />diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xmlindex 4b83e35b..7de20dfa 100644--- a/app/src/main/res/layout/fragment_settings.xml+++ b/app/src/main/res/layout/fragment_settings.xml@@ -5,42 +5,35 @@android:layout_height="match_parent"><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">+ android:id="@+id/settings_toolbar"+ style="@style/Toolbar"><ImageButton- android:id="@+id/prefs_back"+ android:id="@+id/settings_back"style="@style/ToolbarButton"android:layout_gravity="start|center_vertical"android:src="@drawable/ic_back" /><TextView- android:id="@+id/prefs_title"+ android:id="@+id/settings_title"style="@style/ToolbarTitle"- android:layout_gravity="center"android:text="@string/settings_title" /></androidx.cardview.widget.CardView><androidx.cardview.widget.CardView- style="@style/ToolbarCard"+ style="@style/Toolbar"android:layout_width="match_parent"android:layout_height="match_parent"- android:layout_marginTop="64dp"- android:layout_marginStart="8dp"- android:layout_marginBottom="64dp"- android:layout_marginEnd="8dp"+ android:layout_marginStart="@dimen/view_default_margin"+ android:layout_marginTop="60dp"+ android:layout_marginEnd="@dimen/view_default_margin"+ android:layout_marginBottom="62dp"android:backgroundTint="@color/surfaceBg"><androidx.core.widget.NestedScrollViewandroid:id="@+id/settings_scroll"- style="@style/AppRecycler"+ style="@style/Recycler"android:layout_width="match_parent"android:layout_height="match_parent">@@ -49,7 +42,7 @@android:layout_height="wrap_content"><include- android:id="@+id/prefs_info"+ android:id="@+id/settings_info"layout="@layout/card_prefs_about"android:layout_width="match_parent"android:layout_height="wrap_content"@@ -58,55 +51,55 @@app:layout_constraintTop_toTopOf="parent" /><include- android:id="@+id/prefs_location"+ android:id="@+id/settings_location"layout="@layout/card_prefs_location"android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="8dp"+ android:layout_marginTop="@dimen/view_default_margin"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/prefs_info" />+ app:layout_constraintTop_toBottomOf="@+id/settings_info" /><include- android:id="@+id/prefs_data"+ android:id="@+id/settings_data"layout="@layout/card_prefs_update"android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="8dp"+ android:layout_marginTop="@dimen/view_default_margin"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/prefs_location" />+ app:layout_constraintTop_toBottomOf="@+id/settings_location" /><include- android:id="@+id/prefs_tracking"+ android:id="@+id/settings_tracking"layout="@layout/card_prefs_tracking"android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="8dp"+ android:layout_marginTop="@dimen/view_default_margin"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/prefs_data" />+ app:layout_constraintTop_toBottomOf="@+id/settings_data" /><include- android:id="@+id/prefs_other"+ android:id="@+id/settings_other"layout="@layout/card_prefs_other"android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="8dp"+ android:layout_marginTop="@dimen/view_default_margin"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/prefs_tracking" />+ app:layout_constraintTop_toBottomOf="@+id/settings_tracking" /><include- android:id="@+id/prefs_warranty"+ android:id="@+id/settings_warranty"layout="@layout/card_prefs_warranty"android:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="8dp"+ android:layout_marginTop="@dimen/view_default_margin"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/prefs_other" />+ app:layout_constraintTop_toBottomOf="@+id/settings_other" /></androidx.constraintlayout.widget.ConstraintLayout>@@ -114,37 +107,32 @@</androidx.cardview.widget.CardView>-<com.google.android.material.bottomappbar.BottomAppBarandroid:id="@+id/settings_bottom_bar"- style="@style/BottomAppBar">+ style="@style/BottomBar"><Buttonandroid:id="@+id/settings_prev_btn"- style="@style/AppButton"- android:layout_width="128dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginStart="@dimen/button_margin_side"android:layout_gravity="start|center_vertical"- android:layout_marginStart="4dp"- android:text="Notify"- app:icon="@drawable/ic_notify_2" />+ android:text="@string/about_github" /><Buttonandroid:id="@+id/settings_next_btn"- style="@style/AppButton"- android:layout_width="128dp"- android:layout_height="wrap_content"+ style="@style/NormalButton"+ android:layout_width="@dimen/button_width_max"+ android:layout_marginEnd="@dimen/button_margin_side"android:layout_gravity="end|center_vertical"- android:layout_marginEnd="4dp"- android:text="Settings"- app:icon="@drawable/ic_prefs" />+ android:text="@string/about_fdroid" /></com.google.android.material.bottomappbar.BottomAppBar><com.google.android.material.floatingactionbutton.FloatingActionButtonandroid:id="@+id/settings_fab"style="@style/FloatingActionButton"- android:src="@drawable/ic_sputnik"+ android:src="@drawable/ic_support"app:layout_anchor="@id/settings_bottom_bar" /></androidx.coordinatorlayout.widget.CoordinatorLayout>diff --git a/app/src/main/res/layout/item_entry.xml b/app/src/main/res/layout/item_entry.xmlindex 7d2ef6a3..73514a64 100644--- a/app/src/main/res/layout/item_entry.xml+++ b/app/src/main/res/layout/item_entry.xml@@ -6,12 +6,12 @@<CheckBoxandroid:id="@+id/entry_checkbox"android:layout_width="match_parent"- android:layout_height="43dp"- android:layout_marginStart="6dp"+ android:layout_height="41dp"+ android:layout_marginStart="8dp"android:background="@color/surfaceCard"android:ellipsize="end"android:lines="1"- android:padding="4dp"+ android:padding="6dp"android:textColor="@color/themeLight"android:textSize="@dimen/text_size_medium" />diff --git a/app/src/main/res/layout/item_radio.xml b/app/src/main/res/layout/item_radio.xmlindex 6527976d..486ede94 100644--- a/app/src/main/res/layout/item_radio.xml+++ b/app/src/main/res/layout/item_radio.xml@@ -40,15 +40,11 @@app:layout_constraintBottom_toBottomOf="@+id/radio_info"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="@+id/radio_info"- app:srcCompat="@drawable/ic_arrow_right" />+ app:srcCompat="@drawable/ic_next" /><TextViewandroid: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"+ style="@style/RadioFreq"app:layout_constraintEnd_toStartOf="@+id/radio_guide"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/radio_info" />@@ -62,15 +58,11 @@app:layout_constraintBottom_toBottomOf="@+id/radio_info"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintTop_toTopOf="@+id/radio_info"- app:srcCompat="@drawable/ic_arrow_right" />+ app:srcCompat="@drawable/ic_next" /><TextViewandroid: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"+ style="@style/RadioFreq"app:layout_constraintBaseline_toBaselineOf="@+id/radio_downlink"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="@+id/radio_guide" />diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xmldeleted file mode 100644index 9e0344c6..00000000--- a/app/src/main/res/menu/navigation_menu.xml+++ /dev/null@@ -1,23 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<menu xmlns:android="http://schemas.android.com/apk/res/android">- <item- android:id="@+id/nav_entries"- android:icon="@drawable/ic_sputnik"- android:title="@string/menu_satellites" />- <item- android:id="@+id/nav_passes"- android:icon="@drawable/ic_list"- android:title="@string/menu_passes" />- <item- android:id="@+id/nav_radar"- android:icon="@drawable/ic_support"- android:title="@string/menu_radar" />- <item- android:id="@+id/nav_map"- android:icon="@drawable/ic_world"- android:title="@string/menu_map" />- <item- android:id="@+id/nav_settings"- android:icon="@drawable/ic_prefs"- android:title="@string/menu_settings" />-</menu>diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xmlindex 1c0c3334..5e267415 100644--- a/app/src/main/res/values/dimens.xml+++ b/app/src/main/res/values/dimens.xml@@ -1,13 +1,22 @@<?xml version="1.0" encoding="utf-8"?><resources><!-- View values-->+ <dimen name="toolbar_size">48dp</dimen>+ <dimen name="toolbar_icon_size">48dp</dimen><dimen name="btn_corner_low">0dp</dimen>- <dimen name="btn_corner_high">8dp</dimen>+ <dimen name="btn_corner_high">12dp</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>+ <dimen name="bottom_bar_size">56dp</dimen>+ <dimen name="bottom_bar_inset">0dp</dimen>+ <dimen name="surface_margin_top">60dp</dimen>+ <dimen name="button_width_max">128dp</dimen>+ <dimen name="button_width_med">96dp</dimen>+ <dimen name="button_margin_side">2dp</dimen>+ <dimen name="surface_margin_bot">62dp</dimen>+ <dimen name="view_default_margin">6dp</dimen><!-- Text values--><dimen name="text_size_copyright">13sp</dimen><dimen name="text_size_small">15sp</dimen>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex d5ba2fb2..20fd9113 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -17,7 +17,7 @@<item name="colorOnPrimaryContainer">@color/surfaceBg</item><item name="colorOnSurfaceVariant">@color/themeLight</item><item name="colorSecondaryContainer">@color/surfaceIcon</item>-<!-- -->+ <!-- --><item name="android:forceDarkAllowed" tools:targetApi="q">false</item><item name="android:listDivider">@drawable/item_divider</item><item name="android:navigationBarColor">@color/surfaceBg</item>@@ -26,37 +26,88 @@<item name="android:windowBackground">@color/surfaceBg</item></style>- <style name="AppButton" parent="Widget.Material3.Button.IconButton">+ <style name="Toolbar">+ <item name="android:layout_width">match_parent</item>+ <item name="android:layout_height">@dimen/toolbar_size</item>+ <item name="android:layout_gravity">top|center_horizontal</item>+ <item name="android:layout_marginStart">@dimen/view_default_margin</item>+ <item name="android:layout_marginTop">@dimen/view_default_margin</item>+ <item name="android:layout_marginEnd">@dimen/view_default_margin</item>+ <item name="cardBackgroundColor">@color/surfaceToolbar</item>+ <item name="cardCornerRadius">@dimen/card_corner_high</item>+ <item name="cardElevation">@dimen/card_elev_low</item>+ </style>++ <style name="ToolbarButton">+ <item name="android:layout_width">@dimen/toolbar_icon_size</item>+ <item name="android:layout_height">@dimen/toolbar_icon_size</item>+ <item name="android:background">?actionBarItemBackground</item>+ <item name="android:tint">@color/themeLight</item>+ </style>++ <style name="ToolbarTimer">+ <item name="android:layout_width">wrap_content</item>+ <item name="android:layout_height">wrap_content</item>+ <item name="android:layout_gravity">center</item>+ <item name="android:includeFontPadding">false</item>+ <item name="android:text">@string/timer_zero</item>+ <item name="android:textColor">@color/themeAccent</item>+ <item name="android:textSize">@dimen/text_size_app_timer</item>+ <item name="android:textStyle">bold</item>+ </style>++ <style name="ToolbarTitle">+ <item name="android:layout_width">wrap_content</item>+ <item name="android:layout_height">wrap_content</item>+ <item name="android:layout_gravity">center</item>+ <item name="android:background">@color/transparent</item>+ <item name="android:gravity">center</item>+ <item name="android:includeFontPadding">false</item>+ <item name="android:inputType">text</item>+ <item name="android:textColor">@color/themeAccent</item>+ <item name="android:textColorHint">@color/themeAccent</item>+ <item name="android:textSize">@dimen/text_size_large</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="NormalButton" parent="Widget.Material3.Button.IconButton">+ <item name="android:layout_width">wrap_content</item>+ <item name="android:layout_height">wrap_content</item><item name="android:backgroundTint">@color/surfaceButton</item><item name="android:ellipsize">end</item>- <item name="cornerRadius">@dimen/btn_corner_high</item>- <item name="rippleColor">@color/themeLight</item><item name="android:maxLines">1</item><item name="android:textAllCaps">false</item><item name="android:textColor">@color/themeLight</item><item name="android:textSize">@dimen/text_size_medium</item>+ <item name="cornerRadius">@dimen/btn_corner_high</item>+ <item name="iconTint">@color/themeLight</item>+ <item name="rippleColor">@color/themeLight</item></style>- <style name="AppRecycler">- <item name="android:overScrollMode">never</item>- <item name="android:scrollbars">none</item>+ <style name="RadioFreq">+ <item name="android:layout_width">wrap_content</item>+ <item name="android:layout_height">wrap_content</item>+ <item name="android:includeFontPadding">false</item>+ <item name="android:text">@string/trans_link_low</item>+ <item name="android:textColor">@color/themeAccent</item>+ <item name="android:textSize">@dimen/text_size_frequency</item>+ <item name="android:textStyle">bold</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 name="Recycler">+ <item name="android:overScrollMode">never</item>+ <item name="android:scrollbars">none</item></style>- <style name="FloatingActionButton">+ <style name="RecyclerProgress"><item name="android:layout_width">wrap_content</item><item name="android:layout_height">wrap_content</item>- <item name="android:backgroundTint">@color/themeAccent</item>+ <item name="android:layout_gravity">center</item></style><style name="RecyclerItemCard">@@ -68,7 +119,6 @@</style><style name="SurfaceCard">- <item name="android:clipChildren">true</item><item name="android:layout_width">match_parent</item><item name="android:layout_height">wrap_content</item><item name="cardBackgroundColor">@color/surfaceCard</item>@@ -76,38 +126,15 @@<item name="cardElevation">@dimen/card_elev_low</item></style>- <style name="ToolbarCard">- <item name="android:clipChildren">true</item>- <item name="android:layout_width">0dp</item>- <item name="android:layout_height">48dp</item>- <item name="cardBackgroundColor">@color/surfaceToolbar</item>- <item name="cardCornerRadius">@dimen/card_corner_high</item>- <item name="cardElevation">@dimen/card_elev_low</item>- </style>-- <style name="ToolbarButton">- <item name="android:layout_width">48dp</item>- <item name="android:layout_height">48dp</item>- <item name="android:background">?actionBarItemBackground</item>- <item name="android:tint">@color/themeLight</item>- </style>-- <style name="ToolbarTimer">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:includeFontPadding">false</item>- <item name="android:text">@string/timer_zero</item>- <item name="android:textColor">@color/themeAccent</item>- <item name="android:textSize">@dimen/text_size_app_timer</item>- <item name="android:textStyle">bold</item>- </style>-- <style name="ToolbarTitle">- <item name="android:layout_width">wrap_content</item>- <item name="android:layout_height">wrap_content</item>- <item name="android:includeFontPadding">false</item>- <item name="android:textColor">@color/themeLight</item>- <item name="android:textSize">@dimen/text_size_large</item>+ <style name="BottomBar">+ <item name="android:layout_width">match_parent</item>+ <item name="android:layout_height">@dimen/bottom_bar_size</item>+ <item name="android:layout_gravity">bottom</item>+ <item name="android:backgroundTint">@color/bottomAppBar</item>+ <item name="contentInsetStart">@dimen/bottom_bar_inset</item>+ <item name="contentInsetEnd">@dimen/bottom_bar_inset</item>+ <item name="fabCradleMargin">@dimen/view_default_margin</item>+ <item name="fabCradleRoundedCornerRadius">@dimen/view_default_margin</item></style><style name="WorldMapText">