mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-04 19:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Major classes, variables and strings refactoring. Code cleanup.

Browse Source
This commit is contained in:
Arty Bishop committed 2020-01-13 23:14:17 +00:00
1 parent 32605496b8
commit bb25ef8d62
34 files changed
+601 -545
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/drawable/ic_exit.xml → app/src/main/res/drawable/ic_exit_app.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_prefs.xml → app/src/main/res/drawable/ic_filter.xml
+1 -1
View File
@@ -5,5 +5,5 @@
android:viewportHeight="24.0">
<path
android:fillColor="#C0C0C0"
android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
</vector>
app/src/main/res/drawable/ic_github.xml → app/src/main/res/drawable/ic_goto_github.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_location.xml → app/src/main/res/drawable/ic_update_loc.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_tle.xml → app/src/main/res/drawable/ic_update_tle.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_trans.xml → app/src/main/res/drawable/ic_update_trans.xml
View File
File renamed without changes.
app/src/main/res/drawable/ic_map.xml → app/src/main/res/drawable/ic_world_map.xml
View File
File renamed without changes.
app/src/main/res/drawable/splash_drawable.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/darkOnLight" />
<item android:drawable="@drawable/launcher_background" />
<item
android:width="240dp"
android:height="240dp"
app/src/main/res/drawable/worldmap_night.webp → app/src/main/res/drawable/worldmap_dark.webp
View File
File renamed without changes.
app/src/main/res/drawable/worldmap_day.webp → app/src/main/res/drawable/worldmap_light.webp
View File
File renamed without changes.
app/src/main/res/layout/app_bar_main.xml
+4 -4
View File
@@ -17,21 +17,21 @@
app:titleTextColor="@color/themeAccent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_layout_timer"
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/toolbar_time_to_aos"
android:id="@+id/toolbar_timer"
style="@style/ToolbarText"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/toolbar_btn_refresh"
app:layout_constraintEnd_toStartOf="@+id/toolbar_filter"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/toolbar_btn_refresh"
android:id="@+id/toolbar_filter"
style="@style/ToolbarButton"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="parent"
app/src/main/res/layout/card_pass.xml
+13 -13
View File
@@ -2,7 +2,8 @@
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_pass"
style="@style/CardPass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
@@ -15,7 +16,7 @@
<TextView
android:id="@+id/pass_satName"
style="@style/CardPass.SatName"
style="@style/CardPassName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@@ -26,30 +27,29 @@
<TextView
android:id="@+id/pass_satId"
style="@style/CardPass.SideText"
style="@style/CardPassText"
android:layout_marginEnd="8dp"
android:text="@string/pass_satId"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_satName"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/pass_azVector"
style="@style/CardPass.SideText"
android:layout_width="wrap_content"
android:text="@string/pass_azVector"
android:id="@+id/pass_azimuth"
style="@style/CardPassText"
android:text="@string/pass_azimuth"
app:layout_constraintStart_toStartOf="@+id/pass_satName"
app:layout_constraintTop_toBottomOf="@+id/pass_satName" />
<TextView
android:id="@+id/pass_maxEl"
style="@style/CardPass.SideText"
style="@style/CardPassText"
android:text="@string/pass_maxEl"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_azVector"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_azimuth"
app:layout_constraintEnd_toEndOf="@+id/pass_satId" />
<TextView
android:id="@+id/pass_aosTime"
style="@style/CardPass.SideText"
style="@style/CardPassText"
android:layout_marginBottom="4dp"
android:text="@string/pass_aosTime"
app:layout_constraintBottom_toBottomOf="parent"
@@ -58,7 +58,7 @@
<TextView
android:id="@+id/pass_losTime"
style="@style/CardPass.SideText"
style="@style/CardPassText"
android:text="@string/pass_losTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_aosTime"
app:layout_constraintEnd_toEndOf="@+id/pass_progress" />
@@ -69,8 +69,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/pass_maxEl"
app:layout_constraintStart_toStartOf="@+id/pass_azVector"
app:layout_constraintTop_toBottomOf="@+id/pass_azVector" />
app:layout_constraintStart_toStartOf="@+id/pass_azimuth"
app:layout_constraintTop_toBottomOf="@+id/pass_azimuth" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/card_transmitter.xml → app/src/main/res/layout/card_trans.xml
View File
File renamed without changes.
app/src/main/res/layout/sat_pass_pref.xml → app/src/main/res/layout/dialog_pass_pref.xml
+18 -16
View File
@@ -2,48 +2,50 @@
<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/pass_pref_root"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/pref_hours_ahead_tv"
android:layout_width="wrap_content"
android:id="@+id/pref_tv_hoursAhead"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
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" />
<EditText
android:id="@+id/pref_hours_ahead_et"
android:id="@+id/pref_et_hoursAhead"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/pref_hours_ahead_hint"
android:importantForAutofill="no"
android:inputType="number"
app:layout_constraintEnd_toEndOf="@+id/pref_hours_ahead_tv"
app:layout_constraintStart_toStartOf="@+id/pref_hours_ahead_tv"
app:layout_constraintTop_toBottomOf="@+id/pref_hours_ahead_tv" />
app:layout_constraintEnd_toEndOf="@+id/pref_tv_hoursAhead"
app:layout_constraintStart_toStartOf="@+id/pref_tv_hoursAhead"
app:layout_constraintTop_toBottomOf="@+id/pref_tv_hoursAhead" />
<TextView
android:id="@+id/pref_min_el_tv"
android:layout_width="wrap_content"
android:id="@+id/pref_tv_minEl"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/pref_min_el_summary"
app:layout_constraintEnd_toEndOf="@+id/pref_hours_ahead_et"
app:layout_constraintStart_toStartOf="@+id/pref_hours_ahead_et"
app:layout_constraintTop_toBottomOf="@+id/pref_hours_ahead_et" />
app:layout_constraintEnd_toEndOf="@+id/pref_et_hoursAhead"
app:layout_constraintStart_toStartOf="@+id/pref_et_hoursAhead"
app:layout_constraintTop_toBottomOf="@+id/pref_et_hoursAhead" />
<EditText
android:id="@+id/pref_min_el_et"
android:id="@+id/pref_et_minEl"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/pref_min_el_hint"
android:importantForAutofill="no"
android:inputType="number|numberDecimal"
app:layout_constraintEnd_toEndOf="@+id/pref_min_el_tv"
app:layout_constraintStart_toStartOf="@+id/pref_min_el_tv"
app:layout_constraintTop_toBottomOf="@+id/pref_min_el_tv" />
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>
app/src/main/res/layout/drawer_header.xml
+14 -14
View File
@@ -23,7 +23,7 @@
android:id="@+id/drawer_title"
style="@style/DrawerHeader.Title"
android:layout_marginStart="8dp"
android:text="@string/title"
android:text="@string/drawer_title"
app:layout_constraintBottom_toBottomOf="@+id/drawer_sat_img"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
@@ -31,7 +31,7 @@
<TextView
android:id="@+id/drawer_lat"
style="@style/DrawerHeader.Item"
android:text="@string/drawer_latitude"
android:text="@string/drawer_lat"
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lat_value"
app:layout_constraintStart_toStartOf="@+id/drawer_title" />
@@ -40,14 +40,14 @@
style="@style/DrawerHeader.ItemValue"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:text="@string/drawer_latitude_value"
android:text="@string/drawer_lat_value"
app:layout_constraintStart_toEndOf="@+id/drawer_lat"
app:layout_constraintTop_toBottomOf="@+id/drawer_sat_img" />
<TextView
android:id="@+id/drawer_lon"
style="@style/DrawerHeader.Item"
android:text="@string/drawer_longitude"
android:text="@string/drawer_lon"
app:layout_constraintStart_toStartOf="@+id/drawer_lat"
app:layout_constraintTop_toBottomOf="@+id/drawer_lat" />
@@ -55,7 +55,7 @@
android:id="@+id/drawer_lon_value"
style="@style/DrawerHeader.ItemValue"
android:layout_marginStart="8dp"
android:text="@string/drawer_longitude_value"
android:text="@string/drawer_lon_value"
app:layout_constraintBaseline_toBaselineOf="@+id/drawer_lon"
app:layout_constraintStart_toEndOf="@+id/drawer_lon" />
@@ -65,7 +65,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_location"
android:src="@drawable/ic_update_loc"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_tle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/drawer_lon_value" />
@@ -74,7 +74,7 @@
android:id="@+id/drawer_tv_loc"
style="@style/DrawerHeader.ButtonText"
android:layout_marginStart="8dp"
android:text="@string/update_location"
android:text="@string/update_loc"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_loc"
app:layout_constraintStart_toEndOf="@+id/drawer_btn_loc"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_loc" />
@@ -83,7 +83,7 @@
android:id="@+id/drawer_btn_tle"
style="@style/DrawerHeader.Button"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_tle"
android:src="@drawable/ic_update_tle"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_loc"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_loc" />
@@ -100,7 +100,7 @@
android:id="@+id/drawer_btn_trans"
style="@style/DrawerHeader.Button"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_trans"
android:src="@drawable/ic_update_trans"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_github"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_tle"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle" />
@@ -108,7 +108,7 @@
<TextView
android:id="@+id/drawer_tv_trans"
style="@style/DrawerHeader.ButtonText"
android:text="@string/update_transmitters"
android:text="@string/update_trans"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_trans"
app:layout_constraintStart_toStartOf="@+id/drawer_tv_tle"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle" />
@@ -118,7 +118,7 @@
style="@style/DrawerHeader.Button"
android:layout_marginBottom="8dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_github"
android:src="@drawable/ic_goto_github"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/drawer_btn_trans"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_trans" />
@@ -126,7 +126,7 @@
<TextView
android:id="@+id/drawer_tv_github"
style="@style/DrawerHeader.ButtonText"
android:text="@string/github"
android:text="@string/goto_github"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_github"
app:layout_constraintStart_toStartOf="@+id/drawer_tv_trans"
app:layout_constraintTop_toBottomOf="@+id/drawer_btn_trans" />
@@ -136,7 +136,7 @@
style="@style/DrawerHeader.Button"
android:layout_marginStart="8dp"
android:contentDescription="@string/placeholder"
android:src="@drawable/ic_exit"
android:src="@drawable/ic_exit_app"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_github"
app:layout_constraintStart_toEndOf="@+id/drawer_tv_github"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_github" />
@@ -145,7 +145,7 @@
android:id="@+id/drawer_tv_exit"
style="@style/DrawerHeader.ButtonText"
android:layout_marginStart="8dp"
android:text="@string/exit"
android:text="@string/exit_app"
app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_exit"
app:layout_constraintStart_toEndOf="@+id/drawer_btn_exit"
app:layout_constraintTop_toTopOf="@+id/drawer_btn_exit" />
app/src/main/res/layout/fragment_worldmap.xml → app/src/main/res/layout/fragment_map_view.xml
+6 -6
View File
@@ -4,25 +4,25 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.WorldMapFragment">
tools:context=".ui.MapViewFragment">
<FrameLayout
android:id="@+id/worldmap_frame"
android:id="@+id/map_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/worldmap_night"
android:background="@drawable/worldmap_dark"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/worldmap_fab"
android:id="@+id/map_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_marginStart="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/ic_sat_asc_right" />
app/src/main/res/layout/fragment_sky.xml → app/src/main/res/layout/fragment_pass_list.xml
+5 -5
View File
@@ -5,12 +5,12 @@
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:id="@+id/pass_list_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/sky_recycler_future"
android:id="@+id/pass_list_recycler"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -21,12 +21,12 @@
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/sky_fab"
android:id="@+id/pass_list_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_sat_asc_left" />
app/src/main/res/layout/fragment_radar.xml → app/src/main/res/layout/fragment_polar_view.xml
+26 -26
View File
@@ -4,10 +4,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.RadarFragment">
tools:context=".ui.PolarViewFragment">
<FrameLayout
android:id="@+id/radar_sky_frame"
android:id="@+id/polar_view_frame"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
@@ -16,54 +16,54 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/radar_azimuth"
style="@style/RadarText"
android:id="@+id/polar_azimuth"
style="@style/PolarViewText"
android:layout_marginStart="4dp"
android:text="@string/radar_azimuth"
app:layout_constraintBottom_toBottomOf="@+id/radar_sky_frame"
app:layout_constraintStart_toStartOf="@+id/radar_sky_frame" />
android:text="@string/polar_azimuth"
app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
app:layout_constraintStart_toStartOf="@+id/polar_view_frame" />
<TextView
android:id="@+id/radar_elevation"
style="@style/RadarText"
android:id="@+id/polar_elevation"
style="@style/PolarViewText"
android:layout_marginEnd="4dp"
android:text="@string/radar_elevation"
android:text="@string/polar_elevation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/radar_sky_frame" />
app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
<TextView
android:id="@+id/radar_altitude"
style="@style/RadarText"
android:id="@+id/polar_altitude"
style="@style/PolarViewText"
android:layout_marginStart="4dp"
android:text="@string/radar_altitude"
android:text="@string/polar_altitude"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/radar_sky_frame" />
app:layout_constraintTop_toTopOf="@+id/polar_view_frame" />
<TextView
android:id="@+id/radar_range"
style="@style/RadarText"
android:id="@+id/polar_range"
style="@style/PolarViewText"
android:layout_marginEnd="4dp"
android:text="@string/radar_range"
app:layout_constraintBottom_toBottomOf="@+id/radar_sky_frame"
app:layout_constraintEnd_toEndOf="@+id/radar_sky_frame" />
android:text="@string/polar_range"
app:layout_constraintBottom_toBottomOf="@+id/polar_view_frame"
app:layout_constraintEnd_toEndOf="@+id/polar_view_frame" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/radar_recycler"
android:id="@+id/polar_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/radar_sky_frame" />
app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />
<TextView
android:id="@+id/radar_no_trans"
style="@style/RadarText"
android:id="@+id/polar_no_trans"
style="@style/PolarViewText"
android:layout_marginTop="8dp"
android:text="@string/no_trans"
android:text="@string/no_transmitters"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_sky_frame" />
app:layout_constraintTop_toBottomOf="@+id/polar_view_frame" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/menu/drawer_menu.xml
+5 -5
View File
@@ -5,13 +5,13 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_sky"
android:id="@+id/nav_pass_list"
android:icon="@drawable/ic_sat_asc_right"
android:title="@string/menu_sky" />
android:title="@string/menu_pass_list" />
<item
android:id="@+id/nav_map"
android:icon="@drawable/ic_map"
android:title="@string/menu_map" />
android:id="@+id/nav_map_view"
android:icon="@drawable/ic_world_map"
android:title="@string/menu_map_view" />
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_settings"
app/src/main/res/navigation/nav_graph.xml
+15 -15
View File
@@ -3,16 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mobile_navigation"
app:startDestination="@id/nav_sky">
app:startDestination="@id/nav_pass_list">
<fragment
android:id="@+id/nav_sky"
android:name="com.rtbishop.look4sat.ui.SkyFragment"
android:label="@string/menu_sky"
tools:layout="@layout/fragment_sky">
android:id="@+id/nav_pass_list"
android:name="com.rtbishop.look4sat.ui.PassListFragment"
android:label="@string/menu_pass_list"
tools:layout="@layout/fragment_pass_list">
<action
android:id="@+id/action_nav_sky_to_nav_radar"
app:destination="@id/nav_radar"
android:id="@+id/action_pass_to_polar"
app:destination="@id/nav_polar_view"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_enter_anim"
@@ -20,20 +20,20 @@
</fragment>
<fragment
android:id="@+id/nav_radar"
android:name="com.rtbishop.look4sat.ui.RadarFragment"
android:label="@string/menu_radar"
tools:layout="@layout/fragment_radar">
android:id="@+id/nav_polar_view"
android:name="com.rtbishop.look4sat.ui.PolarViewFragment"
android:label="@string/menu_polar_view"
tools:layout="@layout/fragment_polar_view">
<argument
android:name="satPass"
app:argType="com.rtbishop.look4sat.repo.SatPass" />
</fragment>
<fragment
android:id="@+id/nav_map"
android:name="com.rtbishop.look4sat.ui.WorldMapFragment"
android:label="@string/menu_map"
tools:layout="@layout/fragment_worldmap" />
android:id="@+id/nav_map_view"
android:name="com.rtbishop.look4sat.ui.MapViewFragment"
android:label="@string/menu_map_view"
tools:layout="@layout/fragment_map_view" />
<fragment
android:id="@+id/nav_credits"
app/src/main/res/values/colors.xml
+2 -4
View File
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="themeAccent">#FFE082</color>
<color name="darkOnLight">#101010</color>
<color name="lightOnDark">#C0C0C0</color>
<color name="toolbarButton">#191919</color>
<color name="themeLight">#C0C0C0</color>
<color name="themeDark">#191919</color>
<color name="backgroundDark">#080808</color>
<color name="error">#800000</color>
<color name="satTrack">#D50000</color>
<color name="satFootprint">#FFE082</color>
</resources>
app/src/main/res/values/dimens.xml
-3
View File
@@ -1,3 +0,0 @@
<resources>
<dimen name="fab_margin">16dp</dimen>
</resources>
app/src/main/res/values/strings.xml
+109 -97
View File
@@ -1,110 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Look4Sat</string>
<string name="title">L∞king \n4Sat…</string>
<string name="drawer_latitude">Latitude: </string>
<string name="drawer_latitude_value">51.5074</string>
<string name="drawer_longitude">Longitude: </string>
<string name="drawer_longitude_value">0.1278</string>
<string name="drawer_title">L∞king \n4Sat…</string>
<string name="drawer_lat">Latitude: </string>
<string name="drawer_lat_value">51.5074</string>
<string name="drawer_lon">Longitude: </string>
<string name="drawer_lon_value">0.1278</string>
<string name="update_location">Update location</string>
<string name="update_loc">Update location</string>
<string name="update_tle">Update TLE file</string>
<string name="update_transmitters">Update transmitters DB</string>
<string name="github">GitHub</string>
<string name="exit">Exit</string>
<string name="menu_sky">Sky at a Glance</string>
<string name="menu_radar">Radar View</string>
<string name="menu_map">World Map View</string>
<string name="menu_settings">Settings</string>
<string name="menu_credits">Credits</string>
<string name="menu_about">About the App</string>
<string name="pass_satName">Meteor M2–2</string>
<string name="pass_satId">ID: 48680</string>
<string name="pass_azVector">Az: 180° -> 360°</string>
<string name="pass_maxEl">MaxEl: 75.5°</string>
<string name="pass_aosTime">AOS - 13:14:15</string>
<string name="pass_losTime">LOS - 16:17:18</string>
<string name="radar_azimuth">Azimuth: 180.00°</string>
<string name="radar_elevation">Elevation: 75.50°</string>
<string name="radar_altitude">Altitude: 850 km</string>
<string name="radar_range">Range: 12000 km</string>
<string name="btn_ok">OK</string>
<string name="btn_cancel">Cancel</string>
<string name="btn_clear">Clear All</string>
<string name="btn_no">No</string>
<string name="btn_yes">Yes</string>
<string name="dialog_select_sat">Select satellites to track</string>
<string name="dialog_show_track">Show ground track for…</string>
<string name="dialog_pass_prefs">Satellite pass preferences</string>
<string name="pref_hours_ahead_summary">Show passes that occur within X hours</string>
<string name="pref_hours_ahead_hint">Hours ahead</string>
<string name="pref_min_el_summary">Show passes with max elevation above</string>
<string name="pref_min_el_hint">Minimum elevation</string>
<string name="pref_gsp_title">Ground station position settings</string>
<string name="pref_lat_title">Latitude</string>
<string name="pref_lat_input_error">Lat should be within -90 to 90 deg</string>
<string name="pref_lon_title">Longitude</string>
<string name="pref_lon_input_error">Lon should be within -180 to 180 deg</string>
<string name="pref_alt_title">Altitude</string>
<string name="pref_alt_input_error">Alt should be within -413 to 8850 m</string>
<string name="pref_other_title">Other settings</string>
<string name="pref_update_freq_title">Update frequency</string>
<string name="pref_update_freq_input_error">Value should be within 250 to 10000 ms</string>
<string name="pref_update_freq_summary">Views update interval, ms</string>
<string name="def_gsp_loc">0.0</string>
<string name="def_hours_ahead">8</string>
<string name="def_min_el">16.0</string>
<string name="def_update_freq">3000</string>
<string name="key_lat">latitude</string>
<string name="key_lon">longitude</string>
<string name="key_alt">altitude</string>
<string name="key_hours_ahead">hoursAhead</string>
<string name="key_min_el">minEl</string>
<string name="key_delay">delay</string>
<string name="tle_main_list_file_name">tleFile.txt</string>
<string name="tle_selection_file_name">tleSelection</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_permissions">Missing permissions</string>
<string name="no_trans">No transmitters found for this Satellite</string>
<string name="no_selected_sat">No satellites were shortlisted</string>
<string name="trans_description">ARGOS-3 A-DCS 465.9875MHz</string>
<string name="trans_downlink">Downlink: 465.9875 MHz</string>
<string name="trans_uplink">Uplink: 465.9875 MHz</string>
<string name="trans_mode">Mode: BPSK400</string>
<string name="trans_inverted">Inverted: Yes</string>
<string name="trans_header">Transmitters:</string>
<string name="pattern_location">%.4f</string>
<string name="pattern_aos">AOS -%02d:%02d:%02d</string>
<string name="pattern_los">LOS -%02d:%02d:%02d</string>
<string name="pattern_trans_mode">Mode: %s</string>
<string name="pattern_trans_inverted">Inverted: %s</string>
<string name="pattern_trans_uplink_low">Uplink: %.4f MHz</string>
<string name="pattern_trans_uplink_lowHigh">Uplink: %.4f - %.4f MHz</string>
<string name="pattern_trans_downlink_low">Downlink: %.4f MHz</string>
<string name="pattern_trans_downlink_lowHigh">Downlink: %.4f - %.4f MHz</string>
<string name="map_gsp">GSP</string>
<string name="map_content">Nasa Map</string>
<string name="placeholder">Placeholder</string>
<string name="update_trans">Update transmitters DB</string>
<string name="goto_github">GitHub</string>
<string name="exit_app">Exit</string>
<string name="updateLocSuccess">Location was updated</string>
<string name="updateTleSuccess">TLE file was updated</string>
<string name="updateTleFailure">Could not update TLE file</string>
<string name="updateTransSuccess">Transmitters database was updated</string>
<string name="updateTransFailure">Could not update transmitters</string>
<string name="menu_pass_list">List of passes</string>
<string name="menu_polar_view">Polar View</string>
<string name="menu_map_view">World Map View</string>
<string name="menu_settings">Settings</string>
<string name="menu_credits">Credits</string>
<string name="menu_about">About the App</string>
<string name="pass_satName">Meteor M2–2</string>
<string name="pass_satId">ID: 48680</string>
<string name="pass_azimuth">Az: 180° -> 360°</string>
<string name="pass_maxEl">MaxEl: 75.5°</string>
<string name="pass_aosTime">AOS - 13:14:15</string>
<string name="pass_losTime">LOS - 16:17:18</string>
<string name="polar_azimuth">Azimuth: 180.00°</string>
<string name="polar_elevation">Elevation: 75.50°</string>
<string name="polar_altitude">Altitude: 850 km</string>
<string name="polar_range">Range: 12000 km</string>
<string name="trans_description">ARGOS-3 A-DCS 465.9875MHz</string>
<string name="trans_downlink">Downlink: 465.9875 MHz</string>
<string name="trans_uplink">Uplink: 465.9875 MHz</string>
<string name="trans_mode">Mode: BPSK400</string>
<string name="trans_inverted">Inverted: Yes</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">hoursAhead</string>
<string name="pref_hours_ahead_hint">Hours ahead</string>
<string name="pref_hours_ahead_summary">Show passes that occur within X hours</string>
<string name="pref_hours_ahead_input_error">Value should be within 1–168 hours</string>
<string name="pref_min_el_key">minEl</string>
<string name="pref_min_el_hint">Minimum elevation</string>
<string name="pref_min_el_summary">Show passes with max elevation above</string>
<string name="pref_min_el_input_error">Value should be within 0–90 deg</string>
<string name="pref_gsp_title">Ground station position settings</string>
<string name="pref_lat_key">latitude</string>
<string name="pref_lat_title">Latitude</string>
<string name="pref_lat_input_error">Lat should be within -90 to 90 deg</string>
<string name="pref_lon_key">longitude</string>
<string name="pref_lon_title">Longitude</string>
<string name="pref_lon_input_error">Lon should be within -180 to 180 deg</string>
<string name="pref_alt_key">altitude</string>
<string name="pref_alt_title">Altitude</string>
<string name="pref_alt_input_error">Alt should be within -413 to 8850 m</string>
<string name="pref_other_title">Other settings</string>
<string name="pref_refresh_rate_key">rate</string>
<string name="pref_refresh_rate_title">Refresh rate</string>
<string name="pref_refresh_rate_input_error">Value should be within 250 to 10000 ms</string>
<string name="pref_refresh_rate_summary">Views update interval, ms</string>
<string name="no_permissions">Missing permissions</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_transmitters">No transmitters found for this Satellite</string>
<string name="no_selected_sat">No satellites were shortlisted</string>
<string name="no_tle_found">TLE file was not found</string>
<string name="no_selection_found">Selection file was not found</string>
<string name="error_sat_wont_pass">Certain satellites will never pass</string>
<string name="error_sat_tle">There was a problem with a satellite TLE</string>
<string name="error_update_tle">Please, update your TLE</string>
<string name="error_enter_value">Please, enter the value</string>
<string name="pattern_loc">%.4f</string>
<string name="pattern_time">HH:mm:ss</string>
<string name="pattern_timer_aos">AOS -%02d:%02d:%02d</string>
<string name="pattern_timer_los">LOS -%02d:%02d:%02d</string>
<string name="pattern_pass_aos">AOS - %s</string>
<string name="pattern_pass_los">LOS - %s</string>
<string name="pattern_pass_satId">Id: %d</string>
<string name="pattern_pass_maxEl">MaxEl: %.1f°</string>
<string name="pattern_pass_azimuth">Az: %2d° -> %2d°</string>
<string name="pattern_polar_azimuth">Azimuth: %.1f°</string>
<string name="pattern_polar_elev">Elevation: %.1f°</string>
<string name="pattern_polar_range">Range: %.0f km</string>
<string name="pattern_polar_alt">Altitude: %.0f km</string>
<string name="pattern_trans_mode">Mode: %s</string>
<string name="pattern_trans_invert">Inverted: %s</string>
<string name="pattern_trans_up_low">Uplink: %.4f MHz</string>
<string name="pattern_trans_up_lowHigh">Uplink: %.4f - %.4f MHz</string>
<string name="pattern_trans_down_low">Downlink: %.4f MHz</string>
<string name="pattern_trans_down_lowHigh">Downlink: %.4f - %.4f MHz</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_clear">Clear All</string>
<string name="map_gsp">GSP</string>
<string name="placeholder">Placeholder</string>
</resources>
app/src/main/res/values/styles.xml
+11 -18
View File
@@ -4,12 +4,10 @@
<item name="colorPrimary">@color/themeAccent</item>
<item name="colorSecondary">@color/themeAccent</item>
<item name="colorSurface">@color/backgroundDark</item>
<item name="colorError">@color/error</item>
<item name="colorOnPrimary">@color/darkOnLight</item>
<item name="colorOnSecondary">@color/darkOnLight</item>
<item name="colorOnSurface">@color/lightOnDark</item>
<item name="colorOnError">@color/lightOnDark</item>
<item name="colorOnPrimary">@color/backgroundDark</item>
<item name="colorOnSecondary">@color/backgroundDark</item>
<item name="colorOnSurface">@color/themeLight</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
@@ -23,7 +21,7 @@
<style name="DrawerHeader">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/lightOnDark</item>
<item name="android:textColor">@color/themeLight</item>
</style>
<style name="DrawerHeader.Title">
@@ -64,39 +62,34 @@
<style name="ToolbarButton">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:src">@drawable/ic_prefs</item>
<item name="android:backgroundTint">@color/toolbarButton</item>
<item name="android:src">@drawable/ic_filter</item>
<item name="android:backgroundTint">@color/themeDark</item>
</style>
<style name="CardPass">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
</style>
<style name="CardPass.SideText">
<style name="CardPassText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
</style>
<style name="CardPass.SatName">
<style name="CardPassName">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">21sp</item>
<item name="android:textColor">@color/themeAccent</item>
</style>
<style name="RadarText">
<style name="PolarViewText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/lightOnDark</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textSize">15sp</item>
</style>
<style name="CardTransText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/lightOnDark</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textSize">15sp</item>
</style>
app/src/main/res/xml/preference.xml
+10 -10
View File
@@ -2,31 +2,31 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/pref_gsp_title">
<EditTextPreference
android:defaultValue="@string/def_gsp_loc"
android:key="@string/key_lat"
android:defaultValue="0.0"
android:key="@string/pref_lat_key"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_lat_title" />
<EditTextPreference
android:defaultValue="@string/def_gsp_loc"
android:key="@string/key_lon"
android:defaultValue="0.0"
android:key="@string/pref_lon_key"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_lon_title" />
<EditTextPreference
android:defaultValue="@string/def_gsp_loc"
android:key="@string/key_alt"
android:defaultValue="0.0"
android:key="@string/pref_alt_key"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_alt_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_other_title">
<EditTextPreference
android:defaultValue="@string/def_update_freq"
android:key="@string/key_delay"
android:defaultValue="3000"
android:key="@string/pref_refresh_rate_key"
android:selectAllOnFocus="true"
android:singleLine="true"
android:summary="@string/pref_update_freq_summary"
android:title="@string/pref_update_freq_title" />
android:summary="@string/pref_refresh_rate_summary"
android:title="@string/pref_refresh_rate_title" />
</PreferenceCategory>
</PreferenceScreen>