From d8bb1ae7966c1f65eca44df345b382e3d0b3cbf3 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 7 Dec 2019 18:35:07 +0000
Subject: [PATCH] Minor cleanup

---
 .../com/rtbishop/lookingsat/MainViewModel.kt  |  9 ----
 .../lookingsat/ui/WorldMapFragment.kt         | 16 ++----
 app/src/main/res/layout/sat_pass_pref.xml     | 49 -------------------
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/xml/preference.xml           |  2 +-
 5 files changed, 6 insertions(+), 71 deletions(-)
 delete mode 100644 app/src/main/res/layout/sat_pass_pref.xml

diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt b/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt
index 61a0d876..e0f7f1ac 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/MainViewModel.kt
@@ -101,15 +101,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         tleSelectedMap = mutableMap
     }
 
-    fun updatePassPrefs(hoursAhead: Int, maxEl: Double) {
-        passPrefs = SatPassPrefs(hoursAhead, maxEl)
-        preferences.edit {
-            putInt(keyHours, hoursAhead)
-            putLong(keyMinEl, maxEl.toRawBits())
-            apply()
-        }
-    }
-
     fun updateGsp() {
         val lat = preferences.getString(keyLat, defValueLoc)!!.toDouble()
         val lon = preferences.getString(keyLon, defValueLoc)!!.toDouble()
diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt
index 1a23a57e..f092db06 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt
@@ -131,11 +131,8 @@ class WorldMapFragment : Fragment() {
             drawFootprint(canvas, frameWidth, frameHeight, footprintPositions)
             var longitude = rad2Deg(satPos.longitude)
 
-            if (longitude > 180.0) {
-                longitude -= 180.0
-            } else {
-                longitude += 180.0
-            }
+            if (longitude > 180.0) longitude -= 180.0
+            else longitude += 180.0
         }
 
         private fun drawGroundTrack(canvas: Canvas, width: Int, height: Int, list: List<SatPos>) {
@@ -151,9 +148,8 @@ class WorldMapFragment : Fragment() {
                 else trackX -= 180
 
                 trackX *= width / 360f
-                trackY = ((90.0 - rad2Deg(satPos.latitude)) * (height / 180.0))
-                    .roundToInt()
-                    .toFloat()
+                trackY =
+                    ((90.0 - rad2Deg(satPos.latitude)) * (height / 180.0)).roundToInt().toFloat()
 
                 if (index == 0 || abs(trackX - prevX) > 180) trackPath.moveTo(trackX, trackY)
                 else trackPath.lineTo(trackX, trackY)
@@ -176,9 +172,7 @@ class WorldMapFragment : Fragment() {
                 else printX -= 180f
 
                 printX *= width / 360f
-                printY = ((90.0 - position.lat) * (height / 180.0))
-                    .roundToInt()
-                    .toFloat()
+                printY = ((90.0 - position.lat) * (height / 180.0)).roundToInt().toFloat()
 
                 if (index == 0 || abs(printX - prevX) > 180) printPath.moveTo(printX, printY)
                 else printPath.lineTo(printX, printY)
diff --git a/app/src/main/res/layout/sat_pass_pref.xml b/app/src/main/res/layout/sat_pass_pref.xml
deleted file mode 100644
index 26a1d910..00000000
--- a/app/src/main/res/layout/sat_pass_pref.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/pass_pref_root"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/pass_pref_tv_hours"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/pref_hours_ahead_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <EditText
-        android:id="@+id/pass_pref_et_hours"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="@string/pref_hours_ahead_title"
-        android:importantForAutofill="no"
-        android:inputType="number"
-        app:layout_constraintEnd_toEndOf="@+id/pass_pref_tv_hours"
-        app:layout_constraintStart_toStartOf="@+id/pass_pref_tv_hours"
-        app:layout_constraintTop_toBottomOf="@+id/pass_pref_tv_hours" />
-
-    <TextView
-        android:id="@+id/pass_pref_tv_maxEl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/pref_min_el_title"
-        app:layout_constraintEnd_toEndOf="@+id/pass_pref_et_hours"
-        app:layout_constraintStart_toStartOf="@+id/pass_pref_et_hours"
-        app:layout_constraintTop_toBottomOf="@+id/pass_pref_et_hours" />
-
-    <EditText
-        android:id="@+id/pass_pref_et_maxEl"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:hint="@string/pref_min_el_title"
-        android:importantForAutofill="no"
-        android:inputType="numberDecimal"
-        app:layout_constraintEnd_toEndOf="@+id/pass_pref_tv_maxEl"
-        app:layout_constraintStart_toStartOf="@+id/pass_pref_tv_maxEl"
-        app:layout_constraintTop_toBottomOf="@+id/pass_pref_tv_maxEl" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7743899c..df9c7c79 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,7 +36,6 @@
     <string name="btn_cancel">Cancel</string>
     <string name="btn_clear">Clear All</string>
 
-    <string name="title_pass_pref">Passes preferences</string>
     <string name="title_select_sat">Select satellites to track</string>
 
     <string name="pref_gsp_title">Ground station position settings</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index d8601728..7c16e3c4 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -29,7 +29,7 @@
             android:summary="@string/pref_hours_ahead_summary"
             android:title="@string/pref_hours_ahead_title" />
         <EditTextPreference
-            android:defaultValue="@string/def_hours_ahead"
+            android:defaultValue="@string/def_min_el"
             android:key="@string/key_min_el"
             android:selectAllOnFocus="true"
             android:singleLine="true"