From 6631f1e7455733eef79ef29600ae79d8a8b7a7e4 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sat, 10 Oct 2020 15:54:30 +0100 Subject: [PATCH] Moved pass prefs to preferences screen --- .../look4sat/ui/fragments/PrefsFragment.kt | 4 -- .../rtbishop/look4sat/utility/PrefsManager.kt | 9 ++-- app/src/main/res/layout/dialog_passes.xml | 4 +- app/src/main/res/values-ru/strings.xml | 9 ++-- app/src/main/res/values/strings.xml | 5 +- app/src/main/res/xml/preference.xml | 50 ++++++++++++++++--- 6 files changed, 56 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt index f1de1631..a5d3fcaa 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PrefsFragment.kt @@ -35,10 +35,8 @@ class PrefsFragment : PreferenceFragmentCompat(), override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.preference, rootKey) - val provider = EditTextPreference.SimpleSummaryProvider.getInstance() findPreference(PrefsManager.keyLatitude)?.apply { - summaryProvider = provider setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL or @@ -55,7 +53,6 @@ class PrefsFragment : PreferenceFragmentCompat(), } findPreference(PrefsManager.keyLongitude)?.apply { - summaryProvider = provider setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL or @@ -72,7 +69,6 @@ class PrefsFragment : PreferenceFragmentCompat(), } findPreference(PrefsManager.keyAltitude)?.apply { - summaryProvider = provider setOnBindEditTextListener { it.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL or diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt index fb36b48a..dc37180e 100644 --- a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt +++ b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt @@ -24,7 +24,6 @@ import android.location.LocationManager import androidx.core.content.edit import com.github.amsacode.predict4java.GroundStationPosition import com.rtbishop.look4sat.data.PassPrefs -import com.rtbishop.look4sat.utility.Utilities.getDouble import com.rtbishop.look4sat.utility.Utilities.putDouble import com.rtbishop.look4sat.utility.Utilities.round import javax.inject.Inject @@ -34,6 +33,8 @@ class PrefsManager @Inject constructor( private val locationManager: LocationManager ) { companion object { + const val hoursAhead = "hoursAhead" + const val minimalElevation = "minimalElevation" const val keyHoursAhead = "hoursAhead" const val keyMinElevation = "minEl" const val keyLatitude = "latitude" @@ -41,15 +42,13 @@ class PrefsManager @Inject constructor( const val keyAltitude = "altitude" const val keyCompass = "compass" const val keyTimeUtc = "timeUTC" - const val defaultHoursAhead = 8 - const val defaultMinEl = 16.0 const val defaultGSP = "0.0" const val keyIsFirstLaunch = "keyIsFirstLaunch" } fun getPassPrefs(): PassPrefs { - val hoursAhead = preferences.getInt(keyHoursAhead, defaultHoursAhead) - val minEl = preferences.getDouble(keyMinElevation, defaultMinEl) + val hoursAhead = preferences.getInt(hoursAhead, 8) + val minEl = preferences.getInt(minimalElevation, 16).toDouble() return PassPrefs(hoursAhead, minEl) } diff --git a/app/src/main/res/layout/dialog_passes.xml b/app/src/main/res/layout/dialog_passes.xml index 582cb55e..0b82109a 100644 --- a/app/src/main/res/layout/dialog_passes.xml +++ b/app/src/main/res/layout/dialog_passes.xml @@ -48,7 +48,7 @@ android:id="@+id/pref_et_hoursAhead" android:layout_width="0dp" android:layout_height="wrap_content" - android:hint="@string/pref_hours_ahead_hint" + android:hint="@string/pref_hours_ahead" android:importantForAutofill="no" android:inputType="number" app:layout_constraintEnd_toEndOf="@+id/pref_tv_hoursAhead" @@ -69,7 +69,7 @@ android:id="@+id/pref_et_minEl" android:layout_width="0dp" android:layout_height="wrap_content" - android:hint="@string/pref_min_el_hint" + android:hint="@string/pref_minimal_elevation" android:importantForAutofill="no" android:inputType="number|numberDecimal" app:layout_constraintEnd_toEndOf="@+id/pref_tv_minEl" diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7e9000ff..28f0f595 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,10 +30,11 @@ Управление источниками TLE ID / Имя - Количество часов + Настройки пролетов + Количество часов Показать пролеты за след. Х часов Введите значение между 1ч и 168ч - Минимальная элевация + Минимальная элевация Показать пролеты с элевацией более Введите значение между 0° и 90° @@ -45,8 +46,8 @@ Высота, м Введите значение между -413м и 8850м Другие настройки - Использовать компас при отображении полярных координат - Показывать время пролёта по UTC + Использовать компас + Показывать время пролета по UTC Модуляция: нет Восход: нет diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4f39d8af..77a3af91 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,10 +31,11 @@ Manage TLE sources ID / Name - Hours ahead + Passes preferences + Hours ahead Show passes that occur within X hours Set the value between 1h and 168h - Minimum elevation + Minimal elevation Show passes with max elevation above Set the value between 0° and 90° diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index 619e18b4..a2197337 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -17,29 +17,63 @@ ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> - - + + + android:title="@string/pref_lat_title" + app:iconSpaceReserved="false" + app:useSimpleSummaryProvider="true" /> + android:title="@string/pref_lon_title" + app:iconSpaceReserved="false" + app:useSimpleSummaryProvider="true" /> + android:title="@string/pref_alt_title" + app:iconSpaceReserved="false" + app:useSimpleSummaryProvider="true" /> - + + + + + + android:title="@string/pref_time_utc_title" + app:iconSpaceReserved="false" /> + android:title="@string/pref_compass_title" + app:iconSpaceReserved="false" />