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 91a0434e..5c1c1d69 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 @@ -38,11 +38,16 @@ 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 elevFormat = context.getString(R.string.pat_elevation) - private val aosAzFormat = context.getString(R.string.pass_aos_az) - private val losAzFormat = context.getString(R.string.pass_los_az) - private val dateFormat = context.getString(R.string.pass_dateTime) + private val aosAzFormat = context.getString(R.string.pass_aosAz) + private val maxElFormat = context.getString(R.string.pass_maxEl) + private val losAzFormat = context.getString(R.string.pass_losAz) + private val startTimeFormat = context.getString(R.string.pass_startTime) + private val tcaTimeFormat = context.getString(R.string.pass_tcaTime) + private val endTimeFormat = context.getString(R.string.pass_endTime) private val timeZoneUTC = TimeZone.getTimeZone("UTC") - private val simpleDateFormat = SimpleDateFormat(dateFormat, Locale.getDefault()) + private val startFormat = SimpleDateFormat(startTimeFormat, Locale.getDefault()) + private val tcaFormat = SimpleDateFormat(tcaTimeFormat, Locale.getDefault()) + private val endFormat = SimpleDateFormat(endTimeFormat, Locale.getDefault()) private var satPassList: MutableList = mutableListOf() fun setList(list: MutableList) { @@ -109,14 +114,19 @@ class PassesAdapter(context: Context, private val shouldUseUTC: Boolean = false) fun bind(satPass: SatPass) { binding.apply { - if (shouldUseUTC) simpleDateFormat.timeZone = timeZoneUTC - val startTime = simpleDateFormat.format(satPass.pass.startTime) - val endTime = simpleDateFormat.format(satPass.pass.endTime) + if (shouldUseUTC) { + startFormat.timeZone = timeZoneUTC + tcaFormat.timeZone = timeZoneUTC + endFormat.timeZone = timeZoneUTC + } passLeoSatName.text = satPass.tle.name passLeoSatId.text = String.format(satIdFormat, satPass.tle.catnum) - passLeoAosAz.text = String.format(aosAzFormat, startTime, satPass.pass.aosAzimuth) - passLeoMaxEl.text = String.format(elevFormat, satPass.pass.maxEl) - passLeoLosAz.text = String.format(losAzFormat, satPass.pass.losAzimuth, endTime) + passLeoAosAz.text = String.format(aosAzFormat, satPass.pass.aosAzimuth) + passLeoMaxEl.text = String.format(maxElFormat, satPass.pass.maxEl) + passLeoLosAz.text = String.format(losAzFormat, satPass.pass.losAzimuth) + passLeoStart.text = startFormat.format(satPass.pass.startTime) + passLeoTca.text = tcaFormat.format(satPass.pass.tca) + passLeoEnd.text = endFormat.format(satPass.pass.endTime) passLeoProgress.progress = satPass.progress } diff --git a/app/src/main/res/layout/item_pass_leo.xml b/app/src/main/res/layout/item_pass_leo.xml index 457579ab..d55e2f5d 100644 --- a/app/src/main/res/layout/item_pass_leo.xml +++ b/app/src/main/res/layout/item_pass_leo.xml @@ -41,13 +41,15 @@ app:layout_constraintTop_toTopOf="parent" /> + android:layout_marginStart="6dp" + android:layout_marginTop="6dp" + android:text="@string/pass_satName" + android:textColor="@color/themeLight" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - + + + + + + + + + + + app:layout_constraintEnd_toEndOf="@+id/pass_leo_end" + app:layout_constraintStart_toStartOf="@+id/pass_leo_start" + app:layout_constraintTop_toBottomOf="@+id/pass_leo_tca" /> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b8cd29e7..5c92362b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -40,6 +40,10 @@ Нет выбранных спутников + НПС — %2d° + МаксЭлев: %.1f° + %2d° — КПС + Модуляция: %s Модуляция: нет Инверсия: %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6792b3fa..e5e3382d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,9 +48,12 @@ %s Id:%d - %s — %2d° - %2d° — %s - HH:mm:ss + AOS — %2d° + MaxEl: %.1f° + %2d° — LOS + EEE — HH:mm:ss + HH:mm:ss + HH:mm:ss — EEE Mode: %s Mode: null