mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added main timer font. Changes to layouts and resources.

Browse Source
This commit is contained in:
Arty Bishop committed 2020-10-06 23:24:16 +01:00
1 parent 4b050e21f0
commit 3cd8516d88
13 files changed
+97 -128
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/drawable/ic_launcher_background.xml
+1 -1
View File
@@ -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>
app/src/main/res/drawable/ic_menu_sat.xml → app/src/main/res/drawable/ic_menu_entries.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_world.xml → app/src/main/res/drawable/ic_menu_map.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_settings.xml → app/src/main/res/drawable/ic_menu_prefs.xml
View File
File renamed without changes.
app/src/main/res/font/digital_dismay.otf
BIN
View File
Binary file not shown.
app/src/main/res/layout/fragment_about.xml
+1 -1
View File
@@ -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"
app/src/main/res/layout/fragment_entries.xml
+19 -10
View File
@@ -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>
app/src/main/res/layout/fragment_passes.xml
+53 -37
View File
@@ -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>
app/src/main/res/layout/item_pass_geo.xml
+2 -1
View File
@@ -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
app/src/main/res/layout/item_pass_leo.xml
+2 -1
View File
@@ -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
app/src/main/res/menu/nav_menu.xml
+8 -8
View File
@@ -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>
app/src/main/res/values-ru/strings.xml
+4 -32
View File
@@ -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>
app/src/main/res/values/strings.xml
+7 -37
View File
@@ -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>