Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Minor updates to interface and strings
Arty Bishoped69a1e99654
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex ecfa9ab6..3aae806e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -95,8 +95,8 @@ class SharedViewModel @Inject constructor(try {val selected = repository.getSelectedEntries().map { it.catNum }repository.updateSources(list)- repository.updateTransmitters()repository.updateEntriesFromUrl(list)+ repository.updateTransmitters()repository.updateEntriesSelection(selected)_updateStatus.postValue(Result.Success(0))} catch (e: Exception) {diff --git a/app/src/main/res/layout/item_transmitter.xml b/app/src/main/res/layout/item_transmitter.xmlindex 8cd9b5a6..9c1ef25e 100644--- a/app/src/main/res/layout/item_transmitter.xml+++ b/app/src/main/res/layout/item_transmitter.xml@@ -60,17 +60,20 @@<Viewandroid:id="@+id/separator"android:layout_width="match_parent"- android:padding="15dp"- android:layout_marginLeft="20dp"- android:layout_marginRight="20dp"android:layout_height="1dp"- app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintTop_toBottomOf="@+id/trans_uplink"- android:background="#333"/>+ android:layout_marginStart="8dp"+ android:layout_marginTop="2dp"+ android:layout_marginEnd="8dp"+ android:background="#333"+ android:padding="15dp"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toBottomOf="@+id/trans_uplink" /><TextViewandroid:id="@+id/trans_downlink_doppler"style="@style/CardTransText"+ android:layout_marginTop="1dp"android:text="@string/trans_down_lowHigh_doppler"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toEndOf="@+id/trans_img_downlink_doppler"@@ -119,6 +122,7 @@android:id="@+id/trans_img_downlink"android:layout_width="20dp"android:layout_height="20dp"+ android:layout_marginTop="1dp"android:contentDescription="@string/placeholder"android:rotation="180"app:layout_constraintBottom_toBottomOf="@+id/trans_downlink"@@ -133,6 +137,7 @@android:id="@+id/trans_img_uplink"android:layout_width="20dp"android:layout_height="20dp"+ android:layout_marginTop="1dp"android:contentDescription="@string/placeholder"app:layout_constraintBottom_toBottomOf="@+id/trans_uplink"app:layout_constraintEnd_toStartOf="@+id/trans_uplink"@@ -142,37 +147,12 @@app:layout_constraintTop_toBottomOf="@+id/trans_downlink"app:srcCompat="@drawable/ic_arrow" />- <ImageView- android:id="@+id/trans_img_downlink_current"- android:layout_width="20dp"- android:layout_height="20dp"- android:contentDescription="@string/placeholder"- android:rotation="180"- app:layout_constraintBottom_toBottomOf="@+id/trans_downlink_doppler"- app:layout_constraintEnd_toStartOf="@+id/trans_img_downlink_doppler"- app:layout_constraintHorizontal_bias="1"- app:layout_constraintHorizontal_chainStyle="packed"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="@+id/trans_downlink_doppler"- app:srcCompat="@drawable/ic_arrow" />-- <ImageView- android:id="@+id/trans_img_uplink_current"- android:layout_width="20dp"- android:layout_height="20dp"- android:contentDescription="@string/placeholder"- app:layout_constraintBottom_toBottomOf="@+id/trans_uplink_doppler"- app:layout_constraintEnd_toStartOf="@+id/trans_img_uplink_doppler"- app:layout_constraintHorizontal_bias="1"- app:layout_constraintHorizontal_chainStyle="packed"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/trans_downlink_doppler"- app:srcCompat="@drawable/ic_arrow" />-<ImageViewandroid:id="@+id/trans_img_downlink_doppler"- android:layout_width="20dp"- android:layout_height="20dp"+ android:layout_width="16dp"+ android:layout_height="16dp"+ android:layout_marginTop="1dp"+ android:layout_marginEnd="2dp"android:contentDescription="@string/placeholder"android:rotation="180"app:layout_constraintBottom_toBottomOf="@+id/trans_downlink_doppler"@@ -185,8 +165,10 @@<ImageViewandroid:id="@+id/trans_img_uplink_doppler"- android:layout_width="20dp"- android:layout_height="20dp"+ android:layout_width="16dp"+ android:layout_height="16dp"+ android:layout_marginTop="1dp"+ android:layout_marginEnd="2dp"android:contentDescription="@string/placeholder"app:layout_constraintBottom_toBottomOf="@+id/trans_uplink_doppler"app:layout_constraintEnd_toStartOf="@+id/trans_uplink_doppler"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 94f6bf0c..ed0f677d 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -67,8 +67,10 @@<string name="pref_time_utc_title">Показывать время пролёта по UTC</string><string name="no_mode">Модуляция: нет</string>- <string name="no_uplink">Восход.: нет</string>- <string name="no_downlink">Нисход.: нет</string>+ <string name="no_uplink">Восход: нет</string>+ <string name="no_downlink">Нисход: нет</string>+ <string name="no_uplink_doppler">Тек. восход: нет</string>+ <string name="no_downlink_doppler">Тек. нисход: нет</string><string name="no_trans">Не найдены трансиверы для этого спутника</string><string name="err_no_permissions">Отсутствуют необходимые разрешения</string>@@ -91,14 +93,14 @@<string name="trans_mode">Модуляция: %s</string><string name="trans_inverted">Инверсия: %s</string>- <string name="trans_up_low">Восход.: %.4f MHz</string>- <string name="trans_up_lowHigh">Восход.: %.4f - %.4f MHz</string>- <string name="trans_down_low">Нисход.: %.4f MHz</string>- <string name="trans_down_lowHigh">Нисход.: %.4f - %.4f MHz</string>- <string name="trans_up_low_doppler">Восход.: %.4f MHz</string>- <string name="trans_up_lowHigh_doppler">Восход.: %.4f - %.4f MHz</string>- <string name="trans_down_low_doppler">Нисход.: %.4f MHz</string>- <string name="trans_down_lowHigh_doppler">Нисход.: %.4f - %.4f MHz</string>+ <string name="trans_up_low">Восход: %.4fMHz</string>+ <string name="trans_up_lowHigh">Восход: %.4f - %.4fMHz</string>+ <string name="trans_down_low">Нисход: %.4f MHz</string>+ <string name="trans_down_lowHigh">Нисход: %.4f - %.4fMHz</string>+ <string name="trans_up_low_doppler">Тек. восход: %.4fMHz</string>+ <string name="trans_up_lowHigh_doppler">Тек. восход: %.4f - %.4fMHz</string>+ <string name="trans_down_low_doppler">Тек. нисход: %.4fMHz</string>+ <string name="trans_down_lowHigh_doppler">Тек. нисход: %.4f - %.4fMHz</string><string name="info_swipe_text">Проведите по экрану вниз, чтобы обновить список пролетовдля выбранных спутников</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 998c7aa6..cc3c3598 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -79,8 +79,8 @@<string name="no_mode">Mode: null</string><string name="no_uplink">Uplink: null</string><string name="no_downlink">Downlink: null</string>- <string name="no_uplink_doppler">Current uplink: null</string>- <string name="no_downlink_doppler">Current downlink: null</string>+ <string name="no_uplink_doppler">Curr. uplink: null</string>+ <string name="no_downlink_doppler">Curr. downlink: null</string><string name="no_trans">No transceivers found for this satellite</string><string name="err_no_permissions">Missing permissions</string>@@ -110,14 +110,14 @@<string name="trans_description" translatable="false">%s</string><string name="trans_mode">Mode: %s</string><string name="trans_inverted">Inverted: %s</string>- <string name="trans_up_low">Uplink: %.4f MHz</string>- <string name="trans_up_lowHigh">Uplink: %.4f - %.4f MHz</string>- <string name="trans_down_low">Downlink: %.4f MHz</string>- <string name="trans_down_lowHigh">Downlink: %.4f - %.4f MHz</string>- <string name="trans_up_low_doppler">Current uplink: %.4f MHz</string>- <string name="trans_up_lowHigh_doppler">Current uplink: %.4f - %.4f MHz</string>- <string name="trans_down_low_doppler">Current downlink: %.4f MHz</string>- <string name="trans_down_lowHigh_doppler">Current downlink: %.4f - %.4f MHz</string>+ <string name="trans_up_low">Uplink: %.4fMHz</string>+ <string name="trans_up_lowHigh">Uplink: %.4f - %.4fMHz</string>+ <string name="trans_down_low">Downlink: %.4fMHz</string>+ <string name="trans_down_lowHigh">Downlink: %.4f - %.4fMHz</string>+ <string name="trans_up_low_doppler">Curr. uplink: %.4fMHz</string>+ <string name="trans_up_lowHigh_doppler">Curr. uplink: %.4f - %.4fMHz</string>+ <string name="trans_down_low_doppler">Curr. downlink: %.4fMHz</string>+ <string name="trans_down_lowHigh_doppler">Curr. downlink: %.4f - %.4fMHz</string><string name="info_swipe_text">Swipe the screen to refresh the list of passes for selected satellites</string>