From 3cd8516d88f5893c011362afc482d050e7c0ff35 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 26 Sep 2020 19:52:59 +0100
Subject: [PATCH] Added main timer font. Changes to layouts and resources.

---
 .../res/drawable/ic_launcher_background.xml   |   2 +-
 .../{ic_menu_sat.xml => ic_menu_entries.xml}  |   0
 .../{ic_world.xml => ic_menu_map.xml}         |   0
 .../{ic_settings.xml => ic_menu_prefs.xml}    |   0
 app/src/main/res/font/digital_dismay.otf      | Bin 0 -> 13928 bytes
 app/src/main/res/layout/fragment_about.xml    |   2 +-
 app/src/main/res/layout/fragment_entries.xml  |  29 ++++--
 app/src/main/res/layout/fragment_passes.xml   |  90 +++++++++++-------
 app/src/main/res/layout/item_pass_geo.xml     |   3 +-
 app/src/main/res/layout/item_pass_leo.xml     |   3 +-
 app/src/main/res/menu/nav_menu.xml            |  16 ++--
 app/src/main/res/values-ru/strings.xml        |  36 +------
 app/src/main/res/values/strings.xml           |  44 ++-------
 13 files changed, 97 insertions(+), 128 deletions(-)
 rename app/src/main/res/drawable/{ic_menu_sat.xml => ic_menu_entries.xml} (100%)
 rename app/src/main/res/drawable/{ic_world.xml => ic_menu_map.xml} (100%)
 rename app/src/main/res/drawable/{ic_settings.xml => ic_menu_prefs.xml} (100%)
 create mode 100644 app/src/main/res/font/digital_dismay.otf

diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 2509af5f..79558f54 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -21,7 +21,7 @@
     android:shape="rectangle">
     <gradient
         android:angle="270"
-        android:endColor="#181818"
+        android:endColor="@color/themeButton"
         android:startColor="@color/backgroundDark"
         android:type="linear" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_menu_sat.xml b/app/src/main/res/drawable/ic_menu_entries.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_menu_sat.xml
rename to app/src/main/res/drawable/ic_menu_entries.xml
diff --git a/app/src/main/res/drawable/ic_world.xml b/app/src/main/res/drawable/ic_menu_map.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_world.xml
rename to app/src/main/res/drawable/ic_menu_map.xml
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_menu_prefs.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings.xml
rename to app/src/main/res/drawable/ic_menu_prefs.xml
diff --git a/app/src/main/res/font/digital_dismay.otf b/app/src/main/res/font/digital_dismay.otf
new file mode 100644
index 0000000000000000000000000000000000000000..af43ceba769a8d8182de585f2ecd17dcb02df010
GIT binary patch
literal 13928
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 1821936b..82da2f81 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -48,7 +48,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="4dp"
             android:contentDescription="@string/placeholder"
-            android:src="@drawable/ic_menu_sat"
+            android:src="@drawable/ic_menu_entries"
             app:layout_constraintEnd_toStartOf="@+id/title"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintHorizontal_chainStyle="packed"
diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xml
index 4b7799a8..b8ffa042 100644
--- a/app/src/main/res/layout/fragment_entries.xml
+++ b/app/src/main/res/layout/fragment_entries.xml
@@ -26,6 +26,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <View
+            android:id="@+id/entries_bar"
+            android:layout_width="0dp"
+            android:layout_height="96dp"
+            android:background="@color/themeDark"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/import_msg"
             android:layout_width="wrap_content"
@@ -42,7 +51,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginEnd="4dp"
-            android:backgroundTint="@color/themeDark"
+            android:backgroundTint="@color/backgroundDark"
             android:contentDescription="@string/placeholder"
             android:src="@drawable/ic_update_web"
             app:layout_constraintBottom_toBottomOf="@+id/import_file"
@@ -54,7 +63,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginEnd="8dp"
-            android:backgroundTint="@color/themeDark"
+            android:backgroundTint="@color/backgroundDark"
             android:contentDescription="@string/placeholder"
             android:src="@drawable/ic_update_file"
             app:layout_constraintEnd_toEndOf="parent"
