Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Now using theme colors for RadarView and WorldMapView
Arty Bishop8bbd7cb4d230
diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.ktindex 8e1238c9..633682ab 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/RadarFragment.kt@@ -115,24 +115,24 @@ class RadarFragment : Fragment() {}private val radarPaint = Paint().apply {isAntiAlias = true- color = Color.parseColor("#C0C0C0")+ color = resources.getColor(R.color.lightOnDark, (activity as MainActivity).theme)style = Paint.Style.STROKEstrokeWidth = scale}private val txtPaint = Paint().apply {isAntiAlias = true- color = Color.parseColor("#FFE082")+ color = resources.getColor(R.color.themeAccent, (activity as MainActivity).theme)textSize = txtSize}- private val passPaint = Paint().apply {+ private val trackPaint = Paint().apply {isAntiAlias = true- color = Color.RED+ color = resources.getColor(R.color.satTrack, (activity as MainActivity).theme)style = Paint.Style.STROKEstrokeWidth = scale}private val satPaint = Paint().apply {isAntiAlias = true- color = Color.parseColor("#FFE082")+ color = resources.getColor(R.color.themeAccent, (activity as MainActivity).theme)style = Paint.Style.FILL}private val path: Path = Path()@@ -189,7 +189,7 @@ class RadarFragment : Fragment() {}startTime.time += delay}- cvs.drawPath(path, passPaint)+ cvs.drawPath(path, trackPaint)}private fun drawSatellite() {diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.ktindex f092db06..92c616f2 100644--- a/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/WorldMapFragment.kt@@ -2,7 +2,6 @@ package com.rtbishop.lookingsat.uiimport android.content.Contextimport android.graphics.Canvas-import android.graphics.Colorimport android.graphics.Paintimport android.graphics.Pathimport android.os.Bundle@@ -102,13 +101,13 @@ class WorldMapFragment : Fragment() {inner class TrackView(context: Context) : View(context) {private val groundTrackPaint = Paint().apply {isAntiAlias = true- color = Color.RED+ color = resources.getColor(R.color.satTrack, (activity as MainActivity).theme)style = Paint.Style.STROKEstrokeWidth = scale}private val footprintPaint = Paint().apply {isAntiAlias = true- color = Color.YELLOW+ color = resources.getColor(R.color.satFootprint, (activity as MainActivity).theme)style = Paint.Style.STROKEstrokeWidth = scale}@@ -120,17 +119,12 @@ class WorldMapFragment : Fragment() {val frameHeight = mapFrame.measuredHeightval currentTime = getDateFor(System.currentTimeMillis())val orbitalPeriod = (24 * 60 / selectedSat.meanmo).toInt()- val orbitEndTime = getDateFor(currentTime.time + orbitalPeriod * 60 * 1000)val satPos = predictor.getSatPos(currentTime)val footprintPositions = satPos.rangeCircle-- var positions = predictor.getPositions(currentTime, 60, orbitalPeriod, orbitalPeriod)- drawGroundTrack(canvas, frameWidth, frameHeight, positions)- positions = predictor.getPositions(orbitEndTime, 60, 1, orbitalPeriod)+ val positions = predictor.getPositions(currentTime, 60, 0, orbitalPeriod * 3)drawGroundTrack(canvas, frameWidth, frameHeight, positions)drawFootprint(canvas, frameWidth, frameHeight, footprintPositions)var longitude = rad2Deg(satPos.longitude)-if (longitude > 180.0) longitude -= 180.0else longitude += 180.0}diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xmlindex c590b626..0c0cc6e2 100644--- a/app/src/main/res/values/colors.xml+++ b/app/src/main/res/values/colors.xml@@ -6,4 +6,6 @@<color name="toolbarButton">#191919</color><color name="backgroundDark">#080808</color><color name="error">#800000</color>+ <color name="satTrack">#D50000</color>+ <color name="satFootprint">#FFE082</color></resources>