mirror
/
Look4Sat
kopia lustrzana https://github.com/rt-bishop/Look4Sat
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Switched to using the Kotlin version of the PassPredictor class. Using the code minification without the obfuscation for the release build.

pull/30/head
Arty Bishop 2020-01-26 16:34:05 +00:00
rodzic 24cc767085
commit 29c80bc44e
4 zmienionych plików z 14 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/build.gradle
Wyświetl plik

@ -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 {

4
app/src/main/java/com/rtbishop/look4sat/MainViewModel.kt
Wyświetl plik

@ -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))

2
app/src/main/java/com/rtbishop/look4sat/repo/SatPass.kt
Wyświetl plik

@ -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

6
app/src/main/java/com/rtbishop/look4sat/ui/MapViewFragment.kt
Wyświetl plik

@ -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