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 url
Arty Bishopd804c20bd0b4
diff --git a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.ktindex 26fbf113..60007e11 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/DefaultRepository.kt@@ -36,8 +36,8 @@ class DefaultRepository @Inject constructor(private val remoteSource: RemoteSource) : Repository {- override suspend fun updateEntriesFromFile(uri: Uri) {- resolver.openInputStream(uri)?.use {+ override suspend fun updateEntriesFromFile(tleUri: Uri) {+ resolver.openInputStream(tleUri)?.use {withContext(Dispatchers.IO) {val tleList = TLE.importSat(it)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 58a431eb..81c68b37 100644--- a/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt+++ b/app/src/main/java/com/rtbishop/look4sat/repo/Repository.kt@@ -6,7 +6,7 @@ import com.rtbishop.look4sat.data.Transmitterinterface Repository {- suspend fun updateEntriesFromFile(uri: Uri)+ suspend fun updateEntriesFromFile(tleUri: Uri)suspend fun updateEntriesFromUrl(tleUrl: String)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.ktindex c6bc2781..e12c3838 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/MainActivity.kt@@ -22,6 +22,7 @@ package com.rtbishop.look4sat.uiimport android.Manifestimport android.annotation.SuppressLintimport android.app.Activity+import android.app.AlertDialogimport android.content.Intentimport android.content.pm.ActivityInfoimport android.content.pm.PackageManager@@ -33,6 +34,7 @@ import android.widget.Toastimport androidx.appcompat.app.AppCompatActivityimport androidx.core.app.ActivityCompatimport androidx.core.content.ContextCompat+import androidx.core.widget.addTextChangedListenerimport androidx.lifecycle.Observerimport androidx.lifecycle.ViewModelProviderimport androidx.lifecycle.lifecycleScope@@ -46,6 +48,7 @@ import com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.dagger.ViewModelFactoryimport com.rtbishop.look4sat.data.Resultimport com.rtbishop.look4sat.databinding.ActivityMainBinding+import com.rtbishop.look4sat.databinding.DialogTleUrlBindingimport com.rtbishop.look4sat.databinding.DrawerHeaderBindingimport kotlinx.coroutines.delayimport kotlinx.coroutines.launch@@ -162,7 +165,8 @@ class MainActivity : AppCompatActivity() {it.lockButton()}drawerBinding.drawerBtnTleUrl.setOnClickListener {- viewModel.updateEntriesFromWeb()+ showTleUrlDialog()+ mainBinding.drawerLayout.closeDrawers()it.lockButton()}drawerBinding.drawerBtnTrans.setOnClickListener {@@ -177,6 +181,27 @@ class MainActivity : AppCompatActivity() {drawerBinding.drawerBtnExit.setOnClickListener { finish() }}+ private fun showTleUrlDialog() {+ var tleUrl = ""+ val dialogBinding = DialogTleUrlBinding.inflate(layoutInflater).apply {+ dialogTleInput.addTextChangedListener {+ tleUrl = it.toString()+ }+ dialogTleNeg.setOnClickListener {++ }+ dialogTlePos.setOnClickListener {++ }+ }++ AlertDialog.Builder(this).apply {+ setView(dialogBinding.root)+ create()+ show()+ }+ }+private fun toast(message: String) {Toast.makeText(this, message, Toast.LENGTH_SHORT).show()}diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.ktindex 2c02d9af..1ccbc01e 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/SharedViewModel.kt@@ -98,10 +98,15 @@ class SharedViewModel @Inject constructor(}}- fun updateEntriesFromWeb() {+ fun updateEntriesFromWeb(tleUrl: String? = null) {viewModelScope.launch(Dispatchers.IO) {try {- val url = prefsManager.getTleUrl()+ val url = if (tleUrl.isNullOrEmpty()) {+ prefsManager.getTleUrl()+ } else {+ prefsManager.setTleUrl(tleUrl)+ tleUrl+ }val selected = repository.getSelectedEntries().map { it.catNum }repository.updateEntriesFromUrl(url)repository.updateEntriesSelection(selected)diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.ktindex e941ac0b..dc88ca3a 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PassListFragment.kt@@ -139,9 +139,9 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {etHoursAhead.setText(hoursAhead.toString())etMinEl.setText(minEl.toString())- val builder = AlertDialog.Builder(mainActivity)- builder.setTitle(getString(R.string.dialog_filter_passes))- .setPositiveButton(getString(R.string.btn_ok)) { _, _ ->+ AlertDialog.Builder(mainActivity).apply {+ setTitle(getString(R.string.dialog_filter_passes))+ setPositiveButton(getString(R.string.btn_ok)) { _, _ ->val hoursStr = etHoursAhead.text.toString()val elevationStr = etMinEl.text.toString()if (hoursStr.isNotEmpty() && elevationStr.isNotEmpty()) {@@ -174,12 +174,13 @@ class PassListFragment : Fragment(R.layout.fragment_pass_list) {).show()}- .setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ ->+ setNegativeButton(getString(R.string.btn_cancel)) { dialog, _ ->dialog.cancel()}- .setView(satPassPrefView)- .create()- .show()+ setView(satPassPrefView)+ create()+ show()+ }}private fun showSelectSatDialog(diff --git a/app/src/main/res/layout/dialog_sat_entry.xml b/app/src/main/res/layout/dialog_sat_entry.xmlindex 081f50da..c1737a8d 100644--- a/app/src/main/res/layout/dialog_sat_entry.xml+++ b/app/src/main/res/layout/dialog_sat_entry.xml@@ -29,10 +29,10 @@android:layout_width="0dp"android:layout_height="wrap_content"android:layout_marginStart="8dp"- android:layout_marginTop="4dp"+ android:layout_marginTop="8dp"android:layout_marginEnd="8dp"android:text="@string/dialog_select_sat"- android:textSize="21sp"+ android:textSize="18sp"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintHorizontal_bias="0.0"app:layout_constraintStart_toStartOf="parent"@@ -42,8 +42,9 @@android:id="@+id/dialog_search"android:layout_width="0dp"android:layout_height="wrap_content"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ android:layout_marginTop="4dp"+ app:layout_constraintEnd_toEndOf="@+id/dialog_title"+ app:layout_constraintStart_toStartOf="@+id/dialog_title"app:layout_constraintTop_toBottomOf="@+id/dialog_title" /><androidx.recyclerview.widget.RecyclerView@@ -53,18 +54,17 @@android:layout_marginTop="4dp"android:layout_marginBottom="8dp"app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative"- app:layout_constraintEnd_toEndOf="parent"- app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintEnd_toEndOf="@+id/dialog_title"+ app:layout_constraintStart_toStartOf="@+id/dialog_title"app:layout_constraintTop_toBottomOf="@+id/dialog_search" /><TextViewandroid:id="@+id/dialog_btn_neutral"style="@style/SatEntryDialogText"android:layout_marginStart="8dp"- android:layout_marginBottom="4dp"android:text="@string/btn_all_none"- app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintStart_toStartOf="parent" />+ app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_negative"+ app:layout_constraintStart_toStartOf="@+id/dialog_recycler" /><TextViewandroid:id="@+id/dialog_btn_negative"@@ -79,10 +79,10 @@style="@style/SatEntryDialogText"android:layout_width="36dp"android:layout_marginEnd="8dp"- android:layout_marginBottom="4dp"+ android:layout_marginBottom="8dp"android:gravity="end"android:text="@string/btn_ok"app:layout_constraintBottom_toBottomOf="parent"- app:layout_constraintEnd_toEndOf="parent" />+ app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" /></androidx.constraintlayout.widget.ConstraintLayout>diff --git a/app/src/main/res/layout/dialog_tle_url.xml b/app/src/main/res/layout/dialog_tle_url.xmlnew file mode 100644index 00000000..98a768a8--- /dev/null+++ b/app/src/main/res/layout/dialog_tle_url.xml@@ -0,0 +1,53 @@+<?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/dialogTle"+ android:layout_width="match_parent"+ android:layout_height="wrap_content">++ <TextView+ android:id="@+id/dialotTleTitle"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginStart="16dp"+ android:layout_marginTop="12dp"+ android:text="TextView"+ app:layout_constraintStart_toStartOf="parent"+ app:layout_constraintTop_toTopOf="parent" />++ <EditText+ android:id="@+id/dialogTleInput"+ android:layout_width="0dp"+ android:layout_height="wrap_content"+ android:layout_marginTop="8dp"+ android:hint="https://server/with/tle.txt"+ android:importantForAutofill="no"+ android:inputType="textWebEditText"+ app:layout_constraintEnd_toEndOf="@+id/dialogTlePos"+ app:layout_constraintStart_toStartOf="@+id/dialotTleTitle"+ app:layout_constraintTop_toBottomOf="@+id/dialotTleTitle" />++ <TextView+ android:id="@+id/dialogTleNeg"+ style="@style/SatEntryDialogText"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:layout_marginEnd="24dp"+ android:text="@string/btn_cancel"+ app:layout_constraintBaseline_toBaselineOf="@+id/dialogTlePos"+ app:layout_constraintEnd_toStartOf="@+id/dialogTlePos" />++ <TextView+ android:id="@+id/dialogTlePos"+ style="@style/SatEntryDialogText"+ android:layout_width="36dp"+ android:layout_marginTop="8dp"+ android:layout_marginEnd="16dp"+ android:layout_marginBottom="12dp"+ android:gravity="end"+ android:text="@string/btn_ok"+ app:layout_constraintBottom_toBottomOf="parent"+ app:layout_constraintEnd_toEndOf="parent"+ app:layout_constraintTop_toBottomOf="@+id/dialogTleInput" />++</androidx.constraintlayout.widget.ConstraintLayout>\ No newline at end of file