@@ -63,19 +72,18 @@
         <SearchView
             android:id="@+id/search_bar"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:iconifiedByDefault="false"
             android:queryHint="@string/dialog_entries_hint"
-            app:layout_constraintBottom_toBottomOf="@+id/select_all"
+            app:layout_constraintBottom_toBottomOf="@+id/entries_bar"
             app:layout_constraintEnd_toStartOf="@+id/select_all"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/select_all" />
+            app:layout_constraintStart_toStartOf="parent" />
 
         <ImageButton
             android:id="@+id/select_all"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:backgroundTint="@color/themeDark"
+            android:backgroundTint="@color/backgroundDark"
             android:contentDescription="@string/placeholder"
             android:src="@drawable/ic_select_all"
             app:layout_constraintEnd_toEndOf="@+id/import_file"
@@ -96,9 +104,10 @@
         android:id="@+id/entries_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_proceed" />
+        android:layout_gravity="bottom|center"
+        android:layout_margin="24dp"
+        android:src="@drawable/ic_proceed"
+        app:fabSize="mini" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_passes.xml b/app/src/main/res/layout/fragment_passes.xml
index 0385bd31..d8bc0cf5 100644
--- a/app/src/main/res/layout/fragment_passes.xml
+++ b/app/src/main/res/layout/fragment_passes.xml
@@ -17,54 +17,70 @@
   ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/passes_timer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@color/themeDark"
-        android:textColor="@color/themeAccent"
-        android:textSize="36sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <ImageButton
-        android:id="@+id/passes_filter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/themeDark"
-        android:contentDescription="@string/placeholder"
-        android:src="@drawable/ic_prefs"
-        app:layout_constraintBottom_toBottomOf="@+id/passes_timer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/passes_timer" />
+        <View
+            android:id="@+id/passes_bar"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:background="@color/themeDark"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/passes_recycler"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/passes_timer">
+        <TextView
+            android:id="@+id/passes_timer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/digital_dismay"
+            android:text="@string/timer_zero"
+            android:textColor="@color/themeAccent"
+            android:textSize="48sp"
+            app:layout_constraintBottom_toBottomOf="@+id/passes_bar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/passes_bar"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    </androidx.recyclerview.widget.RecyclerView>
+        <ImageButton
+            android:id="@+id/passes_filter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/themeDark"
+            android:contentDescription="@string/placeholder"
+            android:src="@drawable/ic_prefs"
+            app:layout_constraintBottom_toBottomOf="@+id/passes_timer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/passes_timer" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/passes_recycler"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/passes_bar">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/passes_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_gravity="bottom|center"
+        android:layout_marginBottom="24dp"
+        app:fabSize="mini"
         app:srcCompat="@drawable/ic_refresh" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xml
index 374088d3..4d065720 100644
--- a/app/src/main/res/layout/item_pass_geo.xml
+++ b/app/src/main/res/layout/item_pass_geo.xml
@@ -23,8 +23,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="4dp"
-    android:layout_marginTop="4dp"
+    android:layout_marginTop="2dp"
     android:layout_marginEnd="4dp"
+    android:layout_marginBottom="2dp"
     app:cardElevation="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml
index 1340f0eb..2a38819d 100644
--- a/app/src/main/res/layout/item_pass_leo.xml
+++ b/app/src/main/res/layout/item_pass_leo.xml
@@ -23,8 +23,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="4dp"
-    android:layout_marginTop="4dp"
+    android:layout_marginTop="2dp"
     android:layout_marginEnd="4dp"
+    android:layout_marginBottom="2dp"
     app:cardElevation="4dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
index 8ca6577e..5d5e9caa 100644
--- a/app/src/main/res/menu/nav_menu.xml
+++ b/app/src/main/res/menu/nav_menu.xml
@@ -19,22 +19,22 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/nav_entries"
-        android:icon="@drawable/ic_menu_sat"
-        android:title="@string/menu_bottom_entries" />
+        android:icon="@drawable/ic_menu_entries"
+        android:title="@string/menu_entries" />
     <item
         android:id="@+id/nav_passes"
         android:icon="@drawable/ic_menu_passes"
