mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-04 11:37:22 +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/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>