Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Changes to strings.xml and InfoFragment.kt
Arty Bishop1c766abd241d
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.ktindex e53ecc61..95048f33 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransAdapter.kt@@ -37,8 +37,8 @@ class TransAdapter(context: Context) : RecyclerView.Adapter<TransAdapter.TransHoprivate val strNo = context.getString(R.string.btn_no)private val strYes = context.getString(R.string.btn_yes)private val mode = context.getString(R.string.trans_mode)- private val formatLink = context.getString(R.string.trans_down_low_doppler)- private val formatLinkNull = context.getString(R.string.no_downlink_doppler)+ private val formatLink = context.getString(R.string.trans_link_low)+ private val formatLinkNull = context.getString(R.string.trans_no_link)private val isInverted = context.getString(R.string.trans_inverted)private var transmittersList = emptyList<SatTrans>()@@ -74,12 +74,12 @@ class TransAdapter(context: Context) : RecyclerView.Adapter<TransAdapter.TransHoif (satTrans.downlinkLow != null) {val downFreq = predictor.getDownlinkFreq(satTrans.downlinkLow, dateNow) / divider- binding.downlink.text = String.format(formatLink, downFreq)+ binding.downlink.text = String.format(Locale.ENGLISH, formatLink, downFreq)} else binding.downlink.text = formatLinkNullif (satTrans.uplinkLow != null) {val upFreq = predictor.getUplinkFreq(satTrans.uplinkLow, dateNow) / divider- binding.uplink.text = String.format(formatLink, upFreq)+ binding.uplink.text = String.format(Locale.ENGLISH, formatLink, upFreq)} else binding.uplink.text = formatLinkNullif (satTrans.mode != null) binding.mode.text = String.format(mode, satTrans.mode)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.ktindex a53cfc24..187b411e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/EntriesFragment.kt@@ -66,7 +66,7 @@ class EntriesFragment : Fragment(R.layout.fragment_entries) {event.getContentIfNotHandled()?.let {if (it == 0) setLoading()else if (it == 1) {- getString(R.string.error_updating_data).snack(requireView())+ getString(R.string.entries_update_error).snack(requireView())setError()}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.ktindex 687c12cc..7c0a0100 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/InfoFragment.kt@@ -37,13 +37,17 @@ class InfoFragment : Fragment(R.layout.fragment_info) {super.onViewCreated(view, savedInstanceState)FragmentInfoBinding.bind(view).apply {version.text = String.format(getString(R.string.app_version), BuildConfig.VERSION_NAME)+ btnGithub.setOnClickListener {+ gotoUrl("https://github.com/rt-bishop/Look4Sat/")+ }+ btnFdroid.setOnClickListener {+ gotoUrl("https://f-droid.org/en/packages/com.rtbishop.look4sat/")+ }message.movementMethod = LinkMovementMethod.getInstance()}}- private fun gotoGitHub() {- val gitHubUrl = "https://github.com/rt-bishop/LookingSat"- val githubIntent = Intent(Intent.ACTION_VIEW, Uri.parse(gitHubUrl))- startActivity(githubIntent)+ private fun gotoUrl(url: String) {+ startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.ktindex b738ff29..5b2f1280 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapFragment.kt@@ -113,7 +113,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {256,".png",arrayOf("https://maps.wikimedia.org/osm-intl/"),- resources.getString(R.string.osmCopyright),+ resources.getString(R.string.map_copyright),TileSourcePolicy(1, TileSourcePolicy.FLAG_NO_BULK and TileSourcePolicy.FLAG_NO_PREVENTIVE andTileSourcePolicy.FLAG_USER_AGENT_MEANINGFUL and TileSourcePolicy.FLAG_USER_AGENT_NORMALIZEDdiff --git a/app/src/main/res/layout/dialog_sources.xml b/app/src/main/res/layout/dialog_sources.xmlindex 41bf318c..6c4165d4 100644--- a/app/src/main/res/layout/dialog_sources.xml+++ b/app/src/main/res/layout/dialog_sources.xml@@ -11,7 +11,7 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_marginTop="6dp"- android:text="@string/dialog_tle_sources"+ android:text="@string/sources_title"android:textSize="16sp"app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler"@@ -23,7 +23,7 @@android:layout_height="wrap_content"android:layout_marginTop="4dp"android:gravity="center"- android:text="@string/https_only"+ android:text="@string/sources_https"android:textSize="16sp"app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler"app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" />diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 9bf3353a..c2a9f12f 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -75,7 +75,7 @@android:layout_height="wrap_content"android:layout_marginStart="16dp"android:iconifiedByDefault="false"- android:queryHint="@string/dialog_entries_hint"+ android:queryHint="@string/entries_search_hint"app:layout_constraintEnd_toStartOf="@+id/select_all"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/entries_bar" />@@ -115,7 +115,7 @@android:id="@+id/entries_error"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:text="@string/entries_error"+ android:text="@string/entries_no_data"android:textSize="20sp"android:visibility="invisible"app:layout_constraintBottom_toBottomOf="parent"diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xmlindex 8c45a90d..d9fa0327 100644--- a/app/src/main/res/layout/fragment_info.xml+++ b/app/src/main/res/layout/fragment_info.xml@@ -28,89 +28,112 @@android:layout_width="match_parent"android:layout_height="wrap_content">+ <ImageView+ android:id="@+id/title_img"+ android:layout_width="48dp"+ android:layout_height="48dp"+ android:layout_marginEnd="8dp"+ android:contentDescription="@string/placeholder"+ android:src="@drawable/ic_menu_entries"+ app:layout_constraintBottom_toBottomOf="@+id/title"+ app:layout_constraintEnd_toStartOf="@+id/title"+ app:layout_constraintHorizontal_chainStyle="packed"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="@+id/title" />+<com.google.android.material.textview.MaterialTextViewandroid:id="@+id/title"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="4dp"- android:layout_marginEnd="16dp"+ android:layout_marginTop="16dp"android:text="@string/app_name"android:textColor="@color/themeLight"- android:textSize="42sp"- app:layout_constraintBottom_toBottomOf="@+id/title_img"+ android:textSize="48sp"app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/title_img"- app:layout_constraintTop_toTopOf="@+id/title_img" />-- <ImageView- android:id="@+id/title_img"- android:layout_width="42dp"- android:layout_height="42dp"- android:layout_marginStart="16dp"- android:layout_marginTop="16dp"- android:layout_marginEnd="4dp"- android:contentDescription="@string/placeholder"- android:src="@drawable/ic_menu_entries"- app:layout_constraintEnd_toStartOf="@+id/title"- app:layout_constraintHorizontal_bias="0.5"- app:layout_constraintHorizontal_chainStyle="packed"- app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" /><com.google.android.material.textview.MaterialTextViewandroid:id="@+id/version"- android:layout_width="0dp"+ android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="32dp"- android:layout_marginTop="8dp"- android:layout_marginEnd="32dp"- android:gravity="center"+ android:layout_marginTop="4dp"android:text="@string/app_version"- android:textSize="16sp"+ android:textColor="@color/themeLight"+ android:textSize="18sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/title" /><com.google.android.material.textview.MaterialTextViewandroid:id="@+id/subtitle"- android:layout_width="0dp"+ android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="32dp"android:layout_marginTop="8dp"- android:layout_marginEnd="32dp"- android:gravity="center"android:text="@string/about_subtitle"- android:textSize="16sp"+ android:textSize="18sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/version" />- <com.google.android.material.textview.MaterialTextView- android:id="@+id/thanks"- android:layout_width="0dp"+ <com.google.android.material.button.MaterialButton+ android:id="@+id/btn_github"+ android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_marginTop="16dp"- android:gravity="center"- android:text="@string/about_thanks_to"+ android:backgroundTint="@color/greySurface"+ android:text="@string/btn_github"+ android:textAllCaps="false"+ android:textColor="@color/themeLight"android:textSize="16sp"- app:layout_constraintEnd_toEndOf="@+id/subtitle"- app:layout_constraintStart_toStartOf="@+id/subtitle"+ app:icon="@drawable/ic_github"+ app:iconTint="@color/themeLight"+ app:layout_constraintEnd_toStartOf="@+id/btn_fdroid"+ app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/subtitle" />+ <com.google.android.material.button.MaterialButton+ android:id="@+id/btn_fdroid"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:backgroundTint="@color/greySurface"+ android:text="@string/btn_fdroid"+ android:textAllCaps="false"+ android:textColor="@color/themeLight"+ android:textSize="16sp"+ app:icon="@drawable/ic_fdroid"+ app:iconTint="@color/themeLight"+ app:layout_constraintBaseline_toBaselineOf="@+id/btn_github"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toEndOf="@+id/btn_github" />+<com.google.android.material.textview.MaterialTextViewandroid:id="@+id/message"android:layout_width="0dp"android:layout_height="wrap_content"- android:layout_marginStart="16dp"+ android:layout_marginStart="8dp"android:layout_marginTop="16dp"- android:layout_marginEnd="16dp"- android:layout_marginBottom="16dp"- android:text="@string/about_thanks_list"- app:layout_constraintBottom_toBottomOf="parent"+ android:layout_marginEnd="8dp"+ android:gravity="center"+ android:text="@string/about_thanks"+ android:textSize="16sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toBottomOf="@+id/thanks" />+ app:layout_constraintTop_toBottomOf="@+id/btn_github" />++ <TextView+ android:id="@+id/warranty"+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginTop="16dp"+ android:layout_marginBottom="16dp"+ android:gravity="center"+ android:text="@string/about_warranty"+ android:textSize="16sp"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/message"+ app:layout_constraintStart_toStartOf="@+id/message"+ app:layout_constraintTop_toBottomOf="@+id/message" /></androidx.constraintlayout.widget.ConstraintLayout></ScrollView>diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex 6925baf0..46ca34cf 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -99,7 +99,7 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:gravity="center"- android:text="@string/osmCopyright"+ android:text="@string/map_copyright"android:textColor="@color/themeLight"android:textSize="12sp"app:layout_constraintBottom_toBottomOf="parent"diff --git a/app/src/main/res/layout/fragment_polar.xml b/app/src/main/res/layout/fragment_polar.xmlindex ba59003a..a31b2b39 100644--- a/app/src/main/res/layout/fragment_polar.xml+++ b/app/src/main/res/layout/fragment_polar.xml@@ -137,7 +137,7 @@android:layout_height="wrap_content"android:layout_marginTop="8dp"android:gravity="center"- android:text="@string/no_trans"+ android:text="@string/trans_no_data"android:textSize="15sp"android:visibility="invisible"app:layout_constraintEnd_toEndOf="parent"diff --git a/app/src/main/res/layout/item_tle_source.xml b/app/src/main/res/layout/item_tle_source.xmlindex 35cca81c..5193c99e 100644--- a/app/src/main/res/layout/item_tle_source.xml+++ b/app/src/main/res/layout/item_tle_source.xml@@ -12,7 +12,7 @@style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"android:layout_width="0dp"android:layout_height="wrap_content"- android:hint="@string/tle_source"+ android:hint="@string/sources_hint"app:endIconDrawable="@drawable/ic_map_sat"app:endIconMode="custom"app:layout_constraintBottom_toBottomOf="parent"diff --git a/app/src/main/res/layout/item_trans.xml b/app/src/main/res/layout/item_trans.xmlindex 04c1fc4b..52330f84 100644--- a/app/src/main/res/layout/item_trans.xml+++ b/app/src/main/res/layout/item_trans.xml@@ -49,7 +49,7 @@android:layout_height="wrap_content"android:layout_marginTop="4dp"android:fontFamily="@font/digital_dismay"- android:text="@string/trans_down_low_doppler"+ android:text="@string/trans_link_low"android:textColor="@color/themeLight"android:textSize="30sp"app:layout_constraintEnd_toStartOf="@+id/guideline"@@ -61,7 +61,7 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:fontFamily="@font/digital_dismay"- android:text="@string/trans_down_low_doppler"+ android:text="@string/trans_link_low"android:textColor="@color/themeLight"android:textSize="30sp"app:layout_constraintBaseline_toBaselineOf="@+id/downlink"diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 2db251c2..ecd4e138 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -20,19 +20,43 @@<resources><string name="app_version">Версия: %s</string>+ <string name="btn_yes">Да</string>+ <string name="btn_no">Нет</string>+ <string name="btn_cancel">Отмена</string>+ <string name="btn_update">Обновить</string>+<string name="menu_entries">Спутники</string><string name="menu_passes">Пролеты</string>- <string name="menu_map">Карта Мира</string>+ <string name="menu_map">Карта</string><string name="menu_prefs">Настройки</string><string name="menu_about">Инфо</string>- <string name="dialog_tle_sources">Управление TLE</string>- <string name="dialog_entries_hint">ID / Имя</string>+ <string name="sources_title">Управление TLE</string>+ <string name="sources_hint">Источник TLE</string>+ <string name="sources_https">Только протокол HTTPS</string>++ <string name="entries_update">Обновить спутники:</string>+ <string name="entries_search_hint">Поиск по имени / Id</string>+ <string name="entries_no_data">Пожалуйста, обновите спутники</string>+ <string name="entries_update_error">Ошибка обновления спутников</string>- <string name="pass_prefs_title">Настройки пролетов спутников</string>- <string name="hours_ahead_title">Количество часов</string>- <string name="minimal_elevation_title">Минимальная элевация</string>+ <string name="passes_error">Нет выбранных спутников</string>++ <string name="trans_mode">Модуляция: %s</string>+ <string name="trans_no_mode">Модуляция: нет</string>+ <string name="trans_inverted">Инверсия: %s</string>+ <string name="trans_no_data">Не найдены трансиверы для этого спутника</string>+ <string name="pat_azimuth">Аз: %.1f°</string>+ <string name="pat_elevation">Элев: %.1f°</string>+ <string name="pat_distance">Дист: %.0fкм</string>+ <string name="pat_altitude">Выс: %.0fкм</string>+ <string name="pat_osm_latLon">Шир: %.1f°, Дол: %.1f°</string>+ <string name="pat_osm_vel">Скор: %.2f км/с</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>@@ -44,67 +68,20 @@<string name="pref_compass_title">Использовать компас</string><string name="pref_time_utc_title">Показывать время пролета по UTC</string>- <string name="no_mode">Модуляция: нет</string>- <string name="no_downlink_doppler">нет</string>- <string name="no_trans">Не найдены трансиверы для этого спутника</string>-- <string name="error_updating_data">Ошибка импорта спутников</string>-- <string name="pat_azimuth">Аз: %.1f°</string>- <string name="pat_elevation">Элев: %.1f°</string>- <string name="pat_distance">Дист: %.0fкм</string>- <string name="pat_altitude">Выс: %.0fкм</string>-- <string name="pat_osm_latLon">Шир: %.1f°, Дол: %.1f°</string>- <string name="pat_osm_vel">Скор: %.2f км/с</string>-- <string name="trans_mode">Модуляция: %s</string>- <string name="trans_inverted">Инверсия: %s</string>-- <string name="about_subtitle">Приложение для слежения за спутниками радио и погоды- для платформы Android</string>- <string name="about_thanks_to">Большое спасибо:</string>- <string name="about_thanks_list">— Вам за использование этого приложения! Желаю всегда чистого неба над головой!\n-- \n— David A. B. Johnson, <a href="https://github.com/g4dpz">G4DPZ</a>, автору библиотеки- predict4java, которую приложение использует для вычисления орбит спутников по модели SGP4.\n-- \n— <a href="https://github.com/davidmoten">Dave Moten</a> за создание форка и добавления- библиотеки в репозиторий maven, что значительно облегчило интеграцию в приложение.- Библиотека predict4java доступна по лицензии- <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>.\n-- \n— Alexandru Csete, <a href="https://github.com/csete">OZ9AEC</a>, за его замечательную- программу Gpredict, которая вдохновила меня на создание Look4Sat.\n-- \n— Доктору <a href="https://celestrak.com/webmaster.php">T.S. Kelso</a> за его бесценный- вклад в развитие космической отрасли и за его сайт <a href="https://celestrak.com/">Celestrak</a>,- который хранит, обновляет и предоставляет доступ к файлам TLE.\n-- \n— Команде <a href="https://libre.space/">Libre Space Foundation</a> и их проекту SatNOGS,- который предоставляет замечательное <a href="https://db.satnogs.org/api/">API</a>- и <a href="https://db.satnogs.org/">базу данных</a> с огромным количеством информации- о спутниках, их телеметрии и трансиверах, которую приложение использует под капотом.\n-- \n— Ребятам из Square за создание библиотек OkHttp, Okio, Retrofit и за доступ- к ним по лицензии <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a>.\n-- \n— Ребятам из Google и AOSP за создание самой лучшей мобильной ОС, доступной- на сегодняшний день. За их Google Play Services и за библиотеки Gson и Dagger2.\n-- \nЭто программное обеспечение поставляется без каких либо гарантий. Подробности содержатся- в лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>.- </string>-- <string name="btn_yes">Да</string>- <string name="btn_no">Нет</string>- <string name="btn_ok">OK</string>- <string name="btn_cancel">Отмена</string>- <string name="btn_update">Обновить</string>-- <string name="tle_source">Источник TLE</string>- <string name="https_only">Используйте HTTPS</string>- <string name="entries_update">Обновить данные TLE:</string>- <string name="entries_error">Пожалуйста, обновите данные TLE</string>- <string name="passes_error">Нет выбранных спутников</string>+ <string name="about_subtitle">Трекер спутников для Android</string>+ <string name="about_thanks">Огромное спасибо:+ \n— Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!+ \n— <a href="https://github.com/g4dpz">David A. B. Johnson</a> и+ <a href="https://github.com/davidmoten">Dave Moten</a> за работу над библиотекой predict4java и+ открытие доступа к ней по лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>+ \n— <a href="https://github.com/csete">Alexandru Csete</a> за его замечательную+ программу Gpredict, которая вдохновила меня на создание Look4Sat.+ \n— <a href="https://celestrak.com/webmaster.php">Доктору T.S. Kelso</a> за его сайт+ <a href="https://celestrak.com/">Celestrak</a>, который предоставляет доступ к файлам орбит Two-Line Element.+ \n— <a href="https://libre.space/">Libre Space Foundation</a> за проект+ <a href="https://db.satnogs.org/">SatNOGS</a>, API и базу данных с огромным количеством информации о спутниках.+ \n— <a href="https://square.github.io/">Square</a> за библиотеки OkHttp, Retrofit, Moshi и доступ+ к ним по лицензии <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></string>+ <string name="about_warranty">Это ПО поставляется без гарантий.+ Подробности в лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a></string></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 0f3d65a2..ecfd978d 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -20,6 +20,14 @@<resources><string name="app_name" translatable="false">Look4Sat</string><string name="app_version">Version: %s</string>+ <string name="placeholder" translatable="false">Placeholder</string>++ <string name="btn_no">No</string>+ <string name="btn_yes">Yes</string>+ <string name="btn_cancel">Cancel</string>+ <string name="btn_update">Update</string>+ <string name="btn_github" translatable="false">GitHub</string>+ <string name="btn_fdroid" translatable="false">F-Droid</string><string name="menu_entries">Satellites</string><string name="menu_passes">Passes</string>@@ -27,100 +35,74 @@<string name="menu_prefs">Settings</string><string name="menu_about">Info</string>- <string name="dialog_tle_sources">Manage TLE sources</string>- <string name="dialog_entries_hint">ID / Name</string>+ <string name="sources_title">Manage TLE sources</string>+ <string name="sources_hint">TLE source</string>+ <string name="sources_https">Protocol HTTPS only</string>- <string name="pass_prefs_title">Satellite pass preferences</string>- <string name="hours_ahead_title">Hours ahead</string>- <string name="minimal_elevation_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_compass_title">Use sensors to rotate PolarView</string>- <string name="pref_time_utc_title">Show pass time in UTC</string>+ <string name="entries_update">TLE data update:</string>+ <string name="entries_search_hint">Search by Name / Id</string>+ <string name="entries_no_data">Please update TLE data</string>+ <string name="entries_update_error">Error importing satellite data</string>- <string name="no_mode">Mode: null</string>- <string name="no_downlink_doppler">null</string>- <string name="no_trans">No transceivers found for this satellite</string>+ <string name="timer_zero" translatable="false">00:00:00</string>+ <string name="timer_placeholder" translatable="false">-</string>- <string name="error_updating_data">Error importing satellite data</string>+ <string name="passes_error">No satellites were selected</string><string name="pass_satName" translatable="false">%s</string>- <string name="pass_satId" translatable="false">ID:%d</string>+ <string name="pass_satId" translatable="false">Id:%d</string><string name="pass_aos_az" translatable="false">%s — %2d°</string><string name="pass_los_az" translatable="false">%2d° — %s</string><string name="pass_dateTime" translatable="false">HH:mm:ss</string>+ <string name="trans_mode">Mode: %s</string>+ <string name="trans_no_mode">Mode: null</string>+ <string name="trans_inverted">Inverted: %s</string>+ <string name="trans_description" translatable="false">%s</string>+ <string name="trans_no_link" translatable="false">- -</string>+ <string name="trans_link_low" translatable="false">%.4f</string>+ <string name="trans_link_lowHigh" translatable="false">%.4f - %.4f</string>+ <string name="trans_no_data">No transceivers found for this satellite</string>++ <string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>+<string name="pat_azimuth">Az: %.1f°</string><string name="pat_elevation">El: %.1f°</string><string name="pat_distance">Dst: %.0f km</string><string name="pat_altitude">Alt: %.0f km</string>-<string name="pat_osm_idName" translatable="false">%s / %s</string><string name="pat_osm_latLon">Lat: %.1f°, Lon: %.1f°</string><string name="pat_osm_vel">Vel: %.2f km/s</string>- <string name="trans_mode">Mode: %s</string>- <string name="trans_inverted">Inverted: %s</string>- <string name="trans_description" translatable="false">%s</string>- <string name="trans_down_low_doppler" translatable="false">%.4f</string>- <string name="trans_down_lowHigh_doppler" translatable="false">%.4f - %.4f</string>-- <string name="about_subtitle">- Amateur radio and weather satellites passes calculator for Android</string>- <string name="about_thanks_to">Big thanks:</string>- <string name="about_thanks_list">— To you for installing and using this app! May your sky always be clear!\n-- \n— To David A. B. Johnson, <a href="https://github.com/g4dpz">G4DPZ</a>, the author of- predict4java library which this app is using for all the SGP4 model calculations.\n-- \n— To <a href="https://github.com/davidmoten">Dave Moten</a> for creating the mavenized fork- of predict4java which made it super easy to integrate the library in the app. Predict4java- is available under the- <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> license.\n-- \n— To Alexandru Csete, <a href="https://github.com/csete">OZ9AEC</a>, and contributors- for the amazing Gpredict program that inspired the creation and design of Look4Sat.\n-- \n— To <a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for his invaluable- contribution to the industry and his <a href="https://celestrak.com/">Celestrak</a>- website, that stores, updates and provides access to TLE data.\n-- \n— To the <a href="https://libre.space/">Libre Space Foundation</a> team and their SatNOGS- project that provides an extremely easy to use <a href="https://db.satnogs.org/api/">API</a>- and <a href="https://db.satnogs.org/">DB</a> with a huge amount of information about- satellites, their telemetry and transmitters, which the app uses under the hood.\n-- \n— To Guys from Square for creating an amazing set of libraries (OkHttp, Okio, Retrofit)- and for making them available under the- <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a> license.\n-- \n— To Guys from Google and AOSP for making the best mobile OS available nowadays, for their- Google Play Services, Gson and Dagger2 libs.\n+ <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>- \nThis application comes with absolutely no warranty. See the- <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.+ <string name="about_subtitle">Satellite tracker for Android</string>+ <string name="about_thanks">Huge thanks to:+ \n— You for downloading and using Look4Sat! \nMay your sky always be clear!+ \n— <a href="https://github.com/g4dpz">David A. B. Johnson</a>+ and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java library and making it+ available under the <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> license.+ \n— <a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict+ sat tracker that inspired the creation of Look4Sat.+ \n— <a href="https://celestrak.com/webmaster.php">Dr T.S. Kelso</a> for maintaining his+ <a href="https://celestrak.com/">Celestrak</a> website that provides access to the TLE data.+ \n— <a href="https://libre.space/">Libre Space Foundation</a> for their <a href="https://db.satnogs.org/">SatNOGS</a>+ API and database providing a huge amount of satellite data used by Look4Sat.+ \n— <a href="https://square.github.io/">Square</a> for epic OkHttp, Retrofit and Moshi libs+ available under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a> license.</string>-- <string name="btn_yes">Yes</string>- <string name="btn_no">No</string>- <string name="btn_ok">OK</string>- <string name="btn_cancel">Cancel</string>- <string name="btn_update">Update</string>-- <string name="tle_source">TLE source</string>- <string name="https_only">Please use HTTPS URLs only</string>- <string name="placeholder" translatable="false">Placeholder</string>- <string name="osmCopyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>- <string name="timer_zero" translatable="false">00:00:00</string>- <string name="timer_placeholder" translatable="false">-</string>- <string name="entries_update">TLE data update:</string>- <string name="entries_error">Please update TLE data</string>- <string name="passes_error">No satellites were selected</string>+ <string name="about_warranty">This application comes with absolutely no warranty. See the+ <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.</string></resources>diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xmlindex aa5ceba1..3d7fde96 100644--- a/app/src/main/res/xml/preference.xml+++ b/app/src/main/res/xml/preference.xml@@ -42,12 +42,12 @@app:useSimpleSummaryProvider="true" /></PreferenceCategory><PreferenceCategory- android:title="@string/pass_prefs_title"+ android:title="@string/pref_pass_title"app:iconSpaceReserved="false"><SeekBarPreferenceandroid:key="hoursAhead"android:max="72"- android:title="@string/hours_ahead_title"+ android:title="@string/pref_hours_title"app:defaultValue="8"app:iconSpaceReserved="false"app:min="1"@@ -55,7 +55,7 @@<SeekBarPreferenceandroid:key="minimalElevation"android:max="72"- android:title="@string/minimal_elevation_title"+ android:title="@string/pref_elev_title"app:adjustable="false"app:defaultValue="16"app:iconSpaceReserved="false"