Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Cleaned up strings and styles
Arty Bishop8f34c6d6b9b7
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.ktindex b9091688..6fb5617e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/TransmitterAdapter.kt@@ -100,12 +100,12 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHoif (transmitter.isInverted) {binding.transInverted.text = String.format(context.getString(R.string.trans_inverted),- context.getString(R.string.btn_yes)+ context.getString(android.R.string.yes))} else {binding.transInverted.text = String.format(context.getString(R.string.trans_inverted),- context.getString(R.string.btn_no)+ context.getString(android.R.string.no))}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.ktindex 2f1023db..c9266a1c 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt@@ -145,6 +145,6 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) {binding.tvMapLat.text = String.format(mainActivity.getString(R.string.pat_latitude), lat)binding.tvMapLon.text = String.format(mainActivity.getString(R.string.pat_longitude), lon)- binding.tvMapRng.text = String.format(mainActivity.getString(R.string.pat_range), rng)+ binding.tvMapRng.text = String.format(mainActivity.getString(R.string.pat_distance), rng)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.ktindex dc88ca3a..027c8042 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt@@ -140,8 +140,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {etMinEl.setText(minEl.toString())AlertDialog.Builder(mainActivity).apply {- setTitle(getString(R.string.dialog_filter_passes))- setPositiveButton(getString(R.string.btn_ok)) { _, _ ->+ setPositiveButton(getString(android.R.string.ok)) { _, _ ->val hoursStr = etHoursAhead.text.toString()val elevationStr = etMinEl.text.toString()if (hoursStr.isNotEmpty() && elevationStr.isNotEmpty()) {@@ -174,7 +173,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {).show()}- setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ ->+ setNegativeButton(getString(android.R.string.cancel)) { dialog, _ ->dialog.cancel()}setView(satPassPrefView)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.ktindex 0187cf79..f6706f84 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt@@ -168,7 +168,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLisval satPos = satPass.predictor.getSatPos(Date())val polarAz = mainActivity.getString(R.string.pat_azimuth)val polarEl = mainActivity.getString(R.string.pat_elevation)- val polarRng = mainActivity.getString(R.string.pat_range)+ val polarRng = mainActivity.getString(R.string.pat_distance)val polarAlt = mainActivity.getString(R.string.pat_altitude)binding.tvPolarAz.text = String.format(polarAz, GeneralUtils.rad2Deg(satPos.azimuth))binding.tvPolarEl.text = String.format(polarEl, GeneralUtils.rad2Deg(satPos.elevation))diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/TleSourcesDialogFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/TleSourcesDialogFragment.ktindex c6927e43..62efa876 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/TleSourcesDialogFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/TleSourcesDialogFragment.kt@@ -22,6 +22,7 @@ package com.rtbishop.look4sat.ui.fragmentsimport android.app.Dialogimport android.os.Bundleimport android.view.ViewGroup+import android.view.Windowimport androidx.appcompat.app.AppCompatDialogFragmentimport androidx.recyclerview.widget.LinearLayoutManagerimport com.rtbishop.look4sat.data.TleSource@@ -38,6 +39,7 @@ class TleSourcesDialogFragment(sources: List<TleSource>) :override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {val binding = DialogTleSourcesBinding.inflate(requireActivity().layoutInflater)val tleSourcesDialog = Dialog(requireActivity()).apply {+ window?.requestFeature(Window.FEATURE_NO_TITLE)setContentView(binding.root)window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT,diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xmlnew file mode 100644index 00000000..88076db6--- /dev/null+++ b/app/src/main/res/drawable/ic_add.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="32dp"+ android:height="32dp"+ android:viewportWidth="24.0"+ android:viewportHeight="24.0">+ <path+ android:fillColor="#FFE082"+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />+</vector>diff --git a/app/src/main/res/layout/dialog_pass_pref.xml b/app/src/main/res/layout/dialog_pass_pref.xmlindex 48e9e617..582cb55e 100644--- a/app/src/main/res/layout/dialog_pass_pref.xml+++ b/app/src/main/res/layout/dialog_pass_pref.xml@@ -23,17 +23,26 @@android:layout_width="match_parent"android:layout_height="wrap_content">+ <TextView+ android:id="@+id/pref_tv_title"+ style="@style/DialogText"+ android:layout_marginStart="24dp"+ android:layout_marginTop="12dp"+ android:text="@string/dialog_filter_passes"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />+<TextViewandroid:id="@+id/pref_tv_hoursAhead"android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginStart="24dp"- android:layout_marginTop="8dp"+ android:layout_marginTop="12dp"android:layout_marginEnd="24dp"android:text="@string/pref_hours_ahead_summary"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />+ app:layout_constraintTop_toBottomOf="@+id/pref_tv_title" /><EditTextandroid:id="@+id/pref_et_hoursAhead"@@ -66,4 +75,5 @@app:layout_constraintEnd_toEndOf="@+id/pref_tv_minEl"app:layout_constraintStart_toStartOf="@+id/pref_tv_minEl"app:layout_constraintTop_toBottomOf="@+id/pref_tv_minEl" />+</androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/layout/dialog_sat_entry.xml b/app/src/main/res/layout/dialog_sat_entry.xmlindex c1737a8d..ffc93fb5 100644--- a/app/src/main/res/layout/dialog_sat_entry.xml+++ b/app/src/main/res/layout/dialog_sat_entry.xml@@ -26,25 +26,24 @@<TextViewandroid:id="@+id/dialog_title"+ style="@style/DialogText"android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginStart="8dp"android:layout_marginTop="8dp"- android:layout_marginEnd="8dp"android:text="@string/dialog_select_sat"- android:textSize="18sp"- app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/dialog_btn_positive"app:layout_constraintHorizontal_bias="0.0"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintStart_toStartOf="@+id/dialog_btn_neutral"app:layout_constraintTop_toTopOf="parent" /><SearchViewandroid:id="@+id/dialog_search"android:layout_width="0dp"android:layout_height="wrap_content"+ android:layout_marginStart="8dp"android:layout_marginTop="4dp"- app:layout_constraintEnd_toEndOf="@+id/dialog_title"- app:layout_constraintStart_toStartOf="@+id/dialog_title"+ android:layout_marginEnd="8dp"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toBottomOf="@+id/dialog_title" /><androidx.recyclerview.widget.RecyclerView@@ -54,13 +53,13 @@android:layout_marginTop="4dp"android:layout_marginBottom="8dp"app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative"- app:layout_constraintEnd_toEndOf="@+id/dialog_title"- app:layout_constraintStart_toStartOf="@+id/dialog_title"+ app:layout_constraintEnd_toEndOf="@+id/dialog_search"+ app:layout_constraintStart_toStartOf="@+id/dialog_search"app:layout_constraintTop_toBottomOf="@+id/dialog_search" /><TextViewandroid:id="@+id/dialog_btn_neutral"- style="@style/SatEntryDialogText"+ style="@style/DialogText"android:layout_marginStart="8dp"android:text="@string/btn_all_none"app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_negative"@@ -68,20 +67,20 @@<TextViewandroid:id="@+id/dialog_btn_negative"- style="@style/SatEntryDialogText"+ style="@style/DialogText"android:layout_marginEnd="24dp"- android:text="@string/btn_cancel"+ android:text="@android:string/cancel"app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive"app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" /><TextViewandroid:id="@+id/dialog_btn_positive"- style="@style/SatEntryDialogText"+ style="@style/DialogText"android:layout_width="36dp"android:layout_marginEnd="8dp"android:layout_marginBottom="8dp"android:gravity="end"- android:text="@string/btn_ok"+ android:text="@android:string/ok"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" />diff --git a/app/src/main/res/layout/dialog_tle_sources.xml b/app/src/main/res/layout/dialog_tle_sources.xmlindex 40791a9c..1b8ca885 100644--- a/app/src/main/res/layout/dialog_tle_sources.xml+++ b/app/src/main/res/layout/dialog_tle_sources.xml@@ -3,45 +3,44 @@xmlns:app="http://schemas.android.com/apk/res-auto"android:id="@+id/tleSourcesDialog"android:layout_width="match_parent"- android:layout_height="match_parent">+ android:layout_height="match_parent"+ android:layout_margin="4dp"><TextViewandroid:id="@+id/tleSourcesTitle"- android:layout_width="0dp"- android:layout_height="wrap_content"+ style="@style/DialogText"android:layout_marginStart="12dp"- android:layout_marginTop="12dp"- android:text="@string/manage_tle_sources"- android:textSize="18sp"+ android:layout_marginTop="10dp"+ android:text="@string/dialog_tle_sources"app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnAdd"- app:layout_constraintHorizontal_bias="0.51"+ app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="spread_inside"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent" /><ImageViewandroid:id="@+id/tleSourceBtnAdd"- android:layout_width="wrap_content"- android:layout_height="wrap_content"+ android:layout_width="36dp"+ android:layout_height="0dp"android:layout_marginStart="8dp"- android:layout_marginEnd="12dp"+ android:layout_marginEnd="10dp"android:contentDescription="@string/placeholder"- app:layout_constraintBottom_toBottomOf="@+id/tleSourcesTitle"+ app:layout_constraintBottom_toBottomOf="@+id/tleSourcesWarning"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toEndOf="@+id/tleSourcesTitle"app:layout_constraintTop_toTopOf="@+id/tleSourcesTitle"- app:srcCompat="@android:drawable/ic_menu_add" />+ app:srcCompat="@drawable/ic_add" /><androidx.recyclerview.widget.RecyclerViewandroid:id="@+id/tleSourcesRecycler"android:layout_width="0dp"android:layout_height="0dp"android:layout_marginStart="8dp"- android:layout_marginTop="4dp"+ android:layout_marginTop="8dp"android:layout_marginEnd="8dp"- android:layout_marginBottom="4dp"- app:layout_constraintBottom_toTopOf="@+id/tleSourcesWarning"+ android:layout_marginBottom="8dp"+ app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.5"app:layout_constraintStart_toStartOf="parent"@@ -52,33 +51,27 @@<TextViewandroid:id="@+id/tleSourcesWarning"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_marginBottom="8dp"+ style="@style/DialogText"+ android:layout_marginTop="4dp"android:gravity="center"- android:text="@string/please_make_sure_you_use_https_url_for_tle_source"- app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"- app:layout_constraintEnd_toEndOf="@+id/tleSourcesRecycler"- app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler" />+ android:text="@string/https_only"+ app:layout_constraintStart_toStartOf="@+id/tleSourcesTitle"+ app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" /><TextViewandroid:id="@+id/tleSourcesBtnNeg"- android:layout_width="wrap_content"- android:layout_height="wrap_content"+ style="@style/DialogText"android:layout_marginEnd="32dp"- android:text="@string/btn_cancel"- android:textSize="18sp"+ android:text="@android:string/cancel"app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"app:layout_constraintHorizontal_chainStyle="spread_inside" /><TextViewandroid:id="@+id/tleSourcesBtnPos"- android:layout_width="wrap_content"- android:layout_height="wrap_content"+ style="@style/DialogText"android:layout_marginBottom="8dp"- android:text="@string/btn_ok"- android:textSize="18sp"+ android:text="@android:string/ok"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />diff --git a/app/src/main/res/layout/dialog_tle_url.xml b/app/src/main/res/layout/dialog_tle_url.xmldeleted file mode 100644index 05ad3793..00000000--- a/app/src/main/res/layout/dialog_tle_url.xml+++ /dev/null@@ -1,51 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto"- android:id="@+id/dialogTle"- android:layout_width="match_parent"- android:layout_height="wrap_content">-- <TextView- android:id="@+id/dialogTleTitle"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_marginStart="16dp"- android:layout_marginTop="12dp"- android:text="@string/pref_tle_url_title"- app:layout_constraintStart_toStartOf="parent"- app:layout_constraintTop_toTopOf="parent" />-- <EditText- android:id="@+id/dialogTleInput"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:hint="@string/placeholder"- android:importantForAutofill="no"- android:inputType="textWebEditText"- app:layout_constraintEnd_toEndOf="@+id/dialogTlePos"- app:layout_constraintStart_toStartOf="@+id/dialogTleTitle"- app:layout_constraintTop_toBottomOf="@+id/dialogTleTitle" />-- <TextView- android:id="@+id/dialogTleNeg"- style="@style/SatEntryDialogText"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_marginEnd="24dp"- android:text="@string/btn_cancel"- app:layout_constraintBaseline_toBaselineOf="@+id/dialogTlePos"- app:layout_constraintEnd_toStartOf="@+id/dialogTlePos" />-- <TextView- android:id="@+id/dialogTlePos"- style="@style/SatEntryDialogText"- android:layout_width="36dp"- android:layout_marginEnd="16dp"- android:layout_marginBottom="12dp"- android:gravity="end"- android:text="@string/btn_ok"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintTop_toBottomOf="@+id/dialogTleInput" />--</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of filediff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xmlindex d8fdf3fe..8391f955 100644--- a/app/src/main/res/layout/drawer_header.xml+++ b/app/src/main/res/layout/drawer_header.xml@@ -117,7 +117,7 @@style="@style/DrawerHeader.Button"android:layout_width="0dp"android:drawableEnd="@drawable/ic_update_tle"- android:text="@string/update_tle"+ android:text="@string/update_tle_web"app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"app:layout_constraintEnd_toStartOf="@+id/guidelineRight"app:layout_constraintStart_toStartOf="@+id/guidelineLeft"diff --git a/app/src/main/res/layout/fragment_map_view.xml b/app/src/main/res/layout/fragment_map_view.xmlindex 71d582bf..b741447c 100644--- a/app/src/main/res/layout/fragment_map_view.xml+++ b/app/src/main/res/layout/fragment_map_view.xml@@ -68,7 +68,7 @@style="@style/MapText"android:layout_marginEnd="4dp"android:layout_marginBottom="4dp"- android:text="@string/pat_range"+ android:text="@string/pat_distance"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent" />diff --git a/app/src/main/res/layout/fragment_polar_view.xml b/app/src/main/res/layout/fragment_polar_view.xmlindex 1ba8465b..7c19bf64 100644--- a/app/src/main/res/layout/fragment_polar_view.xml+++ b/app/src/main/res/layout/fragment_polar_view.xml@@ -61,7 +61,7 @@android:id="@+id/tv_polar_rng"style="@style/PolarViewText"android:layout_marginEnd="4dp"- android:text="@string/pat_range"+ android:text="@string/pat_distance"app:layout_constraintBottom_toBottomOf="@+id/frame_polar"app:layout_constraintEnd_toEndOf="@+id/frame_polar" />diff --git a/app/src/main/res/layout/item_tle_source.xml b/app/src/main/res/layout/item_tle_source.xmlindex 4835a8bd..c99d67cc 100644--- a/app/src/main/res/layout/item_tle_source.xml+++ b/app/src/main/res/layout/item_tle_source.xml@@ -12,7 +12,6 @@android:layout_height="wrap_content"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnDel"- app:layout_constraintHorizontal_bias="0.5"app:layout_constraintHorizontal_chainStyle="packed"app:layout_constraintStart_toStartOf="parent"app:layout_constraintTop_toTopOf="parent">diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 05f8630c..94b64bf5 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -25,7 +25,9 @@<string name="update_loc">Обновить геопозицию</string><string name="update_loc_success">Геопозиция обновлена</string>- <string name="update_tle">Обновить файл TLE</string>+ <string name="update_loc_failure">Проверьте настройки GPS</string>+ <string name="update_tle_file">Обновить TLE из файла</string>+ <string name="update_tle_web">Обновить TLE по ссылке</string><string name="update_tle_success">Файл TLE обновлен</string><string name="update_trans">Обновить трансиверы</string><string name="update_trans_success">База трансиверов обновлена</string>@@ -40,6 +42,7 @@<string name="dialog_select_sat">Выберите спутники для слежения</string><string name="dialog_show_track">Показать трассу орбиты для</string><string name="dialog_filter_passes">Фильтровать пролеты</string>+ <string name="dialog_tle_sources">Управление источниками TLE</string><string name="pref_hours_ahead_hint">Количество часов</string><string name="pref_hours_ahead_summary">Показать пролеты за след. Х часов</string>@@ -58,6 +61,7 @@<string name="pref_other_title">Другие настройки</string><string name="pref_refresh_rate_title">Частота обновления, мс</string><string name="pref_refresh_rate_input_error">Введите значение между 250мс и 10000мс</string>+ <string name="pref_compass_title">Используйте компас при отображении полярных координат</string><string name="no_mode">Модуляция: нет</string><string name="no_uplink">Восход.: нет</string>@@ -65,24 +69,19 @@<string name="no_trans">Не найдены трансиверы для этого спутника</string><string name="err_no_permissions">Отсутствуют необходимые разрешения</string>- <string name="err_sat_wont_pass">Некоторые спутники не пролетят над заданной точкой</string>- <string name="err_parse_tle">Ошибка обработки TLE</string>- <string name="err_update_tle">Пожалуйста, обновите ваш файл TLE</string><string name="err_enter_value">Пожалуйста, введите значение</string>- <string name="err_no_tle_file">Не найден файл TLE</string>- <string name="err_no_selection_file">Не найден файл выбранных спутников</string><string name="err_no_sat_selected">Не выбраны спутники</string><string name="pass_aos_az">НПС — %2d°</string>- <string name="pass_maxEl">Элевация: %.1f°</string>+ <string name="pass_maxEl">Элев.: %.1f°</string><string name="pass_los_az">%2d° — КПС</string>- <string name="pat_azimuth">Азимут: %.1f°</string>- <string name="pat_elevation">Элевация: %.1f°</string>- <string name="pat_latitude">Широта: %.1f°</string>- <string name="pat_longitude">Долгота: %.1f°</string>- <string name="pat_range">Дист.: %.0f км</string>- <string name="pat_altitude">Высота: %.0f км</string>+ <string name="pat_azimuth">Аз.: %.1f°</string>+ <string name="pat_elevation">Элев.: %.1f°</string>+ <string name="pat_latitude">Шир.: %.1f°</string>+ <string name="pat_longitude">Дол.: %.1f°</string>+ <string name="pat_distance">Дист.: %.0f км</string>+ <string name="pat_altitude">Выс.: %.0f км</string><string name="trans_mode">Модуляция: %s</string><string name="trans_inverted">Инверсия: %s</string>@@ -133,14 +132,8 @@в лицензии <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_all_none">Все/Нет</string>-<string name="map_gsp">СТЦ</string>- <string name="update_loc_failure">Проверьте ваши настройки GPS</string>- <string name="manage_tle_sources">Manage TLE sources</string>- <string name="tle_source">TLE source</string>+ <string name="btn_all_none">Все/Нет</string>+ <string name="tle_source">Источник TLE</string>+ <string name="https_only">Пожалуйста, используйте протокол HTTPS</string></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex aba03515..a9d1db13 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -26,14 +26,13 @@<string name="drawer_lon_text">Longitude: </string><string name="update_loc">Update location</string>- <string name="update_loc_success">Location was updated</string>+ <string name="update_loc_success">Location updated</string><string name="update_loc_failure">Check your Location settings</string>- <string name="update_tle_file" translatable="false">Import TLE from file</string>- <string name="update_tle_file_success" translatable="false">TLE was updated</string>- <string name="update_tle">Import TLE from WEB</string>+ <string name="update_tle_file">Import TLE from file</string>+ <string name="update_tle_web">Import TLE from web</string><string name="update_tle_success">TLE was updated</string><string name="update_trans">Update transceivers</string>- <string name="update_trans_success">Transceivers database was updated</string>+ <string name="update_trans_success">Transceivers DB updated</string><string name="update_failure">Check your internet connection</string><string name="goto_github" translatable="false">GitHub</string><string name="exit_app">Exit</string>@@ -47,6 +46,7 @@<string name="dialog_select_sat">Select satellites to track</string><string name="dialog_show_track">Show ground track for</string><string name="dialog_filter_passes">Filter passes</string>+ <string name="dialog_tle_sources">Manage TLE sources</string><string name="pref_hours_ahead_key" translatable="false">hoursAhead</string><string name="pref_hours_ahead_hint">Hours ahead</string>@@ -69,24 +69,18 @@<string name="pref_alt_input_error">Set the value between -413m and 8850m</string><string name="pref_other_title">Other</string><string name="pref_refresh_rate_key" translatable="false">rate</string>- <string name="pref_refresh_rate_title">View refresh rate, ms</string>+ <string name="pref_refresh_rate_title">Refresh rate, ms</string><string name="pref_refresh_rate_input_error">Set the value between 250ms and 10000ms</string><string name="pref_compass_key" translatable="false">compass</string>- <string name="pref_compass_title" translatable="false">Use sensors to rotate PolarView</string>- <string name="pref_tle_url_title" translatable="false">Please, enter the HTTPS URL:</string>+ <string name="pref_compass_title">Use sensors to rotate PolarView</string>- <string name="no_mode">Mode: Null</string>- <string name="no_uplink">Uplink: Null</string>- <string name="no_downlink">Downlink: Null</string>- <string name="no_trans">No transceivers found for this Satellite</string>+ <string name="no_mode">Mode: null</string>+ <string name="no_uplink">Uplink: null</string>+ <string name="no_downlink">Downlink: null</string>+ <string name="no_trans">No transceivers found for this satellite</string><string name="err_no_permissions">Missing permissions</string>- <string name="err_sat_wont_pass">Certain satellites shall not pass</string>- <string name="err_parse_tle">Error parsing TLE entry</string>- <string name="err_update_tle">Please, update your TLE file</string><string name="err_enter_value">Please, enter the value</string>- <string name="err_no_tle_file">TLE file was not found</string>- <string name="err_no_selection_file">Selection file was not found</string><string name="err_no_sat_selected">No satellites selected</string><string name="pass_satName" translatable="false">%s</string>@@ -101,7 +95,7 @@<string name="pat_elevation">El: %.1f°</string><string name="pat_latitude">Lat: %.1f°</string><string name="pat_longitude">Lon: %.1f°</string>- <string name="pat_range">Dst: %.0f km</string>+ <string name="pat_distance">Dst: %.0f km</string><string name="pat_altitude">Alt: %.0f km</string><string name="pat_timer" translatable="false">%02d:%02d:%02d</string>@@ -158,15 +152,9 @@<a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.</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_all_none">All/None</string>-<string name="map_gsp">GSP</string>- <string name="placeholder" translatable="false">Placeholder</string>- <string name="manage_tle_sources">Manage TLE sources</string>- <string name="please_make_sure_you_use_https_url_for_tle_source" translatable="false">Please use HTTPS URLs only</string>+ <string name="btn_all_none">All/None</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></resources>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex 341deaf2..f289e650 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -126,11 +126,11 @@<item name="android:paddingBottom">2dp</item></style>- <style name="SatEntryDialogText">+ <style name="DialogText"><item name="android:layout_width">wrap_content</item><item name="android:layout_height">wrap_content</item><item name="android:textColor">@color/themeAccent</item>- <item name="android:textSize">18sp</item>+ <item name="android:textSize">17sp</item></style><style name="AboutTitle">