-        android:title="@string/menu_bottom_passes" />
+        android:title="@string/menu_passes" />
     <item
         android:id="@+id/nav_map"
-        android:icon="@drawable/ic_world"
-        android:title="@string/menu_bottom_osm" />
+        android:icon="@drawable/ic_menu_map"
+        android:title="@string/menu_map" />
     <item
         android:id="@+id/nav_prefs"
-        android:icon="@drawable/ic_settings"
-        android:title="@string/menu_settings" />
+        android:icon="@drawable/ic_menu_prefs"
+        android:title="@string/menu_prefs" />
     <item
         android:id="@+id/nav_about"
         android:icon="@drawable/ic_menu_about"
-        android:title="@string/menu_bottom_about" />
+        android:title="@string/menu_about" />
 </menu>
\ 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 35420d6e..f647ba4c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,28 +20,11 @@
 <resources>
     <string name="app_version">Версия: %s</string>
 
-    <string name="drawer_lat_text">Широта:</string>
-    <string name="drawer_lon_text">Долгота:</string>
-
-    <string name="update_loc">Обновить геопозицию</string>
-    <string name="update_loc_success">Геопозиция обновлена</string>
-    <string name="update_loc_failure">Проверьте настройки GPS</string>
-    <string name="import_data_file">Импорт данных из файла</string>
-    <string name="import_data_web">Импорт данных по ссылке</string>
-    <string name="import_data_success">Данные спутников обновлены</string>
-    <string name="import_data_failure">Ошибка импорта данных</string>
-    <string name="goto_github">Ссылка на GitHub</string>
-
-    <string name="menu_pass_list">Список пролетов</string>
-    <string name="menu_map_view">Карта мира</string>
-    <string name="menu_map_osm">Карта мира (Демо)</string>
-    <string name="menu_settings">Настройки</string>
+    <string name="menu_entries">Спутники</string>
+    <string name="menu_passes">Пролеты</string>
+    <string name="menu_map">Карта Мира</string>
+    <string name="menu_prefs">Настройки</string>
     <string name="menu_about">О приложении</string>
-    <string name="menu_bottom_entries">Спутники</string>
-    <string name="menu_bottom_passes">Пролеты</string>
-    <string name="menu_bottom_osm">Карта Мира</string>
-    <string name="menu_bottom_settings">Настройки</string>
-    <string name="menu_bottom_about">О приложении</string>
 
     <string name="dialog_select_sat">Выберите спутники для слежения</string>
     <string name="dialog_show_track">Показать трассу орбиты для</string>
@@ -78,10 +61,8 @@
     <string name="no_downlink_doppler">Тек. нисход: нет</string>
     <string name="no_trans">Не найдены трансиверы для этого спутника</string>
 
-    <string name="err_no_permissions">Отсутствуют необходимые разрешения</string>
     <string name="err_update_data">Пожалуйста, обновите данные спутников</string>
     <string name="err_enter_value">Пожалуйста, введите значение</string>
-    <string name="err_no_sat_selected">Не выбраны спутники</string>
 
     <string name="pass_aos_az">НПС — %2d°</string>
     <string name="pass_los_az">%2d° — КПС</string>
@@ -107,13 +88,6 @@
     <string name="trans_down_low_doppler">Тек. нисход: %.4fMHz</string>
     <string name="trans_down_lowHigh_doppler">Тек. нисход: %.4f - %.4fMHz</string>
 
-    <string name="info_swipe_text">Проведите по экрану вниз, чтобы обновить список пролетов
-        для выбранных спутников</string>
-    <string name="info_main_text">Приложение Look4Sat использует набор двухстрочных элементов TLE
-        для вычисления траекторий движения и текущего местоположения спутников. Вы можете
-        импортировать БД TLE при помощи кнопки в главном меню.</string>
-    <string name="info_select_text">Нажмите эту кнопку, чтобы выбрать спутники для слежения</string>
-
     <string name="about_subtitle">Приложение для слежения за спутниками радио и погоды
         для платформы Android</string>
     <string name="about_thanks_to">Большое спасибо:</string>
