mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-02 03:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed LEO sat item view holder

Browse Source
This commit is contained in:
Arty Bishop committed 2020-11-25 20:21:36 +00:00
1 parent 2fbb2a2733
commit 45b51ad65a
4 files changed
+92 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/rtbishop/look4sat/ui/adapters/PassesAdapter.kt
+20 -10
View File
@@ -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<SatPass> = mutableListOf()
fun setList(list: MutableList<SatPass>) {
@@ -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
}
app/src/main/res/layout/item_pass_leo.xml
+62 -31
View File
@@ -41,13 +41,15 @@
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_losAz"
android:id="@+id/pass_leo_satName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_los_az"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_satId"
app:layout_constraintStart_toEndOf="@+id/pass_leo_aosAz" />
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" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_satId"
@@ -59,47 +61,76 @@
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_satName"
app:layout_constraintEnd_toEndOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_maxEl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pat_elevation"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_satName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:text="@string/pass_satName"
android:textColor="@color/themeLight"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_aosAz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:text="@string/pass_aos_az"
android:layout_marginTop="2dp"
android:text="@string/pass_aosAz"
app:layout_constraintEnd_toStartOf="@+id/pass_leo_losAz"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/pass_leo_satName"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_satName" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_maxEl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_maxEl"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_losAz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_losAz"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_aosAz"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_satId"
app:layout_constraintStart_toEndOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/pass_startTime"
app:layout_constraintEnd_toStartOf="@+id/pass_leo_end"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_tca"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_tcaTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
app:layout_constraintStart_toStartOf="@+id/pass_leo_start" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/pass_leo_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_endTime"
app:layout_constraintBaseline_toBaselineOf="@+id/pass_leo_start"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/pass_leo_start" />
<ProgressBar
android:id="@+id/pass_leo_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="14dp"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
app:layout_constraintBottom_toBottomOf="@+id/pass_leo_bg"
app:layout_constraintEnd_toEndOf="@+id/pass_leo_losAz"
app:layout_constraintStart_toStartOf="@+id/pass_leo_aosAz"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_aosAz" />
app:layout_constraintEnd_toEndOf="@+id/pass_leo_end"
app:layout_constraintStart_toStartOf="@+id/pass_leo_start"
app:layout_constraintTop_toBottomOf="@+id/pass_leo_tca" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/values-ru/strings.xml
+4
View File
@@ -40,6 +40,10 @@
<string name="passes_error">Нет выбранных спутников</string>
<string name="pass_aosAz">НПС — %2d°</string>
<string name="pass_maxEl">МаксЭлев: %.1f°</string>
<string name="pass_losAz">%2d° — КПС</string>
<string name="trans_mode">Модуляция: %s</string>
<string name="trans_no_mode">Модуляция: нет</string>
<string name="trans_inverted">Инверсия: %s</string>
app/src/main/res/values/strings.xml
+6 -3
View File
@@ -48,9 +48,12 @@
<string name="pass_satName" translatable="false">%s</string>
<string name="pass_satId" translatable="false">Id:%d</string>
<string name="pass_aos_az" translatable="false">%s — %2d°</string>
<string name="pass_los_az" translatable="false">%2d° — %s</string>
<string name="pass_dateTime" translatable="false">HH:mm:ss</string>
<string name="pass_aosAz">AOS — %2d°</string>
<string name="pass_maxEl">MaxEl: %.1f°</string>
<string name="pass_losAz">%2d° — LOS</string>
<string name="pass_startTime" translatable="false">EEE — HH:mm:ss</string>
<string name="pass_tcaTime" translatable="false">HH:mm:ss</string>
<string name="pass_endTime" translatable="false">HH:mm:ss — EEE</string>
<string name="trans_mode">Mode: %s</string>
<string name="trans_no_mode">Mode: null</string>