Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Moved the code from activity to ViewModel. Minor layout updates.
Arty Bishopdc62d660a836
diff --git a/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt b/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.ktindex 44e91d5e..d3e258bf 100644--- a/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/repo/Repository.kt@@ -1,9 +1,7 @@package com.rtbishop.lookingsat.repo-import android.util.Logimport com.rtbishop.lookingsat.api.RemoteDataSourceimport com.rtbishop.lookingsat.db.LocalDataSource-import java.io.IOExceptionimport java.io.InputStreamclass Repository(@@ -15,11 +13,7 @@ class Repository(}suspend fun updateTransmittersDatabase() {- try {- localSource.insertTransmitters(remoteSource.fetchTransmittersList())- } catch (exception: IOException) {- Log.d(this.javaClass.simpleName, exception.toString())- }+ localSource.insertTransmitters(remoteSource.fetchTransmittersList())}suspend fun getTransmittersForSat(id: Int): List<Transmitter> {diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.ktindex e604c188..720c936c 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt@@ -2,10 +2,8 @@ package com.rtbishop.lookingsat.uiimport android.Manifestimport android.content.Intent-import android.content.SharedPreferencesimport android.content.pm.ActivityInfoimport android.content.pm.PackageManager-import android.location.Locationimport android.net.Uriimport android.os.Bundleimport android.os.CountDownTimer@@ -21,7 +19,6 @@ import androidx.appcompat.widget.Toolbarimport androidx.constraintlayout.widget.ConstraintLayoutimport androidx.core.app.ActivityCompatimport androidx.core.content.ContextCompat-import androidx.core.content.editimport androidx.drawerlayout.widget.DrawerLayoutimport androidx.lifecycle.ViewModelProvidersimport androidx.navigation.findNavController@@ -29,28 +26,23 @@ import androidx.navigation.ui.AppBarConfigurationimport androidx.navigation.ui.navigateUpimport androidx.navigation.ui.setupActionBarWithNavControllerimport androidx.navigation.ui.setupWithNavController-import androidx.preference.PreferenceManager-import com.google.android.gms.location.FusedLocationProviderClient-import com.google.android.gms.location.LocationServicesimport com.google.android.material.navigation.NavigationViewimport com.rtbishop.lookingsat.Rimport com.rtbishop.lookingsat.vm.MainViewModelimport java.util.*import java.util.concurrent.TimeUnit-const val LOCATION_REQ = 101-const val LOCATION_PERM = Manifest.permission.ACCESS_FINE_LOCATION-const val GRANTED = PackageManager.PERMISSION_GRANTED-const val GITHUB_URL = "https://github.com/rt-bishop/LookingSat"-class MainActivity : AppCompatActivity() {+ private val permLocationCode = 101+ private val permLocation = Manifest.permission.ACCESS_FINE_LOCATION+ private val permGranted = PackageManager.PERMISSION_GRANTED+ private val githubUrl = "https://github.com/rt-bishop/LookingSat"+private lateinit var appBarConfig: AppBarConfigurationprivate lateinit var viewModel: MainViewModelprivate lateinit var timerLayout: ConstraintLayoutprivate lateinit var timeToAos: TextView- private lateinit var fusedLocationClient: FusedLocationProviderClient- private lateinit var preferences: SharedPreferencesprivate lateinit var drawerLat: TextViewprivate lateinit var drawerLon: TextViewprivate lateinit var drawerHeight: TextView@@ -61,39 +53,31 @@ class MainActivity : AppCompatActivity() {super.onCreate(savedInstanceState)setContentView(R.layout.activity_main)setupComponents()- setupNavigation()+ setupDrawer()setupTimer()- updateDrawerValues()+ updateLocation()}private fun setupComponents() {viewModel = ViewModelProviders.of(this).get(MainViewModel::class.java)- fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)- preferences = PreferenceManager.getDefaultSharedPreferences(this)timerLayout = findViewById(R.id.timer_layout)timeToAos = findViewById(R.id.time_to_aos)- }- private fun setupNavigation() {val toolbar: Toolbar = findViewById(R.id.toolbar)setSupportActionBar(toolbar)val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)val navView: NavigationView = findViewById(R.id.nav_view)val header = navView.getHeaderView(0)+drawerLat = header.findViewById(R.id.drawer_lat_value)drawerLon = header.findViewById(R.id.drawer_lon_value)drawerHeight = header.findViewById(R.id.drawer_height_value)drawerSubTitle = header.findViewById(R.id.drawer_link)drawerGetLocation = header.findViewById(R.id.drawer_get_location)- val navController = findNavController(R.id.nav_host)- appBarConfig = AppBarConfiguration(- setOf(- R.id.nav_sky,- R.id.nav_single_sat- ), drawerLayout- )+ val navController = findNavController(R.id.nav_host)+ appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout)setupActionBarWithNavController(navController, appBarConfig)navView.setupWithNavController(navController)@@ -113,22 +97,23 @@ class MainActivity : AppCompatActivity() {}}}+ }- drawerSubTitle.setOnClickListener {- openGitHub()- }+ private fun setupDrawer() {+ drawerSubTitle.setOnClickListener { goToGithub() }- drawerGetLocation.startAnimation(- AnimationUtils.loadAnimation(- this,- R.anim.pulse- )- )+ drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse))drawerGetLocation.setOnClickListener {it.isEnabled = falseupdateLocation()it.postDelayed({ it.isEnabled = true }, 3600)}++ viewModel.gsp.observe(this, androidx.lifecycle.Observer { gsp ->+ drawerLat.text = String.format("%.4f", gsp.latitude)+ drawerLon.text = String.format("%.4f", gsp.longitude)+ drawerHeight.text = String.format("%.1fm", gsp.heightAMSL)+ })}private fun setupTimer() {@@ -158,69 +143,31 @@ class MainActivity : AppCompatActivity() {}private fun updateLocation() {- if (ContextCompat.checkSelfPermission(- this,- LOCATION_PERM- ) != GRANTED- ) {- if (ActivityCompat.shouldShowRequestPermissionRationale(- this,- LOCATION_PERM- )- ) {+ if (ContextCompat.checkSelfPermission(this, permLocation) != permGranted) {+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, permLocation)) {Toast.makeText(this, "Missing permissions", Toast.LENGTH_LONG).show()} else {- ActivityCompat.requestPermissions(- this, arrayOf(LOCATION_PERM),- LOCATION_REQ- )+ ActivityCompat.requestPermissions(this, arrayOf(permLocation), permLocationCode)}} else {- getPreciseLocation()+ viewModel.updateLocation()}}- private fun getPreciseLocation() {- fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->- val lat = location?.latitude ?: 51.5074- val lon = location?.longitude ?: 0.1278- val height = location?.altitude ?: 48.0-- preferences.edit {- putDouble("LATITUDE", lat)- putDouble("LONGITUDE", lon)- putDouble("HEIGHT", height)- apply()- }- updateDrawerValues()- Toast.makeText(this, "Location was set", Toast.LENGTH_SHORT).show()- }- }-- private fun updateDrawerValues() {- val lat = preferences.getDouble("LATITUDE", 51.5074)- val lon = preferences.getDouble("LONGITUDE", 0.1278)- val height = preferences.getDouble("HEIGHT", 48.0)-- drawerLat.text = String.format("%.4f", lat)- drawerLon.text = String.format("%.4f", lon)- drawerHeight.text = String.format("%.1fm", height)+ private fun goToGithub() {+ val intentGitHub = Intent(Intent.ACTION_VIEW, Uri.parse(githubUrl))+ startActivity(intentGitHub)}- private fun openGitHub() {- val intentGitHub = Intent(Intent.ACTION_VIEW, Uri.parse(GITHUB_URL))- startActivity(intentGitHub)+ private fun exit() {+ finish()}- override fun onRequestPermissionsResult(- requestCode: Int,- permissions: Array<out String>,- grantResults: IntArray- ) {- when (requestCode) {- LOCATION_REQ -> {- if (grantResults.isNotEmpty() && grantResults[0] == GRANTED) {- getPreciseLocation()+ override fun onRequestPermissionsResult(reqCode: Int, perms: Array<out String>, res: IntArray) {+ when (reqCode) {+ permLocationCode -> {+ if (res.isNotEmpty() && res[0] == permGranted) {+ viewModel.updateLocation()}}}@@ -238,19 +185,8 @@ class MainActivity : AppCompatActivity() {override fun onOptionsItemSelected(item: MenuItem): Boolean {when (item.itemId) {- R.id.fetch_trans -> Toast.makeText(this, "Fetch transmit", Toast.LENGTH_SHORT).show()- R.id.save_to_db -> Toast.makeText(this, "Saving to DB", Toast.LENGTH_SHORT).show()- R.id.load_from_db -> Toast.makeText(this, "Loading from DB", Toast.LENGTH_SHORT).show()- R.id.fetch_tle -> Toast.makeText(this, "Fetching TLE", Toast.LENGTH_SHORT).show()- R.id.load_tle -> Toast.makeText(this, "Loading TLE", Toast.LENGTH_SHORT).show()- R.id.action_exit -> finish()+ R.id.menu_refresh -> Toast.makeText(this, "Refresh", Toast.LENGTH_SHORT).show()}return super.onOptionsItemSelected(item)}-}--fun SharedPreferences.Editor.putDouble(key: String, double: Double): SharedPreferences.Editor =- putLong(key, java.lang.Double.doubleToRawLongBits(double))--fun SharedPreferences.getDouble(key: String, default: Double) =- java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default)))\ No newline at end of file+}\ No newline at end of filediff --git a/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.kt b/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.ktindex 58a431c0..e7327ac8 100644--- a/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/vm/MainViewModel.kt@@ -1,11 +1,76 @@package com.rtbishop.lookingsat.vmimport android.app.Application+import android.content.Context+import android.content.SharedPreferences+import android.location.Location+import android.widget.Toast+import androidx.core.content.editimport androidx.lifecycle.AndroidViewModel+import androidx.lifecycle.LiveData+import androidx.lifecycle.MutableLiveData+import androidx.lifecycle.viewModelScope+import androidx.preference.PreferenceManager+import com.github.amsacode.predict4java.GroundStationPosition+import com.google.android.gms.location.LocationServicesimport com.rtbishop.lookingsat.Injectorimport com.rtbishop.lookingsat.repo.Repository+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.launch+import java.io.IOExceptionclass MainViewModel(application: Application) : AndroidViewModel(application) {- private var repository: Repository = Injector.provideRepository(application)-}\ No newline at end of file+ private val repository: Repository = Injector.provideRepository(application)+ private val preferences = PreferenceManager.getDefaultSharedPreferences(application)+ private val fusedLocationClient = LocationServices.getFusedLocationProviderClient(application)+ private val _gsp = MutableLiveData<GroundStationPosition>()+ val gsp: LiveData<GroundStationPosition> = _gsp++ fun updateLocation() {+ fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->+ val lat = location?.latitude ?: 51.5074+ val lon = location?.longitude ?: 0.1278+ val height = location?.altitude ?: 48.0++ preferences.edit {+ putDouble("LATITUDE", lat)+ putDouble("LONGITUDE", lon)+ putDouble("HEIGHT", height)+ apply()+ }+ _gsp.postValue(GroundStationPosition(lat, lon, height))+ }+ }++ fun updateTwoLineElementFile() {+ val fileName = "tles.txt"+ viewModelScope.launch(Dispatchers.IO) {+ try {+ getApplication<Application>().openFileOutput(fileName, Context.MODE_PRIVATE).use {+ it.write(repository.fetchTleStream().readBytes())+ }+ Toast.makeText(getApplication(), "TLE file was updated", Toast.LENGTH_SHORT).show()+ } catch (exception: IOException) {+ Toast.makeText(getApplication(), "Could not update TLE", Toast.LENGTH_SHORT).show()+ }+ }+ }++ fun updateTransmittersDatabase() {+ viewModelScope.launch(Dispatchers.IO) {+ try {+ repository.updateTransmittersDatabase()+ Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show()+ } catch (exception: IOException) {+ Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show()+ }+ }+ }+}++fun SharedPreferences.Editor.putDouble(key: String, double: Double): SharedPreferences.Editor =+ putLong(key, java.lang.Double.doubleToRawLongBits(double))++fun SharedPreferences.getDouble(key: String, default: Double) =+ java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default)))\ No newline at end of filediff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xmlnew file mode 100644index 00000000..6ff7a0cc--- /dev/null+++ b/app/src/main/res/drawable/ic_refresh.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="24.0"+ android:viewportHeight="24.0">+ <path+ android:fillColor="#FFFFFF"+ android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />+</vector>diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xmlindex 8ab9f3c2..63dc4b58 100644--- a/app/src/main/res/layout/app_bar_main.xml+++ b/app/src/main/res/layout/app_bar_main.xml@@ -18,16 +18,16 @@<androidx.constraintlayout.widget.ConstraintLayoutandroid:id="@+id/timer_layout"android:layout_width="match_parent"- android:layout_height="wrap_content"- android:layout_marginEnd="16dp">+ android:layout_height="wrap_content"><TextViewandroid:id="@+id/time_to_aos"android:layout_width="0dp"android:layout_height="wrap_content"+ android:layout_marginEnd="16dp"android:gravity="center"android:text="@string/next_aos_pattern"- android:textSize="32sp"+ android:textSize="30sp"app:layout_constraintBottom_toBottomOf="parent"app:layout_constraintEnd_toEndOf="parent"app:layout_constraintStart_toStartOf="parent"diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xmlindex 7ee3d8c0..9daf6e35 100644--- a/app/src/main/res/menu/main_menu.xml+++ b/app/src/main/res/menu/main_menu.xml@@ -1,21 +1,9 @@<?xml version="1.0" encoding="utf-8"?>-<menu xmlns:android="http://schemas.android.com/apk/res/android">+<menu xmlns:android="http://schemas.android.com/apk/res/android"+ xmlns:app="http://schemas.android.com/apk/res-auto"><item- android:id="@+id/fetch_trans"- android:title="@string/menu_fetch_transmitters" />- <item- android:id="@+id/save_to_db"- android:title="@string/menu_save_to_db" />- <item- android:id="@+id/load_from_db"- android:title="@string/menu_load_from_db" />- <item- android:id="@+id/fetch_tle"- android:title="@string/menu_fetch_tle" />- <item- android:id="@+id/load_tle"- android:title="@string/menu_load_tle" />- <item- android:id="@+id/action_exit"- android:title="@string/menu_exit" />+ android:id="@+id/menu_refresh"+ android:icon="@drawable/ic_refresh"+ android:title="@string/menu_refresh"+ app:showAsAction="always" /></menu>\ No newline at end of filediff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 63e25968..f561a911 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -19,12 +19,7 @@<string name="height">Height AMSL: </string><string name="height_def">48.0m</string>- <string name="menu_fetch_transmitters">Fetch Transmitters</string>- <string name="menu_save_to_db">Save to DB</string>- <string name="menu_load_from_db">Load from DB</string>- <string name="menu_fetch_tle">Fetch TLE</string>- <string name="menu_load_tle">Load TLE</string>- <string name="menu_exit">Exit</string>+ <string name="menu_refresh">Refresh</string><string name="next_aos_pattern">AOS in %02d:%02d:%02d</string><string name="drawer_locator">Drawer Locator</string>