Cleaned up preference.xml, added setPositionFromGPS button

This commit is contained in:
Arty Bishop committed 2020-10-26 22:35:37 +00:00
1 parent cfdba41ed5
commit e06b1bcb11
10 files changed
+88 -143

No files matched your search

+3 -3
View File
@@ -38,7 +38,7 @@
android:gravity="center"
android:maxLines="1"
android:text="@string/trans_description"
android:textSize="16sp"
android:textSize="15sp"
app:layout_constraintEnd_toStartOf="@+id/img_uplink"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toEndOf="@+id/img_downlink"
@@ -77,7 +77,7 @@
android:layout_marginTop="4dp"
android:layout_marginBottom="2dp"
android:text="@string/trans_mode"
android:textSize="16sp"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/isInverted"
app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -90,7 +90,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:text="@string/trans_inverted"
android:textSize="16sp"
android:textSize="15sp"
app:layout_constraintBaseline_toBaselineOf="@+id/mode"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/mode" />
+5 -7
View File
@@ -52,16 +52,14 @@
<string name="pat_osm_latLon">Шир: %.1f°, Дол: %.1f°</string>
<string name="pat_osm_vel">Скор: %.2f км/с</string>
<string name="pref_gsp_title">Местоположение наземной станции</string>
<string name="pref_pos_gps">Установить позицию по данным GPS</string>
<string name="pref_pos_gps_success">Позиция успешно обновлена</string>
<string name="pref_pos_gps_null">Местоположение отключено</string>
<string name="pref_pos_gps_error">Нет разрешения использовать геоданные</string>
<string name="pref_pass_title">Настройки пролетов спутников</string>
<string name="pref_hours_title">Количество часов</string>
<string name="pref_elev_title">Минимальная элевация</string>
<string name="pref_gsp_title">Местоположение наземной станции</string>
<string name="pref_lat_title">Широта, град</string>
<string name="pref_lat_input_error">Введите значение между -90° и 90°</string>
<string name="pref_lon_title">Долгота, град</string>
<string name="pref_lon_input_error">Введите значение между -180° и 180°</string>
<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>
+5 -7
View File
@@ -71,16 +71,14 @@
<string name="pat_osm_latLon">Lat: %.1f°, Lon: %.1f°</string>
<string name="pat_osm_vel">Vel: %.2f km/s</string>
<string name="pref_gsp_title">Ground station position</string>
<string name="pref_pos_gps">Set position from GPS</string>
<string name="pref_pos_gps_success">Position updated successfully</string>
<string name="pref_pos_gps_null">Location is switched off</string>
<string name="pref_pos_gps_error">Check your location permissions</string>
<string name="pref_pass_title">Satellite pass preferences</string>
<string name="pref_hours_title">Hours ahead</string>
<string name="pref_elev_title">Minimal elevation</string>
<string name="pref_gsp_title">Ground station position</string>
<string name="pref_lat_title">Latitude, deg</string>
<string name="pref_lat_input_error">Set the value between -90° and 90°</string>
<string name="pref_lon_title">Longitude, deg</string>
<string name="pref_lon_input_error">Set the value between -180° and 180°</string>
<string name="pref_alt_title">Altitude, m</string>
<string name="pref_alt_input_error">Set the value between -413m and 8850m</string>
<string name="pref_other_title">Other</string>
<string name="pref_time_utc_title">Show pass time in UTC</string>
<string name="pref_compass_title">Use sensors to rotate PolarView</string>
+5 -19
View File
@@ -22,24 +22,10 @@
<PreferenceCategory
android:title="@string/pref_gsp_title"
app:iconSpaceReserved="false">
<EditTextPreference
android:defaultValue="0.0"
android:key="latitude"
android:title="@string/pref_lat_title"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference
android:defaultValue="0.0"
android:key="longitude"
android:title="@string/pref_lon_title"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference
android:defaultValue="0.0"
android:key="altitude"
android:title="@string/pref_alt_title"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference
android:key="setPositionGPS"
android:title="@string/pref_pos_gps"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_pass_title"
@@ -53,7 +39,7 @@
app:min="1"
app:showSeekBarValue="true" />
<SeekBarPreference
android:key="minimalElevation"
android:key="minElevation"
android:max="72"
android:title="@string/pref_elev_title"
app:adjustable="false"