From 753ddee7dfdf7ccbc467c6ca865ac30d3a82e604 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sun, 23 Feb 2020 17:26:03 +0000
Subject: [PATCH] Added sat entry item and dialog layouts, minor string fixes

---
 .../rtbishop/look4sat/ui/MapViewFragment.kt   |  2 +-
 app/src/main/res/layout/dialog_sat_entry.xml  | 69 +++++++++++++++++++
 app/src/main/res/layout/sat_entry_item.xml    |  8 +++
 app/src/main/res/values-ru/strings.xml        | 25 ++++---
 app/src/main/res/values/strings.xml           |  9 ++-
 app/src/main/res/values/styles.xml            |  7 ++
 6 files changed, 101 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_sat_entry.xml
 create mode 100644 app/src/main/res/layout/sat_entry_item.xml

diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
index 8dc93fc2..3d6e6572 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
@@ -116,7 +116,7 @@ class MapViewFragment : Fragment() {
             mapFab.setOnClickListener {
                 Toast.makeText(
                     mainActivity,
-                    getString(R.string.no_selected_sat),
+                    getString(R.string.err_no_sat_selected),
                     Toast.LENGTH_SHORT
                 ).show()
             }
diff --git a/app/src/main/res/layout/dialog_sat_entry.xml b/app/src/main/res/layout/dialog_sat_entry.xml
new file mode 100644
index 00000000..08b98117
--- /dev/null
+++ b/app/src/main/res/layout/dialog_sat_entry.xml
@@ -0,0 +1,69 @@
+<?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/dialog_sat_entry_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="4dp">
+
+    <TextView
+        android:id="@+id/dialog_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:text="@string/dialog_select_sat"
+        android:textSize="21sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <SearchView
+        android:id="@+id/dialog_search"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dialog_title" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/dialog_recycler"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dialog_search" />
+
+    <TextView
+        android:id="@+id/dialog_btn_neutral"
+        style="@style/SatEntryDialogText"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="4dp"
+        android:text="@string/btn_all_none"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/dialog_btn_negative"
+        style="@style/SatEntryDialogText"
+        android:layout_marginEnd="24dp"
+        android:text="@string/btn_cancel"
+        app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive"
+        app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" />
+
+    <TextView
+        android:id="@+id/dialog_btn_positive"
+        style="@style/SatEntryDialogText"
+        android:layout_width="36dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="end"
+        android:text="@string/btn_ok"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sat_entry_item.xml b/app/src/main/res/layout/sat_entry_item.xml
new file mode 100644
index 00000000..8dc33d4c
--- /dev/null
+++ b/app/src/main/res/layout/sat_entry_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sat_entry_item"
+    android:layout_width="match_parent"
+    android:layout_height="36dp"
+    android:text="@string/placeholder"
+    android:textColor="@color/themeLight"
+    android:textSize="17sp" />
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5b949664..93ea51a6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -37,9 +37,9 @@
     <string name="menu_settings">Настройки</string>
     <string name="menu_about">О приложении</string>
 
-    <string name="dialog_select_sat">Выберите спутники для слежения…</string>
-    <string name="dialog_show_track">Показать трассу орбиты для…</string>
-    <string name="dialog_filter_passes">Фильтровать пролеты…</string>
+    <string name="dialog_select_sat">Выберите спутники для слежения</string>
+    <string name="dialog_show_track">Показать трассу орбиты для</string>
+    <string name="dialog_filter_passes">Фильтровать пролеты</string>
 
     <string name="pref_hours_ahead_hint">Количество часов</string>
     <string name="pref_hours_ahead_summary">Показать пролеты за след. Х часов</string>
@@ -60,9 +60,8 @@
     <string name="pref_refresh_rate_input_error">Введите значение между 250мс и 10000мс</string>
 
     <string name="no_mode">Модуляция: нет</string>
-    <string name="no_uplink">Восходящая: нет</string>
-    <string name="no_downlink">Нисходящая: нет</string>
-    <string name="no_selected_sat">Не выбраны спутники</string>
+    <string name="no_uplink">Восход.: нет</string>
+    <string name="no_downlink">Нисход.: нет</string>
     <string name="no_trans">Не найдены трансиверы для этого спутника</string>
 
     <string name="err_no_permissions">Отсутствуют необходимые разрешения</string>
@@ -92,17 +91,17 @@
 
     <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">Восход.: %.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="info_swipe_text">Проведите по экрану вниз, чтобы обновить список пролетов
         для выбранных спутников</string>
     <string name="info_main_text">Приложение Look4Sat использует набор двухстрочных элементов TLE
         для вычисления траекторий движения и текущего местоположения спутников. Вы можете обновить
         файл TLE при помощи кнопки в главном меню.</string>
-    <string name="info_select_text">Нажмите эту кнопку, чтобы выбрать спутники для слежения</string>
+    <string name="info_select_text">Нажмите эту кнопку, чтобы выбрать спутники</string>
 
     <string name="about_subtitle">Приложение для слежения за спутниками радио и погоды
         для платформы Android</string>
@@ -137,9 +136,9 @@
 
     <string name="btn_yes">Да</string>
     <string name="btn_no">Нет</string>
-    <string name="btn_ok">Ок</string>
+    <string name="btn_ok">OK</string>
     <string name="btn_cancel">Отмена</string>
-    <string name="btn_clear">Очистить</string>
+    <string name="btn_all_none">Все/Нет</string>
 
     <string name="map_gsp">СТЦ</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1537bc0..a10cdd04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,9 +41,9 @@
     <string name="menu_settings">Settings</string>
     <string name="menu_about">About the App</string>
 
-    <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_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="pref_hours_ahead_key" translatable="false">hoursAhead</string>
     <string name="pref_hours_ahead_hint">Hours ahead</string>
@@ -72,7 +72,6 @@
     <string name="no_mode">Mode: Null</string>
     <string name="no_uplink">Uplink: Null</string>
     <string name="no_downlink">Downlink: Null</string>
-    <string name="no_selected_sat">No satellites were selected</string>
     <string name="no_trans">No transceivers found for this Satellite</string>
 
     <string name="err_no_permissions">Missing permissions</string>
@@ -158,7 +157,7 @@
     <string name="btn_no">No</string>
     <string name="btn_ok">OK</string>
     <string name="btn_cancel">Cancel</string>
-    <string name="btn_clear">Clear All</string>
+    <string name="btn_all_none">All/None</string>
 
     <string name="map_gsp">GSP</string>
     <string name="placeholder" translatable="false">Placeholder</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0df556cf..2e6cbe5e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -126,6 +126,13 @@
         <item name="android:paddingBottom">2dp</item>
     </style>
 
+    <style name="SatEntryDialogText">
+        <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>
+    </style>
+
     <style name="AboutTitle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>