Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added initial code for the custom tle import from file
Arty Bishop3b5c3a8bb350
diff --git a/app/src/main/java/com/rtbishop/look4sat/dagger/modules/RepoModule.kt b/app/src/main/java/com/rtbishop/look4sat/dagger/modules/RepoModule.ktindex efffb9aa..8cbe6b73 100644--- a/app/src/main/java/com/rtbishop/look4sat/dagger/modules/RepoModule.kt+++ b/app/src/main/java/com/rtbishop/look4sat/dagger/modules/RepoModule.kt@@ -1,5 +1,7 @@package com.rtbishop.look4sat.dagger.modules+import android.content.ContentResolver+import android.content.Contextimport com.rtbishop.look4sat.network.RemoteSourceimport com.rtbishop.look4sat.persistence.LocalSourceimport com.rtbishop.look4sat.repo.DefaultRepository@@ -13,7 +15,17 @@ class RepoModule {@Singleton@Provides- fun provideDefaultRepository(localSource: LocalSource, remoteSource: RemoteSource): Repository {- return DefaultRepository(localSource, remoteSource)+ fun provideContentResolver(context: Context): ContentResolver {+ return context.applicationContext.contentResolver+ }++ @Singleton+ @Provides+ fun provideDefaultRepository(+ resolver: ContentResolver,+ localSource: LocalSource,+ remoteSource: RemoteSource+ ): Repository {+ return DefaultRepository(resolver, localSource, remoteSource)}}diff --git a/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt b/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.ktindex 1c949d8f..8819529a 100644--- a/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/network/RemoteDataSource.kt@@ -34,14 +34,12 @@ class RemoteDataSource @Inject constructor(private val client: OkHttpClient) : RemoteSource {- override suspend fun fetchTleStream(urlList: List<String>): InputStream {+ override suspend fun fetchTleStream(tleUrl: String): InputStream {val streamTable = Hashtable<String, InputStream>()withContext(Dispatchers.IO) {- urlList.forEach {- val request = Request.Builder().url(it).build()- val stream = client.newCall(request).execute().body()?.byteStream()- streamTable[it] = stream- }+ val request = Request.Builder().url(tleUrl).build()+ val stream = client.newCall(request).execute().body()?.byteStream()+ streamTable[tleUrl] = stream}return SequenceInputStream(streamTable.elements())}diff --git a/app/src/main/java/com/rtbishop/look4sat/network/RemoteSource.kt b/app/src/main/java/com/rtbishop/look4sat/network/RemoteSource.ktindex 8936b193..65e7654f 100644--- a/app/src/main/java/com/rtbishop/look4sat/network/RemoteSource.kt+++ b/app/src/main/java/com/rtbishop/look4sat/network/RemoteSource.kt@@ -5,7 +5,7 @@ import java.io.InputStreaminterface RemoteSource {- suspend fun fetchTleStream(urlList: List<String>): InputStream+ suspend fun fetchTleStream(tleUrl: String): InputStreamsuspend fun fetchTransmitters(): List<Transmitter>}diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.ktindex fd9ce80a..26fbf113 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt@@ -19,6 +19,8 @@package com.rtbishop.look4sat.repo+import android.content.ContentResolver+import android.net.Uriimport com.github.amsacode.predict4java.TLEimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.data.Transmitter@@ -29,12 +31,23 @@ import kotlinx.coroutines.withContextimport javax.inject.Injectclass DefaultRepository @Inject constructor(+ private val resolver: ContentResolver,private val localSource: LocalSource,private val remoteSource: RemoteSource) : Repository {- override suspend fun updateEntriesFrom(urlList: List<String>) {- val stream = remoteSource.fetchTleStream(urlList)+ override suspend fun updateEntriesFromFile(uri: Uri) {+ resolver.openInputStream(uri)?.use {+ withContext(Dispatchers.IO) {+ val tleList = TLE.importSat(it)+ val entries = tleList.map { SatEntry(it) }+ localSource.insertEntries(entries)+ }+ }+ }++ override suspend fun updateEntriesFromUrl(tleUrl: String) {+ val stream = remoteSource.fetchTleStream(tleUrl)withContext(Dispatchers.IO) {val tleList = TLE.importSat(stream)val entries = tleList.map { SatEntry(it) }diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.ktindex bc08bb37..58a431eb 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt@@ -1,11 +1,14 @@package com.rtbishop.look4sat.repo+import android.net.Uriimport com.rtbishop.look4sat.data.SatEntryimport com.rtbishop.look4sat.data.Transmitterinterface Repository {- suspend fun updateEntriesFrom(urlList: List<String>)+ suspend fun updateEntriesFromFile(uri: Uri)++ suspend fun updateEntriesFromUrl(tleUrl: String)suspend fun getAllEntries(): List<SatEntry>diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex fde42c16..c6bc2781 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -21,6 +21,7 @@ package com.rtbishop.look4sat.uiimport android.Manifestimport android.annotation.SuppressLint+import android.app.Activityimport android.content.Intentimport android.content.pm.ActivityInfoimport android.content.pm.PackageManager@@ -52,6 +53,7 @@ import javax.inject.Injectclass MainActivity : AppCompatActivity() {+ private val pickFileReqCode = 111private val permLocationCode = 101private val permLocation = Manifest.permission.ACCESS_FINE_LOCATIONprivate val permGranted = PackageManager.PERMISSION_GRANTED@@ -150,8 +152,17 @@ class MainActivity : AppCompatActivity() {requestLocationUpdate()it.lockButton()}- drawerBinding.drawerBtnTle.setOnClickListener {- viewModel.updateEntries()+ drawerBinding.drawerBtnTleFile.setOnClickListener {+ val openFileIntent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {+ addCategory(Intent.CATEGORY_OPENABLE)+ type = "text/*"+ }+ startActivityForResult(openFileIntent, pickFileReqCode)+ mainBinding.drawerLayout.closeDrawers()+ it.lockButton()+ }+ drawerBinding.drawerBtnTleUrl.setOnClickListener {+ viewModel.updateEntriesFromWeb()it.lockButton()}drawerBinding.drawerBtnTrans.setOnClickListener {@@ -204,4 +215,14 @@ class MainActivity : AppCompatActivity() {val navController = findNavController(R.id.nav_host)return navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()}++ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {+ if (requestCode == pickFileReqCode && resultCode == Activity.RESULT_OK) {+ data?.data?.also { uri ->+ viewModel.updateEntriesFromFile(uri)+ }+ } else {+ super.onActivityResult(requestCode, resultCode, data)+ }+ }}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 89a4dfa6..2c02d9af 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -20,6 +20,7 @@package com.rtbishop.look4sat.uiimport android.location.LocationManager+import android.net.Uriimport androidx.lifecycle.*import com.github.amsacode.predict4java.GroundStationPositionimport com.rtbishop.look4sat.data.Result@@ -46,7 +47,6 @@ class SharedViewModel @Inject constructor(private val _gsp = MutableLiveData<Result<GroundStationPosition>>().apply {value = Result.Success(prefsManager.getPosition())}- private val urlList = listOf("https://celestrak.com/NORAD/elements/active.txt")private var calculationJob: Job? = nullvar isFirstLaunch = true@@ -85,11 +85,25 @@ class SharedViewModel @Inject constructor(}}- fun updateEntries() {+ fun updateEntriesFromFile(uri: Uri) {viewModelScope.launch(Dispatchers.IO) {try {val selected = repository.getSelectedEntries().map { it.catNum }- repository.updateEntriesFrom(urlList)+ repository.updateEntriesFromFile(uri)+ repository.updateEntriesSelection(selected)+ _updateStatus.postValue(Result.Success(0))+ } catch (e: Exception) {+ _updateStatus.postValue(Result.Error(e))+ }+ }+ }++ fun updateEntriesFromWeb() {+ viewModelScope.launch(Dispatchers.IO) {+ try {+ val url = prefsManager.getTleUrl()+ val selected = repository.getSelectedEntries().map { it.catNum }+ repository.updateEntriesFromUrl(url)repository.updateEntriesSelection(selected)_updateStatus.postValue(Result.Success(0))} catch (e: Exception) {diff --git a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.ktindex 7a967f23..5cd802a2 100644--- a/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt+++ b/app/src/main/java/com/rtbishop/look4sat/utility/PrefsManager.kt@@ -36,10 +36,12 @@ class PrefsManager @Inject constructor(private val keyAltitude = "altitude"private val keyRefreshRate = "rate"private val keyCompass = "compass"+ private val keyTleUrl = "tleUrl"private val defaultHoursAhead = 8private val defaultMinEl = 16.0private val defaultRefreshRate = "3000"private val defaultGSP = "0.0"+ private val defaultTleUrl = "https://celestrak.com/NORAD/elements/active.txt"fun getHoursAhead(): Int {return preferences.getInt(keyHoursAhead, defaultHoursAhead)@@ -64,6 +66,10 @@ class PrefsManager @Inject constructor(return GroundStationPosition(lat, lon, alt)}+ fun getTleUrl(): String {+ return preferences.getString(keyTleUrl, defaultTleUrl)!!+ }+fun setHoursAhead(hours: Int) {preferences.edit {putInt(keyHoursAhead, hours)@@ -94,6 +100,12 @@ class PrefsManager @Inject constructor(}}+ fun setTleUrl(tleUrl: String) {+ preferences.edit {+ putString(keyTleUrl, tleUrl)+ }+ }+private fun SharedPreferences.Editor.putDouble(key: String, double: Double) {putLong(key, double.toRawBits())}diff --git a/app/src/main/res/drawable/ic_file_open.xml b/app/src/main/res/drawable/ic_file_open.xmlnew file mode 100644index 00000000..fa95c65b--- /dev/null+++ b/app/src/main/res/drawable/ic_file_open.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="32dp"+ android:height="32dp"+ android:viewportWidth="24.0"+ android:viewportHeight="24.0">+ <path+ android:fillColor="@color/themeIcon"+ android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z" />+</vector>diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xmlindex 6fcefad9..d8fdf3fe 100644--- a/app/src/main/res/layout/drawer_header.xml+++ b/app/src/main/res/layout/drawer_header.xml@@ -94,16 +94,26 @@android:id="@+id/drawer_btn_loc"style="@style/DrawerHeader.Button"android:layout_width="0dp"- android:layout_marginTop="4dp"android:drawableEnd="@drawable/ic_update_loc"android:text="@string/update_loc"- app:layout_constraintBottom_toTopOf="@+id/drawer_btn_tle"+ app:layout_constraintBottom_toTopOf="@+id/drawer_btn_tle_file"app:layout_constraintEnd_toStartOf="@+id/guidelineRight"app:layout_constraintStart_toStartOf="@+id/guidelineLeft"app:layout_constraintTop_toBottomOf="@+id/drawer_lon_value" /><androidx.appcompat.widget.AppCompatButton- android:id="@+id/drawer_btn_tle"+ android:id="@+id/drawer_btn_tle_file"+ style="@style/DrawerHeader.Button"+ android:layout_width="0dp"+ android:drawableEnd="@drawable/ic_file_open"+ android:text="@string/update_tle_file"+ app:layout_constraintBottom_toTopOf="@+id/drawer_btn_tle_url"+ app:layout_constraintEnd_toStartOf="@+id/guidelineRight"+ app:layout_constraintStart_toStartOf="@+id/guidelineLeft"+ app:layout_constraintTop_toBottomOf="@+id/drawer_btn_loc" />++ <androidx.appcompat.widget.AppCompatButton+ android:id="@+id/drawer_btn_tle_url"style="@style/DrawerHeader.Button"android:layout_width="0dp"android:drawableEnd="@drawable/ic_update_tle"@@ -111,7 +121,7 @@app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"app:layout_constraintEnd_toStartOf="@+id/guidelineRight"app:layout_constraintStart_toStartOf="@+id/guidelineLeft"- app:layout_constraintTop_toBottomOf="@+id/drawer_btn_loc" />+ app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle_file" /><androidx.appcompat.widget.AppCompatButtonandroid:id="@+id/drawer_btn_trans"@@ -122,7 +132,7 @@app:layout_constraintBottom_toTopOf="@+id/drawer_btn_github"app:layout_constraintEnd_toStartOf="@+id/guidelineRight"app:layout_constraintStart_toStartOf="@+id/guidelineLeft"- app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle" />+ app:layout_constraintTop_toBottomOf="@+id/drawer_btn_tle_url" /><androidx.appcompat.widget.AppCompatButtonandroid:id="@+id/drawer_btn_github"diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 21e744d4..72fef424 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -28,8 +28,10 @@<string name="update_loc">Update location</string><string name="update_loc_success">Location was updated</string><string name="update_loc_failure">Check your Location settings</string>- <string name="update_tle">Update TLE file</string>- <string name="update_tle_success">TLE file was updated</string>+ <string name="update_tle_file" translatable="false">Update TLE from file</string>+ <string name="update_tle_file_success" translatable="false">TLE was updated</string>+ <string name="update_tle">Update TLE from URL</string>+ <string name="update_tle_success">TLE was updated</string><string name="update_trans">Update transceivers</string><string name="update_trans_success">Transceivers database was updated</string><string name="update_failure">Check your internet connection</string>