diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt index 5c1c1d69..901f8ef4 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt @@ -37,6 +37,7 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false) private val satIdFormat = context.getString(R.string.pass_satId) private val azFormat = context.getString(R.string.pat_azimuth) + private val altFormat = context.getString(R.string.pat_altitude) private val elevFormat = context.getString(R.string.pat_elevation) private val aosAzFormat = context.getString(R.string.pass_aosAz) private val maxElFormat = context.getString(R.string.pass_maxEl) @@ -143,14 +144,13 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false) RecyclerView.ViewHolder(binding.root) { fun bind(satPass: SatPass) { - val satPos = satPass.predictor.getSatPos(satPass.pass.startTime) - val azimuth = Math.toDegrees(satPos.azimuth) - + val satPos = satPass.predictor.getSatPos(Date()) binding.apply { - passGeoName.text = satPass.tle.name - passGeoId.text = String.format(satIdFormat, satPass.tle.catnum) - passGeoAz.text = String.format(azFormat, azimuth) - passGeoEl.text = String.format(elevFormat, satPass.pass.maxEl) + passGeoSatName.text = satPass.tle.name + passGeoSatId.text = String.format(satIdFormat, satPass.tle.catnum) + passGeoAz.text = String.format(azFormat, Math.toDegrees(satPos.azimuth)) + passGeoAlt.text = String.format(altFormat, satPos.altitude) + passGeoEl.text = String.format(elevFormat, Math.toDegrees(satPos.elevation)) } itemView.setOnClickListener { diff --git a/app/src/main/res/layout/item_pass_geo.xml b/app/src/main/res/layout/item_pass_geo.xml index 29b84349..369f43d4 100644 --- a/app/src/main/res/layout/item_pass_geo.xml +++ b/app/src/main/res/layout/item_pass_geo.xml @@ -41,42 +41,51 @@ app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toEndOf="@+id/pass_geo_satName" /> + app:layout_constraintStart_toStartOf="@+id/pass_geo_satName" + app:layout_constraintTop_toBottomOf="@+id/pass_geo_satName" /> + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5c92362b..df72e2c5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -49,7 +49,7 @@ Инверсия: %s Не найдены трансиверы для этого спутника - Аз: %.1f° + Азим: %.1f° Элев: %.1f° Дист: %.0fкм Выс: %.0fкм