Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Further changes to SettingsFragment.kt
Arty Bishop7d3d746c4d8f
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/LocationProvider.kt b/app/src/main/java/com/rtbishop/look4sat/framework/LocationProvider.ktindex 199636a4..32ec966d 100644--- a/app/src/main/java/com/rtbishop/look4sat/framework/LocationProvider.kt+++ b/app/src/main/java/com/rtbishop/look4sat/framework/LocationProvider.kt@@ -68,29 +68,29 @@ class LocationProvider @Inject constructor(} else _stationPosition.tryEmit(DataState.Error(context.getString(R.string.pref_pos_gps_null)))}- override fun setPositionFromLocation() {+ override fun setPositionFromGps() {val result = ContextCompat.checkSelfPermission(context, locationFine)- if (manager.isProviderEnabled(providerDef) && result == PackageManager.PERMISSION_GRANTED) {+ if (manager.isProviderEnabled(providerGps) && result == PackageManager.PERMISSION_GRANTED) {val location = manager.getLastKnownLocation(providerDef)if (location != null) {setStationPosition(location.latitude, location.longitude)- } else setPositionFromGps()+ } else {+ _stationPosition.tryEmit(DataState.Loading)+ manager.requestLocationUpdates(providerGps, 0L, 0f, this)+ }} else _stationPosition.tryEmit(DataState.Error(context.getString(R.string.pref_pos_gps_null)))}override fun setPositionFromNet() {val result = ContextCompat.checkSelfPermission(context, locationCoarse)if (manager.isProviderEnabled(providerNet) && result == PackageManager.PERMISSION_GRANTED) {- _stationPosition.tryEmit(DataState.Loading)- manager.requestLocationUpdates(providerNet, 0L, 0f, this)- } else _stationPosition.tryEmit(DataState.Error(context.getString(R.string.pref_pos_gps_null)))- }-- override fun setPositionFromGps() {- val result = ContextCompat.checkSelfPermission(context, locationFine)- if (manager.isProviderEnabled(providerGps) && result == PackageManager.PERMISSION_GRANTED) {- _stationPosition.tryEmit(DataState.Loading)- manager.requestLocationUpdates(providerGps, 0L, 0f, this)+ val location = manager.getLastKnownLocation(providerDef)+ if (location != null) {+ setStationPosition(location.latitude, location.longitude)+ } else {+ _stationPosition.tryEmit(DataState.Loading)+ manager.requestLocationUpdates(providerNet, 0L, 0f, this)+ }} else _stationPosition.tryEmit(DataState.Error(context.getString(R.string.pref_pos_gps_null)))}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 e7cb082a..e4975ec8 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@@ -25,6 +25,7 @@ import android.os.Bundleimport android.text.method.LinkMovementMethodimport android.view.Viewimport android.widget.EditText+import android.widget.Toastimport androidx.activity.result.contract.ActivityResultContractsimport androidx.appcompat.app.AlertDialogimport androidx.core.widget.doOnTextChanged@@ -32,7 +33,6 @@ import androidx.fragment.app.Fragmentimport androidx.lifecycle.asLiveDataimport androidx.lifecycle.lifecycleScopeimport androidx.navigation.fragment.findNavController-import com.google.android.material.snackbar.Snackbarimport com.rtbishop.look4sat.BuildConfigimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentSettingsBinding@@ -65,9 +65,9 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {private val locationContract = ActivityResultContracts.RequestMultiplePermissions()private val locationRequest = registerForActivityResult(locationContract) { permissions ->when {- permissions[locationFine] == true -> locationHandler.setPositionFromLocation()+ permissions[locationFine] == true -> locationHandler.setPositionFromGps()permissions[locationCoarse] == true -> locationHandler.setPositionFromNet()- else -> showSnack(getString(R.string.pref_pos_gps_error))+ else -> showToast(getString(R.string.pref_pos_gps_error))}}private val contentContract = ActivityResultContracts.GetContent()@@ -89,7 +89,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {setupOtherCard(settingsBinding)setupWarrantyCard(settingsBinding)locationHandler.stationPosition.asLiveData().observe(viewLifecycleOwner) { stationPos ->- stationPos?.let { handleStationPosition(it) }+ stationPos?.let { handleStationPosition(it, settingsBinding) }}}@@ -107,17 +107,8 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {}}- private fun setupDataCard(binding: FragmentSettingsBinding) {- binding.prefsData.updateBtnFile.setOnClickListener { contentRequest.launch("*/*") }- binding.prefsData.updateBtnWeb.setOnClickListener {- findNavController().navigateSafe(R.id.action_prefs_to_sources)- }- getNavResult<List<String>>(R.id.nav_prefs, "sources") { sources ->- lifecycleScope.launchWhenResumed { dataRepository.updateDataFromWeb(sources) }- }- }-private fun setupLocationCard(binding: FragmentSettingsBinding) {+ setPositionText(locationHandler.getStationPosition(), binding)binding.prefsLocation.locationBtnGps.setOnClickListener {locationRequest.launch(arrayOf(locationFine, locationCoarse))}@@ -136,6 +127,16 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {}}+ private fun setupDataCard(binding: FragmentSettingsBinding) {+ binding.prefsData.updateBtnFile.setOnClickListener { contentRequest.launch("*/*") }+ binding.prefsData.updateBtnWeb.setOnClickListener {+ findNavController().navigateSafe(R.id.action_prefs_to_sources)+ }+ getNavResult<List<String>>(R.id.nav_prefs, "sources") { sources ->+ lifecycleScope.launchWhenResumed { dataRepository.updateDataFromWeb(sources) }+ }+ }+private fun setupTrackingCard(binding: FragmentSettingsBinding) {binding.prefsTracking.trackingSwitch.apply {isChecked = preferences.getRotatorEnabled()@@ -177,16 +178,32 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {binding.prefsWarranty.warrantyLicense.movementMethod = LinkMovementMethod.getInstance()}- private fun handleStationPosition(position: DataState<GeoPos>) {- when (position) {- is DataState.Success -> showSnack(getString(R.string.pref_pos_success))- is DataState.Error -> showSnack(position.message.toString())- DataState.Loading -> showSnack("Fetching position")+ private fun setPositionText(geoPos: GeoPos, binding: FragmentSettingsBinding) {+ 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)+ }++ private fun handleStationPosition(pos: DataState<GeoPos>, binding: FragmentSettingsBinding) {+ when (pos) {+ is DataState.Success -> {+ setPositionText(pos.data, binding)+ binding.prefsLocation.locationProgress.isIndeterminate = false+ showToast(getString(R.string.pref_pos_success))+ }+ is DataState.Error -> {+ binding.prefsLocation.locationProgress.isIndeterminate = false+ showToast(pos.message.toString())+ }+ DataState.Loading -> {+ binding.prefsLocation.locationProgress.isIndeterminate = true+ }}}- private fun showSnack(message: String) {- Snackbar.make(requireView(), message, Snackbar.LENGTH_SHORT).show()+ private fun showToast(message: String) {+ Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()}private fun gotoUrl(url: String) {diff --git a/app/src/main/res/drawable/ic_update_web.xml b/app/src/main/res/drawable/ic_update_web.xmlindex 95e5be7c..0bf729e7 100644--- a/app/src/main/res/drawable/ic_update_web.xml+++ b/app/src/main/res/drawable/ic_update_web.xml@@ -3,7 +3,7 @@android:height="24dp"android:viewportWidth="24"android:viewportHeight="24">- <path- android:fillColor="@color/themeAccent"- android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />+ <path+ android:fillColor="@color/themeAccent"+ android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" /></vector>diff --git a/app/src/main/res/layout/card_prefs_location.xml b/app/src/main/res/layout/card_prefs_location.xmlindex 3e9f6eab..351d7bbb 100644--- a/app/src/main/res/layout/card_prefs_location.xml+++ b/app/src/main/res/layout/card_prefs_location.xml@@ -6,15 +6,51 @@<TextViewandroid:id="@+id/location_title"+ style="@style/SettingsCategory"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="10dp"+ android:layout_marginStart="8dp"android:layout_marginTop="8dp"android:text="@string/location_title"- android:textColor="@color/themeAccent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />+ <ProgressBar+ android:id="@+id/location_progress"+ style="?android:attr/progressBarStyleHorizontal"+ android:layout_width="0dp"+ android:layout_height="0dp"+ android:layout_marginStart="6dp"+ android:layout_marginEnd="8dp"+ app:layout_constraintBottom_toBottomOf="@+id/location_title"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/location_title"+ app:layout_constraintTop_toTopOf="@+id/location_title" />++ <TextView+ android:id="@+id/location_lat"+ style="@style/SettingsText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginTop="6dp"+ android:text="@string/location_lat"+ app:layout_constraintEnd_toStartOf="@+id/location_lon"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintHorizontal_chainStyle="spread_inside"+ app:layout_constraintStart_toStartOf="@+id/location_title"+ app:layout_constraintTop_toBottomOf="@+id/location_title" />++ <TextView+ android:id="@+id/location_lon"+ style="@style/SettingsText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:text="@string/location_lon"+ app:layout_constraintBaseline_toBaselineOf="@+id/location_lat"+ app:layout_constraintEnd_toEndOf="@+id/location_progress"+ app:layout_constraintHorizontal_bias="0.5"+ app:layout_constraintStart_toEndOf="@+id/location_lat" />+<Buttonandroid:id="@+id/location_btn_gps"style="@style/AppButton"@@ -30,7 +66,7 @@app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/location_title" />+ app:layout_constraintTop_toBottomOf="@+id/location_lat" /><Buttonandroid:id="@+id/location_btn_qth"diff --git a/app/src/main/res/layout/card_prefs_other.xml b/app/src/main/res/layout/card_prefs_other.xmlindex 09455b18..694059de 100644--- a/app/src/main/res/layout/card_prefs_other.xml+++ b/app/src/main/res/layout/card_prefs_other.xml@@ -6,11 +6,11 @@<TextViewandroid:id="@+id/other_title"+ style="@style/SettingsCategory"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="10dp"+ android:layout_marginStart="8dp"android:layout_marginTop="8dp"- android:textSize="16sp"android:text="@string/other_title"android:textColor="@color/themeAccent"app:layout_constraintStart_toStartOf="parent"@@ -18,40 +18,36 @@<androidx.appcompat.widget.SwitchCompatandroid:id="@+id/other_switch_utc"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="10dp"android:layout_marginTop="8dp"android:layout_marginEnd="4dp"android:minHeight="48dp"- android:textSize="16sp"android:text="@string/other_switch_utc"- android:textColor="@color/themeLight"app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/other_title"app:layout_constraintTop_toBottomOf="@+id/other_title" /><androidx.appcompat.widget.SwitchCompatandroid:id="@+id/other_switch_sweep"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"android:minHeight="48dp"- android:textSize="16sp"android:text="@string/other_switch_sweep"- android:textColor="@color/themeLight"app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"app:layout_constraintStart_toStartOf="@+id/other_switch_utc"app:layout_constraintTop_toBottomOf="@+id/other_switch_utc" /><androidx.appcompat.widget.SwitchCompatandroid:id="@+id/other_switch_sensors"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginBottom="8dp"android:minHeight="48dp"- android:textSize="16sp"android:text="@string/other_switch_sensors"- android:textColor="@color/themeLight"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"app:layout_constraintStart_toStartOf="@+id/other_switch_sweep"diff --git a/app/src/main/res/layout/card_prefs_tracking.xml b/app/src/main/res/layout/card_prefs_tracking.xmlindex 4fbdec49..1ad6e53a 100644--- a/app/src/main/res/layout/card_prefs_tracking.xml+++ b/app/src/main/res/layout/card_prefs_tracking.xml@@ -6,28 +6,25 @@<TextViewandroid:id="@+id/tracking_title"+ style="@style/SettingsCategory"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="10dp"+ android:layout_marginStart="8dp"android:layout_marginTop="8dp"- android:textSize="16sp"android:text="@string/tracking_title"- android:textColor="@color/themeAccent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" /><androidx.appcompat.widget.SwitchCompatandroid:id="@+id/tracking_switch"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="10dp"android:layout_marginEnd="4dp"android:minHeight="48dp"- android:textSize="16sp"android:text="@string/tracking_switch"- android:textColor="@color/themeLight"app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/tracking_title"app:layout_constraintTop_toBottomOf="@+id/tracking_title" /><com.google.android.material.textfield.TextInputLayoutdiff --git a/app/src/main/res/layout/card_prefs_update.xml b/app/src/main/res/layout/card_prefs_update.xmlindex c065a262..e236e890 100644--- a/app/src/main/res/layout/card_prefs_update.xml+++ b/app/src/main/res/layout/card_prefs_update.xml@@ -6,44 +6,54 @@<TextViewandroid:id="@+id/update_title"+ style="@style/SettingsCategory"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="10dp"+ android:layout_marginStart="8dp"android:layout_marginTop="8dp"- android:textSize="16sp"android:text="@string/update_title"- android:textColor="@color/themeAccent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" />+ <ProgressBar+ android:id="@+id/update_progress"+ style="?android:attr/progressBarStyleHorizontal"+ android:layout_width="0dp"+ android:layout_height="0dp"+ android:layout_marginStart="6dp"+ android:layout_marginEnd="8dp"+ app:layout_constraintBottom_toBottomOf="@+id/update_title"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/update_title"+ app:layout_constraintTop_toTopOf="@+id/update_title" />+<Buttonandroid:id="@+id/update_btn_web"style="@style/AppButton"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginEnd="4dp"+ android:layout_marginStart="4dp"+ android:layout_marginTop="4dp"+ android:layout_marginBottom="4dp"android:drawableStart="@drawable/ic_update_web"android:text="@string/update_web"- app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_file"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toStartOf="@+id/update_btn_file"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintHorizontal_chainStyle="spread_inside"- app:layout_constraintStart_toEndOf="@+id/update_btn_file" />+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toBottomOf="@+id/update_title" /><Buttonandroid:id="@+id/update_btn_file"style="@style/AppButton"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="4dp"- android:layout_marginTop="4dp"- android:layout_marginBottom="4dp"+ android:layout_marginEnd="4dp"android:drawableStart="@drawable/ic_update_file"android:text="@string/update_file"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toStartOf="@+id/update_btn_web"+ app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"+ app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/update_title" />+ app:layout_constraintStart_toEndOf="@+id/update_btn_web" /></androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/card_prefs_warranty.xml b/app/src/main/res/layout/card_prefs_warranty.xmlindex 547adcd8..fba73460 100644--- a/app/src/main/res/layout/card_prefs_warranty.xml+++ b/app/src/main/res/layout/card_prefs_warranty.xml@@ -6,39 +6,35 @@<TextViewandroid:id="@+id/warranty_title"+ style="@style/SettingsCategory"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="10dp"+ android:layout_marginStart="8dp"android:layout_marginTop="8dp"android:text="@string/warranty_title"- android:textColor="@color/themeAccent"- android:textSize="16sp"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" /><TextViewandroid:id="@+id/warranty_thanks"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="10dp"android:layout_marginTop="4dp"android:layout_marginEnd="8dp"android:text="@string/warranty_thanks"- android:textColor="@color/themeLight"- android:textSize="16sp"app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/warranty_title"app:layout_constraintTop_toBottomOf="@+id/warranty_title" /><TextViewandroid:id="@+id/warranty_license"+ style="@style/SettingsText"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginTop="4dp"android:layout_marginBottom="8dp"android:text="@string/warranty_license"- android:textColor="@color/themeLight"- android:textSize="16sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"app:layout_constraintStart_toStartOf="@+id/warranty_thanks"diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xmlindex 76053d3f..f12e9d2e 100644--- a/app/src/main/res/layout/fragment_settings.xml+++ b/app/src/main/res/layout/fragment_settings.xml@@ -50,28 +50,28 @@</androidx.cardview.widget.CardView><androidx.cardview.widget.CardView- android:id="@+id/card_prefs_data"+ android:id="@+id/card_prefs_location"style="@style/SettingsCard"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/card_prefs_info"><include- android:id="@+id/prefs_data"- layout="@layout/card_prefs_update" />+ android:id="@+id/prefs_location"+ layout="@layout/card_prefs_location" /></androidx.cardview.widget.CardView><androidx.cardview.widget.CardView- android:id="@+id/card_prefs_location"+ android:id="@+id/card_prefs_data"style="@style/SettingsCard"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">+ app:layout_constraintTop_toBottomOf="@+id/card_prefs_location"><include- android:id="@+id/prefs_location"- layout="@layout/card_prefs_location" />+ android:id="@+id/prefs_data"+ layout="@layout/card_prefs_update" /></androidx.cardview.widget.CardView>@@ -80,7 +80,7 @@style="@style/SettingsCard"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/card_prefs_location">+ app:layout_constraintTop_toBottomOf="@+id/card_prefs_data"><includeandroid:id="@+id/prefs_tracking"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex ea2ecb27..1d12c4e4 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -75,6 +75,8 @@<string name="about_support">Поддержать</string><string name="location_title">Местоположение наземной станции</string>+ <string name="location_lat">Широта: %.4f°</string>+ <string name="location_lon">Долгота: %.4f°</string><string name="location_gps">Данные GPS</string><string name="location_gps_null">Нет данных геолокации</string><string name="location_gps_error">Нет разрешения использовать геоданные</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 7fd1cd16..dcf2496c 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -94,6 +94,8 @@<string name="about_fdroid" translatable="false">F-Droid</string><string name="location_title">Station position update</string>+ <string name="location_lat">Latitude: %.4f°</string>+ <string name="location_lon">Longitude: %.4f°</string><string name="location_gps">From GPS</string><string name="location_gps_null">No geolocation data</string><string name="location_gps_error">Check your location permissions</string>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex 7d57b8a3..2ec55167 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -86,4 +86,15 @@<item name="cardCornerRadius">8dp</item></style>+ <style name="SettingsText">+ <item name="android:textSize">16sp</item>+ <item name="android:textColor">@color/themeLight</item>+ </style>++ <style name="SettingsCategory">+ <item name="android:includeFontPadding">false</item>+ <item name="android:textSize">16sp</item>+ <item name="android:textColor">@color/themeAccent</item>+ </style>+</resources>\ No newline at end of filediff --git a/core/src/main/java/com/rtbishop/look4sat/domain/LocationHandler.kt b/core/src/main/java/com/rtbishop/look4sat/domain/LocationHandler.ktindex 70b24710..2a2c41ed 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/LocationHandler.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/LocationHandler.kt@@ -12,11 +12,9 @@ interface LocationHandler {fun setStationPosition(latitude: Double, longitude: Double)- fun setPositionFromLocation()+ fun setPositionFromGps()fun setPositionFromNet()- fun setPositionFromGps()-fun setPositionFromQth(qthString: String)}