@@ -155,8 +129,6 @@
     <string name="btn_cancel">Отмена</string>
     <string name="btn_all_none">Все/Нет</string>
 
-    <string name="map_gsp">СТЦ</string>
-    <string name="tle_source">Источник TLE</string>
     <string name="https_only">Используйте протокол HTTPS</string>
     <string name="sat_import">Импорт спутников</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8bf2035b..19493572 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,30 +21,11 @@
     <string name="app_name" translatable="false">Look4Sat</string>
     <string name="app_version">Version: %s</string>
 
-    <string name="drawer_title" translatable="false">L∞k \n4Sat</string>
-    <string name="drawer_lat_text">Latitude: </string>
-    <string name="drawer_lon_text">Longitude: </string>
-
-    <string name="update_loc">Update location</string>
-    <string name="update_loc_success">Location updated</string>
-    <string name="update_loc_failure">Check your Location settings</string>
-    <string name="import_data_file">Import data from file</string>
-    <string name="import_data_web">Import data from web</string>
-    <string name="import_data_success">Satellite data was updated</string>
-    <string name="import_data_failure">Satellite data import failed</string>
-    <string name="goto_github">Link to GitHub</string>
-
-    <string name="menu_pass_list">List of Passes</string>
-    <string name="menu_polar_view" translatable="false">Polar View</string>
-    <string name="menu_map_view">World Map View</string>
-    <string name="menu_map_osm">World Map Demo</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_about">About the App</string>
-    <string name="menu_bottom_entries">Satellites</string>
-    <string name="menu_bottom_passes">Passes</string>
-    <string name="menu_bottom_osm">World Map</string>
-    <string name="menu_bottom_settings">Settings</string>
-    <string name="menu_bottom_about">About</string>
+    <string name="menu_entries">Satellites</string>
+    <string name="menu_passes">Passes</string>
+    <string name="menu_map">World Map</string>
+    <string name="menu_prefs">Settings</string>
+    <string name="menu_about">About</string>
 
     <string name="dialog_select_sat">Select satellites to track</string>
     <string name="dialog_show_track">Show ground track for</string>
@@ -88,10 +69,8 @@
     <string name="no_downlink_doppler">Curr. downlink: null</string>
     <string name="no_trans">No transceivers found for this satellite</string>
 
-    <string name="err_no_permissions">Missing permissions</string>
     <string name="err_update_data">Please, update satellite data</string>
     <string name="err_enter_value">Please, enter the value</string>
-    <string name="err_no_sat_selected">No satellites selected</string>
 
     <string name="pass_satName" translatable="false">%s</string>
     <string name="pass_satId" translatable="false">ID: %d</string>
@@ -124,15 +103,6 @@
     <string name="trans_down_low_doppler">Curr. downlink: %.4fMHz</string>
     <string name="trans_down_lowHigh_doppler">Curr. downlink: %.4f - %.4fMHz</string>
 
-    <string name="info_swipe_text">
-        Swipe the screen to refresh the list of passes for selected satellites</string>
-    <string name="info_main_text">
-        Look4Sat is using the Two-Line Element set to calculate the satellites positions \n
-        You can import the TLE data via the corresponding button in the main menu \n \n
-        Once the list is calculated, press a pass item for detailed information</string>
-    <string name="info_select_text">
-        Press this button to select the satellites you wish to track</string>
-
     <string name="about_subtitle">
         Amateur radio and weather satellites passes calculator for Android</string>
     <string name="about_thanks_to">Big thanks:</string>
@@ -175,10 +145,10 @@
     <string name="btn_cancel">Cancel</string>
     <string name="btn_all_none">All/None</string>
 
-    <string name="map_gsp">GSP</string>
-    <string name="tle_source">TLE source</string>
+    <string name="tle_source" translatable="false">https://</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="sat_import">Import satellite data</string>
+    <string name="timer_zero" translatable="false">00:00:00</string>
 </resources>