From 29c80bc44e3a8275cf494d40f666a78f97d85099 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sun, 26 Jan 2020 16:34:05 +0000
Subject: [PATCH] Switched to using the Kotlin version of the PassPredictor
 class. Using the code minification without the obfuscation for the release
 build.

---
 app/build.gradle                                          | 8 ++++++--
 app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt  | 4 ++--
 app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt   | 2 +-
 .../main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt | 6 +++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9a6d83f5..bd4a33a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,8 +35,12 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                obfuscate false
+                optimizeCode true
+            }
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt
index 563ea754..68ad840b 100644
--- a/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt
@@ -30,10 +30,10 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.github.amsacode.predict4java.GroundStationPosition
-import com.github.amsacode.predict4java.PassPredictor
 import com.github.amsacode.predict4java.SatNotFoundException
 import com.github.amsacode.predict4java.TLE
 import com.google.android.gms.location.FusedLocationProviderClient
+import com.rtbishop.look4sat.predict4kotlin.PassPredictor
 import com.rtbishop.look4sat.repo.Repository
 import com.rtbishop.look4sat.repo.SatPass
 import com.rtbishop.look4sat.repo.Transmitter
@@ -189,7 +189,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 tleSelection.forEach { indexOfSelection ->
                     val tle = tleMainList[indexOfSelection]
                     try {
-                        val predictor = PassPredictor(tle, gsp.value)
+                        val predictor = PassPredictor(tle, gsp.value!!)
                         val passes = predictor.getPasses(dateNow, hoursAhead, true)
                         passes.forEach {
                             passList.add(SatPass(tle, predictor, it))
diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt b/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt
index 223847dc..6dd6aaa4 100644
--- a/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt
@@ -20,9 +20,9 @@
 package com.rtbishop.look4sat.repo
 
 import android.os.Parcelable
-import com.github.amsacode.predict4java.PassPredictor
 import com.github.amsacode.predict4java.SatPassTime
 import com.github.amsacode.predict4java.TLE
+import com.rtbishop.look4sat.predict4kotlin.PassPredictor
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.parcel.RawValue
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
index 021efeb7..a4797e01 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
@@ -31,10 +31,14 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import com.github.amsacode.predict4java.*
+import com.github.amsacode.predict4java.GroundStationPosition
+import com.github.amsacode.predict4java.Position
+import com.github.amsacode.predict4java.SatPos
+import com.github.amsacode.predict4java.TLE
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.rtbishop.look4sat.MainViewModel
 import com.rtbishop.look4sat.R
+import com.rtbishop.look4sat.predict4kotlin.PassPredictor
 import com.rtbishop.look4sat.repo.SatPass
 import java.util.*
 import java.util.concurrent.Executors