Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added FINE_LOCATION permission checks. Added location update and save logic.
Arty Bishopf2e3d99a85ad
diff --git a/app/build.gradle b/app/build.gradleindex bbc38c0d..4a19b1cb 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -54,11 +54,14 @@ dependencies {// retrofitimplementation "com.squareup.retrofit2:retrofit:$retrofit"- implementation"com.squareup.retrofit2:converter-gson:$retrofit"+ implementation "com.squareup.retrofit2:converter-gson:$retrofit"// predict4javaimplementation "com.github.davidmoten:predict4java:$predict4java"+ // location+ implementation "com.google.android.gms:play-services-location:$google_play"+// testingtestImplementation "junit:junit:$junit"androidTestImplementation "androidx.test:runner:$runner"diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 700bfbde..b43e8818 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -3,6 +3,9 @@xmlns:tools="http://schemas.android.com/tools"package="com.rtbishop.lookingsat">+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />+ <uses-permission android:name="android.permission.INTERNET" />+<applicationandroid:allowBackup="false"android:icon="@mipmap/ic_launcher"diff --git a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.ktindex 71e47c6a..95ed41a2 100644--- a/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/MainActivity.kt@@ -1,6 +1,10 @@package com.rtbishop.lookingsat+import android.Manifest+import android.content.SharedPreferencesimport android.content.pm.ActivityInfo+import android.content.pm.PackageManager+import android.location.Locationimport android.os.Bundleimport android.os.CountDownTimerimport android.view.Menu@@ -11,6 +15,9 @@ import android.widget.Toastimport androidx.appcompat.app.AppCompatActivityimport androidx.appcompat.widget.Toolbarimport androidx.constraintlayout.widget.ConstraintLayout+import androidx.core.app.ActivityCompat+import androidx.core.content.ContextCompat+import androidx.core.content.editimport androidx.drawerlayout.widget.DrawerLayoutimport androidx.lifecycle.ViewModelProvidersimport androidx.navigation.findNavController@@ -18,27 +25,38 @@ 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 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+class MainActivity : AppCompatActivity() {private lateinit var appBarConfig: AppBarConfiguration- private lateinit var mainViewModel: MainViewModel+ private lateinit var viewModel: MainViewModelprivate lateinit var timerLayout: ConstraintLayoutprivate lateinit var timeToAos: TextView+ private lateinit var fusedLocationClient: FusedLocationProviderClient+ private lateinit var preferences: SharedPreferencesoverride fun onCreate(savedInstanceState: Bundle?) {super.onCreate(savedInstanceState)setContentView(R.layout.activity_main)- setupViews()+ setupComponents()setupNavigation()setupTimer()}- private fun setupViews() {- mainViewModel = ViewModelProviders.of(this).get(MainViewModel::class.java)+ 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)}@@ -99,6 +117,47 @@ class MainActivity : AppCompatActivity() {timer.start()}+ private fun updateLocation() {+ fusedLocationClient.lastLocation.addOnSuccessListener { location: Location? ->+ val currentLat = location?.latitude+ val currentLon = location?.longitude+ val currentHeight = location?.altitude++ preferences.edit {+ putString("LATITUDE", currentLat.toString())+ putString("LONGITUDE", currentLon.toString())+ putString("HEIGHT", currentHeight.toString())+ apply()+ }+ }+ }++ private fun checkPermissions() {+ if (ContextCompat.checkSelfPermission(this, LOCATION_PERM) != GRANTED) {+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, LOCATION_PERM)) {+ Toast.makeText(this, "Missing permissions", Toast.LENGTH_LONG).show()+ } else {+ ActivityCompat.requestPermissions(this, arrayOf(LOCATION_PERM), LOCATION_REQ)+ }+ } else {+ updateLocation()+ }+ }++ override fun onRequestPermissionsResult(+ requestCode: Int,+ permissions: Array<out String>,+ grantResults: IntArray+ ) {+ when (requestCode) {+ LOCATION_REQ -> {+ if (grantResults.isNotEmpty() && grantResults[0] == GRANTED) {+ updateLocation()+ }+ }+ }+ }+override fun onSupportNavigateUp(): Boolean {val navController = findNavController(R.id.nav_host)return navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()@@ -111,11 +170,8 @@ class MainActivity : AppCompatActivity() {override fun onOptionsItemSelected(item: MenuItem): Boolean {when (item.itemId) {- R.id.fetch_trans -> Toast.makeText(- this,- "Fetching transmitters",- Toast.LENGTH_SHORT- ).show()+ R.id.update_location -> checkPermissions()+ 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()diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xmlindex 5c2675d2..4d61720f 100644--- a/app/src/main/res/menu/main_menu.xml+++ b/app/src/main/res/menu/main_menu.xml@@ -1,22 +1,25 @@<?xml version="1.0" encoding="utf-8"?><menu xmlns:android="http://schemas.android.com/apk/res/android">+ <item+ android:id="@+id/update_location"+ android:title="@string/menu_update_location" /><itemandroid:id="@+id/fetch_trans"- android:title="Fetch Transmitters" />+ android:title="@string/menu_fetch_transmitters" /><itemandroid:id="@+id/save_to_db"- android:title="Save to DB" />+ android:title="@string/menu_save_to_db" /><itemandroid:id="@+id/load_from_db"- android:title="Load from DB" />+ android:title="@string/menu_load_from_db" /><itemandroid:id="@+id/fetch_tle"- android:title="Fetch TLE" />+ android:title="@string/menu_fetch_tle" /><itemandroid:id="@+id/load_tle"- android:title="Load TLE" />+ android:title="@string/menu_load_tle" /><itemandroid:id="@+id/action_exit"- android:title="Exit" />+ android:title="@string/menu_exit" /></menu>\ No newline at end of filediff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 504fd211..e31d843e 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -22,6 +22,14 @@<string name="height_def">64</string><string name="height_summary">Ground station height in meters AMSL</string>+ <string name="menu_update_location">Update location</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="next_aos_pattern">Next AOS in %02d:%02d:%02d</string><string name="map_content">Nasa Map</string><string name="placeholder">Placeholder</string>diff --git a/build.gradle b/build.gradleindex 5daa83f7..d61d33a0 100644--- a/build.gradle+++ b/build.gradle@@ -5,7 +5,7 @@ buildscript {repositories {google()jcenter()-+}dependencies {classpath 'com.android.tools.build:gradle:3.5.1'@@ -41,6 +41,8 @@ ext {predict4java = '1.3.1'+ google_play = '17.0.0'+junit = "4.12"runner = '1.1.1'espresso = '3.2.0'