Cleaned up strings and styles

This commit is contained in:
Arty Bishop committed 2020-05-27 11:30:46 +01:00
1 parent 389edcb33a
commit 8f34c6d6b9
17 files changed
+101 -160

No files matched your search

@@ -100,12 +100,12 @@ class TransmitterAdapter : RecyclerView.Adapter<TransmitterAdapter.TransmitterHo
if (transmitter.isInverted) { if (transmitter.isInverted) {
binding.transInverted.text = String.format( binding.transInverted.text = String.format(
context.getString(R.string.trans_inverted), context.getString(R.string.trans_inverted),
context.getString(R.string.btn_yes) context.getString(android.R.string.yes)
) )
} else { } else {
binding.transInverted.text = String.format( binding.transInverted.text = String.format(
context.getString(R.string.trans_inverted), context.getString(R.string.trans_inverted),
context.getString(R.string.btn_no) context.getString(android.R.string.no)
) )
} }
} }
@@ -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.tvMapLat.text = String.format(mainActivity.getString(R.string.pat_latitude), lat)
binding.tvMapLon.text = String.format(mainActivity.getString(R.string.pat_longitude), lon) 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)
} }
} }
@@ -140,8 +140,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {
etMinEl.setText(minEl.toString()) etMinEl.setText(minEl.toString())
AlertDialog.Builder(mainActivity).apply { AlertDialog.Builder(mainActivity).apply {
setTitle(getString(R.string.dialog_filter_passes)) setPositiveButton(getString(android.R.string.ok)) { _, _ ->
setPositiveButton(getString(R.string.btn_ok)) { _, _ ->
val hoursStr = etHoursAhead.text.toString() val hoursStr = etHoursAhead.text.toString()
val elevationStr = etMinEl.text.toString() val elevationStr = etMinEl.text.toString()
if (hoursStr.isNotEmpty() && elevationStr.isNotEmpty()) { if (hoursStr.isNotEmpty() && elevationStr.isNotEmpty()) {
@@ -174,7 +173,7 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {
).show() ).show()
} }
setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ -> setNegativeButton(getString(android.R.string.cancel)) { dialog, _ ->
dialog.cancel() dialog.cancel()
} }
setView(satPassPrefView) setView(satPassPrefView)
@@ -168,7 +168,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLis
val satPos = satPass.predictor.getSatPos(Date()) val satPos = satPass.predictor.getSatPos(Date())
val polarAz = mainActivity.getString(R.string.pat_azimuth) val polarAz = mainActivity.getString(R.string.pat_azimuth)
val polarEl = mainActivity.getString(R.string.pat_elevation) 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) val polarAlt = mainActivity.getString(R.string.pat_altitude)
binding.tvPolarAz.text = String.format(polarAz, GeneralUtils.rad2Deg(satPos.azimuth)) binding.tvPolarAz.text = String.format(polarAz, GeneralUtils.rad2Deg(satPos.azimuth))
binding.tvPolarEl.text = String.format(polarEl, GeneralUtils.rad2Deg(satPos.elevation)) binding.tvPolarEl.text = String.format(polarEl, GeneralUtils.rad2Deg(satPos.elevation))
@@ -22,6 +22,7 @@ package com.rtbishop.look4sat.ui.fragments
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.view.ViewGroup import android.view.ViewGroup
import android.view.Window
import androidx.appcompat.app.AppCompatDialogFragment import androidx.appcompat.app.AppCompatDialogFragment
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.rtbishop.look4sat.data.TleSource import com.rtbishop.look4sat.data.TleSource
@@ -38,6 +39,7 @@ class TleSourcesDialogFragment(sources: List<TleSource>) :
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = DialogTleSourcesBinding.inflate(requireActivity().layoutInflater) val binding = DialogTleSourcesBinding.inflate(requireActivity().layoutInflater)
val tleSourcesDialog = Dialog(requireActivity()).apply { val tleSourcesDialog = Dialog(requireActivity()).apply {
window?.requestFeature(Window.FEATURE_NO_TITLE)
setContentView(binding.root) setContentView(binding.root)
window?.setLayout( window?.setLayout(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
+9
View File
@@ -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>
+12 -2
View File
@@ -23,17 +23,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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" />
<TextView <TextView
android:id="@+id/pref_tv_hoursAhead" android:id="@+id/pref_tv_hoursAhead"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="8dp" android:layout_marginTop="12dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/pref_hours_ahead_summary" android:text="@string/pref_hours_ahead_summary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/pref_tv_title" />
<EditText <EditText
android:id="@+id/pref_et_hoursAhead" android:id="@+id/pref_et_hoursAhead"
@@ -66,4 +75,5 @@
app:layout_constraintEnd_toEndOf="@+id/pref_tv_minEl" app:layout_constraintEnd_toEndOf="@+id/pref_tv_minEl"
app:layout_constraintStart_toStartOf="@+id/pref_tv_minEl" app:layout_constraintStart_toStartOf="@+id/pref_tv_minEl"
app:layout_constraintTop_toBottomOf="@+id/pref_tv_minEl" /> app:layout_constraintTop_toBottomOf="@+id/pref_tv_minEl" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
+14 -15
View File
@@ -26,25 +26,24 @@
<TextView <TextView
android:id="@+id/dialog_title" android:id="@+id/dialog_title"
style="@style/DialogText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/dialog_select_sat" android:text="@string/dialog_select_sat"
android:textSize="18sp" app:layout_constraintEnd_toEndOf="@+id/dialog_btn_positive"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/dialog_btn_neutral"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<SearchView <SearchView
android:id="@+id/dialog_search" android:id="@+id/dialog_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
app:layout_constraintEnd_toEndOf="@+id/dialog_title" android:layout_marginEnd="8dp"
app:layout_constraintStart_toStartOf="@+id/dialog_title" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_title" /> app:layout_constraintTop_toBottomOf="@+id/dialog_title" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@@ -54,13 +53,13 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative" app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative"
app:layout_constraintEnd_toEndOf="@+id/dialog_title" app:layout_constraintEnd_toEndOf="@+id/dialog_search"
app:layout_constraintStart_toStartOf="@+id/dialog_title" app:layout_constraintStart_toStartOf="@+id/dialog_search"
app:layout_constraintTop_toBottomOf="@+id/dialog_search" /> app:layout_constraintTop_toBottomOf="@+id/dialog_search" />
<TextView <TextView
android:id="@+id/dialog_btn_neutral" android:id="@+id/dialog_btn_neutral"
style="@style/SatEntryDialogText" style="@style/DialogText"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:text="@string/btn_all_none" android:text="@string/btn_all_none"
app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_negative" app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_negative"
@@ -68,20 +67,20 @@
<TextView <TextView
android:id="@+id/dialog_btn_negative" android:id="@+id/dialog_btn_negative"
style="@style/SatEntryDialogText" style="@style/DialogText"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/btn_cancel" android:text="@android:string/cancel"
app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive" app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive"
app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" /> app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" />
<TextView <TextView
android:id="@+id/dialog_btn_positive" android:id="@+id/dialog_btn_positive"
style="@style/SatEntryDialogText" style="@style/DialogText"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:gravity="end" android:gravity="end"
android:text="@string/btn_ok" android:text="@android:string/ok"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" /> app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" />
+23 -30
View File
@@ -3,45 +3,44 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tleSourcesDialog" android:id="@+id/tleSourcesDialog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_margin="4dp">
<TextView <TextView
android:id="@+id/tleSourcesTitle" android:id="@+id/tleSourcesTitle"
android:layout_width="0dp" style="@style/DialogText"
android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="10dp"
android:text="@string/manage_tle_sources" android:text="@string/dialog_tle_sources"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnAdd" 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_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/tleSourceBtnAdd" android:id="@+id/tleSourceBtnAdd"
android:layout_width="wrap_content" android:layout_width="36dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="10dp"
android:contentDescription="@string/placeholder" android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/tleSourcesTitle" app:layout_constraintBottom_toBottomOf="@+id/tleSourcesWarning"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/tleSourcesTitle" app:layout_constraintStart_toEndOf="@+id/tleSourcesTitle"
app:layout_constraintTop_toTopOf="@+id/tleSourcesTitle" app:layout_constraintTop_toTopOf="@+id/tleSourcesTitle"
app:srcCompat="@android:drawable/ic_menu_add" /> app:srcCompat="@drawable/ic_add" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/tleSourcesRecycler" android:id="@+id/tleSourcesRecycler"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesWarning" app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -52,33 +51,27 @@
<TextView <TextView
android:id="@+id/tleSourcesWarning" android:id="@+id/tleSourcesWarning"
android:layout_width="0dp" style="@style/DialogText"
android:layout_height="wrap_content" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:gravity="center" android:gravity="center"
android:text="@string/please_make_sure_you_use_https_url_for_tle_source" android:text="@string/https_only"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos" app:layout_constraintStart_toStartOf="@+id/tleSourcesTitle"
app:layout_constraintEnd_toEndOf="@+id/tleSourcesRecycler" app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" />
app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler" />
<TextView <TextView
android:id="@+id/tleSourcesBtnNeg" android:id="@+id/tleSourcesBtnNeg"
android:layout_width="wrap_content" style="@style/DialogText"
android:layout_height="wrap_content"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:text="@string/btn_cancel" android:text="@android:string/cancel"
android:textSize="18sp"
app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos" app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos" app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"
app:layout_constraintHorizontal_chainStyle="spread_inside" /> app:layout_constraintHorizontal_chainStyle="spread_inside" />
<TextView <TextView
android:id="@+id/tleSourcesBtnPos" android:id="@+id/tleSourcesBtnPos"
android:layout_width="wrap_content" style="@style/DialogText"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/btn_ok" android:text="@android:string/ok"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" /> app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />
@@ -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>
+1 -1
View File
@@ -117,7 +117,7 @@
style="@style/DrawerHeader.Button" style="@style/DrawerHeader.Button"
android:layout_width="0dp" android:layout_width="0dp"
android:drawableEnd="@drawable/ic_update_tle" 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_constraintBottom_toTopOf="@+id/drawer_btn_trans"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight" app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft" app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -68,7 +68,7 @@
style="@style/MapText" style="@style/MapText"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:text="@string/pat_range" android:text="@string/pat_distance"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
@@ -61,7 +61,7 @@
android:id="@+id/tv_polar_rng" android:id="@+id/tv_polar_rng"
style="@style/PolarViewText" style="@style/PolarViewText"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:text="@string/pat_range" android:text="@string/pat_distance"
app:layout_constraintBottom_toBottomOf="@+id/frame_polar" app:layout_constraintBottom_toBottomOf="@+id/frame_polar"
app:layout_constraintEnd_toEndOf="@+id/frame_polar" /> app:layout_constraintEnd_toEndOf="@+id/frame_polar" />
@@ -12,7 +12,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnDel" app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnDel"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
+15 -22
View File
@@ -25,7 +25,9 @@
<string name="update_loc">Обновить геопозицию</string> <string name="update_loc">Обновить геопозицию</string>
<string name="update_loc_success">Геопозиция обновлена</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_tle_success">Файл TLE обновлен</string>
<string name="update_trans">Обновить трансиверы</string> <string name="update_trans">Обновить трансиверы</string>
<string name="update_trans_success">База трансиверов обновлена</string> <string name="update_trans_success">База трансиверов обновлена</string>
@@ -40,6 +42,7 @@
<string name="dialog_select_sat">Выберите спутники для слежения</string> <string name="dialog_select_sat">Выберите спутники для слежения</string>
<string name="dialog_show_track">Показать трассу орбиты для</string> <string name="dialog_show_track">Показать трассу орбиты для</string>
<string name="dialog_filter_passes">Фильтровать пролеты</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_hint">Количество часов</string>
<string name="pref_hours_ahead_summary">Показать пролеты за след. Х часов</string> <string name="pref_hours_ahead_summary">Показать пролеты за след. Х часов</string>
@@ -58,6 +61,7 @@
<string name="pref_other_title">Другие настройки</string> <string name="pref_other_title">Другие настройки</string>
<string name="pref_refresh_rate_title">Частота обновления, мс</string> <string name="pref_refresh_rate_title">Частота обновления, мс</string>
<string name="pref_refresh_rate_input_error">Введите значение между 250мс и 10000мс</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_mode">Модуляция: нет</string>
<string name="no_uplink">Восход.: нет</string> <string name="no_uplink">Восход.: нет</string>
@@ -65,24 +69,19 @@
<string name="no_trans">Не найдены трансиверы для этого спутника</string> <string name="no_trans">Не найдены трансиверы для этого спутника</string>
<string name="err_no_permissions">Отсутствуют необходимые разрешения</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_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="err_no_sat_selected">Не выбраны спутники</string>
<string name="pass_aos_az">НПС — %2d°</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="pass_los_az">%2d° — КПС</string>
<string name="pat_azimuth">Азимут: %.1f°</string> <string name="pat_azimuth">Аз.: %.1f°</string>
<string name="pat_elevation">Элевация: %.1f°</string> <string name="pat_elevation">Элев.: %.1f°</string>
<string name="pat_latitude">Широта: %.1f°</string> <string name="pat_latitude">Шир.: %.1f°</string>
<string name="pat_longitude">Долгота: %.1f°</string> <string name="pat_longitude">Дол.: %.1f°</string>
<string name="pat_range">Дист.: %.0f км</string> <string name="pat_distance">Дист.: %.0f км</string>
<string name="pat_altitude">Высота: %.0f км</string> <string name="pat_altitude">Выс.: %.0f км</string>
<string name="trans_mode">Модуляция: %s</string> <string name="trans_mode">Модуляция: %s</string>
<string name="trans_inverted">Инверсия: %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>. в лицензии <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>.
</string> </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="map_gsp">СТЦ</string>
<string name="update_loc_failure">Проверьте ваши настройки GPS</string> <string name="btn_all_none">Все/Нет</string>
<string name="manage_tle_sources">Manage TLE sources</string> <string name="tle_source">Источник TLE</string>
<string name="tle_source">TLE source</string> <string name="https_only">Пожалуйста, используйте протокол HTTPS</string>
</resources> </resources>
+15 -27
View File
@@ -26,14 +26,13 @@
<string name="drawer_lon_text">Longitude: </string> <string name="drawer_lon_text">Longitude: </string>
<string name="update_loc">Update location</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_loc_failure">Check your Location settings</string>
<string name="update_tle_file" translatable="false">Import TLE from file</string> <string name="update_tle_file">Import TLE from file</string>
<string name="update_tle_file_success" translatable="false">TLE was updated</string> <string name="update_tle_web">Import TLE from web</string>
<string name="update_tle">Import TLE from WEB</string>
<string name="update_tle_success">TLE was updated</string> <string name="update_tle_success">TLE was updated</string>
<string name="update_trans">Update transceivers</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="update_failure">Check your internet connection</string>
<string name="goto_github" translatable="false">GitHub</string> <string name="goto_github" translatable="false">GitHub</string>
<string name="exit_app">Exit</string> <string name="exit_app">Exit</string>
@@ -47,6 +46,7 @@
<string name="dialog_select_sat">Select satellites to track</string> <string name="dialog_select_sat">Select satellites to track</string>
<string name="dialog_show_track">Show ground track for</string> <string name="dialog_show_track">Show ground track for</string>
<string name="dialog_filter_passes">Filter passes</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_key" translatable="false">hoursAhead</string>
<string name="pref_hours_ahead_hint">Hours ahead</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_alt_input_error">Set the value between -413m and 8850m</string>
<string name="pref_other_title">Other</string> <string name="pref_other_title">Other</string>
<string name="pref_refresh_rate_key" translatable="false">rate</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_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_key" translatable="false">compass</string>
<string name="pref_compass_title" translatable="false">Use sensors to rotate PolarView</string> <string name="pref_compass_title">Use sensors to rotate PolarView</string>
<string name="pref_tle_url_title" translatable="false">Please, enter the HTTPS URL:</string>
<string name="no_mode">Mode: Null</string> <string name="no_mode">Mode: null</string>
<string name="no_uplink">Uplink: Null</string> <string name="no_uplink">Uplink: null</string>
<string name="no_downlink">Downlink: Null</string> <string name="no_downlink">Downlink: null</string>
<string name="no_trans">No transceivers found for this Satellite</string> <string name="no_trans">No transceivers found for this satellite</string>
<string name="err_no_permissions">Missing permissions</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_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="err_no_sat_selected">No satellites selected</string>
<string name="pass_satName" translatable="false">%s</string> <string name="pass_satName" translatable="false">%s</string>
@@ -101,7 +95,7 @@
<string name="pat_elevation">El: %.1f°</string> <string name="pat_elevation">El: %.1f°</string>
<string name="pat_latitude">Lat: %.1f°</string> <string name="pat_latitude">Lat: %.1f°</string>
<string name="pat_longitude">Lon: %.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_altitude">Alt: %.0f km</string>
<string name="pat_timer" translatable="false">%02d:%02d:%02d</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. <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a> for details.
</string> </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="map_gsp">GSP</string>
<string name="placeholder" translatable="false">Placeholder</string> <string name="btn_all_none">All/None</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="tle_source">TLE source</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> </resources>
+2 -2
View File
@@ -126,11 +126,11 @@
<item name="android:paddingBottom">2dp</item> <item name="android:paddingBottom">2dp</item>
</style> </style>
<style name="SatEntryDialogText"> <style name="DialogText">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeAccent</item> <item name="android:textColor">@color/themeAccent</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">17sp</item>
</style> </style>
<style name="AboutTitle"> <style name="AboutTitle">