diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt index 27b8fcfc..5ab9dbbe 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapViewFragment.kt @@ -92,9 +92,8 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) { binding.fabMap.setOnClickListener { showSelectSatDialog(satPassList) } selectedSat = satPassList.first().tle predictor = satPassList.first().predictor - mapView = MapView(mainActivity) + mapView = MapView(mainActivity, gsp) mapView.setList(satPassList) - mapView.setGSP(gsp) mapView.setChecked(checkedItem) binding.frameMap.addView(mapView) refreshView() @@ -132,8 +131,6 @@ class MapViewFragment : Fragment(R.layout.fragment_map_view) { checkedItem = which selectedSat = list[which].tle predictor = list[which].predictor - mapView.setList(satPassList) - mapView.setGSP(gsp) mapView.setChecked(checkedItem) mapView.invalidate() dialog.dismiss() diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/MapView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/views/MapView.kt index 3d82db8f..a09329e1 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/views/MapView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/views/MapView.kt @@ -16,6 +16,10 @@ import kotlin.math.abs class MapView(context: Context) : View(context) { + constructor(context: Context, groundStationPosition: GroundStationPosition) : this(context) { + gsp = groundStationPosition + } + private lateinit var passList: List private lateinit var gsp: GroundStationPosition private lateinit var selectedSat: TLE @@ -62,10 +66,6 @@ class MapView(context: Context) : View(context) { passList = satPassList } - fun setGSP(groundStationPosition: GroundStationPosition) { - gsp = groundStationPosition - } - fun setChecked(item: Int) { checked = item selectedSat = passList[checked].tle diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt index 205a05c0..3088772b 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/views/PolarView.kt @@ -2,7 +2,6 @@ package com.rtbishop.look4sat.ui.views import android.content.Context import android.graphics.Canvas -import android.graphics.Matrix import android.graphics.Paint import android.graphics.Path import android.view.View @@ -24,7 +23,6 @@ class PolarView(context: Context) : View(context) { private val radius = polarWidth * 0.49f private val txtSize = scale * 15 private val path: Path = Path() - private val mMatrix = Matrix() var azimuth = 0f private val radarPaint = Paint().apply { @@ -51,7 +49,6 @@ class PolarView(context: Context) : View(context) { } override fun onDraw(canvas: Canvas) { -// Log.w("myTag", "$measuredWidth, $measuredHeight") canvas.rotate(-azimuth, polarCenter, polarCenter) canvas.translate(polarCenter, polarCenter) drawRadarView(canvas)