Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved pass prefs to preferences screen
Arty Bishop6631f1e74557
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.ktindex 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<EditTextPreference>(PrefsManager.keyLatitude)?.apply {- summaryProvider = providersetOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL or@@ -55,7 +53,6 @@ class PrefsFragment : PreferenceFragmentCompat(),}findPreference<EditTextPreference>(PrefsManager.keyLongitude)?.apply {- summaryProvider = providersetOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL or@@ -72,7 +69,6 @@ class PrefsFragment : PreferenceFragmentCompat(),}findPreference<EditTextPreference>(PrefsManager.keyAltitude)?.apply {- summaryProvider = providersetOnBindEditTextListener {it.inputType = InputType.TYPE_CLASS_NUMBER orInputType.TYPE_NUMBER_FLAG_DECIMAL ordiff --git a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.ktindex 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.LocationManagerimport androidx.core.content.editimport com.github.amsacode.predict4java.GroundStationPositionimport com.rtbishop.look4sat.data.PassPrefs-import com.rtbishop.look4sat.utility.Utilities.getDoubleimport com.rtbishop.look4sat.utility.Utilities.putDoubleimport com.rtbishop.look4sat.utility.Utilities.roundimport 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.0const 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.xmlindex 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.xmlindex 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 @@<string name="dialog_tle_sources">Управление источниками TLE</string><string name="dialog_entries_hint">ID / Имя</string>- <string name="pref_hours_ahead_hint">Количество часов</string>+ <string name="pref_passes_preferences">Настройки пролетов</string>+ <string name="pref_hours_ahead">Количество часов</string><string name="pref_hours_ahead_summary">Показать пролеты за след. Х часов</string><string name="pref_hours_ahead_input_error">Введите значение между 1ч и 168ч</string>- <string name="pref_min_el_hint">Минимальная элевация</string>+ <string name="pref_minimal_elevation">Минимальная элевация</string><string name="pref_min_el_summary">Показать пролеты с элевацией более</string><string name="pref_min_el_input_error">Введите значение между 0° и 90°</string>@@ -45,8 +46,8 @@<string name="pref_alt_title">Высота, м</string><string name="pref_alt_input_error">Введите значение между -413м и 8850м</string><string name="pref_other_title">Другие настройки</string>- <string name="pref_compass_title">Использовать компас при отображении полярных координат</string>- <string name="pref_time_utc_title">Показывать время пролёта по UTC</string>+ <string name="pref_compass_title">Использовать компас</string>+ <string name="pref_time_utc_title">Показывать время пролета по UTC</string><string name="no_mode">Модуляция: нет</string><string name="no_uplink">Восход: нет</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 4f39d8af..77a3af91 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -31,10 +31,11 @@<string name="dialog_tle_sources">Manage TLE sources</string><string name="dialog_entries_hint">ID / Name</string>- <string name="pref_hours_ahead_hint">Hours ahead</string>+ <string name="pref_passes_preferences">Passes preferences</string>+ <string name="pref_hours_ahead">Hours ahead</string><string name="pref_hours_ahead_summary">Show passes that occur within X hours</string><string name="pref_hours_ahead_input_error">Set the value between 1h and 168h</string>- <string name="pref_min_el_hint">Minimum elevation</string>+ <string name="pref_minimal_elevation">Minimal elevation</string><string name="pref_min_el_summary">Show passes with max elevation above</string><string name="pref_min_el_input_error">Set the value between 0° and 90°</string>diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xmlindex 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.-->-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">- <PreferenceCategory android:title="@string/pref_gsp_title">+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto">+ <PreferenceCategory+ android:title="@string/pref_gsp_title"+ app:iconSpaceReserved="false"><EditTextPreferenceandroid:defaultValue="0.0"android:key="latitude"- android:title="@string/pref_lat_title" />+ android:title="@string/pref_lat_title"+ app:iconSpaceReserved="false"+ app:useSimpleSummaryProvider="true" /><EditTextPreferenceandroid:defaultValue="0.0"android:key="longitude"- android:title="@string/pref_lon_title" />+ android:title="@string/pref_lon_title"+ app:iconSpaceReserved="false"+ app:useSimpleSummaryProvider="true" /><EditTextPreferenceandroid:defaultValue="0.0"android:key="altitude"- android:title="@string/pref_alt_title" />+ android:title="@string/pref_alt_title"+ app:iconSpaceReserved="false"+ app:useSimpleSummaryProvider="true" /></PreferenceCategory>- <PreferenceCategory android:title="@string/pref_other_title">+ <PreferenceCategory+ android:title="@string/pref_passes_preferences"+ app:iconSpaceReserved="false">+ <SeekBarPreference+ android:key="hoursAhead"+ android:max="72"+ android:title="@string/pref_hours_ahead"+ app:defaultValue="8"+ app:iconSpaceReserved="false"+ app:min="1"+ app:showSeekBarValue="true" />+ <SeekBarPreference+ android:key="minimalElevation"+ android:max="72"+ android:title="@string/pref_minimal_elevation"+ app:adjustable="false"+ app:defaultValue="16"+ app:iconSpaceReserved="false"+ app:min="0"+ app:showSeekBarValue="true" />+ </PreferenceCategory>+ <PreferenceCategory+ android:title="@string/pref_other_title"+ app:iconSpaceReserved="false"><SwitchPreferenceandroid:defaultValue="false"android:key="timeUTC"- android:title="@string/pref_time_utc_title" />+ android:title="@string/pref_time_utc_title"+ app:iconSpaceReserved="false" /><SwitchPreferenceandroid:defaultValue="true"android:key="compass"- android:title="@string/pref_compass_title" />+ android:title="@string/pref_compass_title"+ app:iconSpaceReserved="false" /></PreferenceCategory></PreferenceScreen>