mckero/Look4Sat-rt-bishop
1
0 Fork 0
mirror of https://github.com/rt-bishop/Look4Sat.git synced 2026-10-07 13:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added textViews with pass info to the radarFragment. Minor refactoring.

Browse Source
This commit is contained in:
Arty Bishop committed 2019-11-28 22:58:26 +00:00
1 parent e88b78d4c6
commit d7a094a1e2
5 files changed
+97 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/fragment_radar.xml
+39
View File
@@ -25,4 +25,43 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_sky_frame" />
<TextView
android:id="@+id/radar_sat_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/card_sat_name"
app:layout_constraintEnd_toEndOf="@+id/radar_aos"
app:layout_constraintStart_toStartOf="@+id/radar_aos"
app:layout_constraintTop_toTopOf="@+id/radar_maxEl" />
<TextView
android:id="@+id/radar_maxEl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:text="@string/card_max_el"
app:layout_constraintEnd_toEndOf="@+id/radar_sky_frame"
app:layout_constraintTop_toTopOf="@+id/radar_sky_frame" />
<TextView
android:id="@+id/radar_aos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_aos_time"
app:layout_constraintBottom_toBottomOf="@+id/radar_sky_frame"
app:layout_constraintStart_toStartOf="@+id/radar_sky_frame" />
<TextView
android:id="@+id/radar_los"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_los_time"
app:layout_constraintBottom_toBottomOf="@+id/radar_sky_frame"
app:layout_constraintEnd_toEndOf="@+id/radar_sky_frame" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/sat_pass_card.xml
-15
View File
@@ -71,20 +71,5 @@
app:layout_constraintStart_toStartOf="@+id/card_pass_start"
app:layout_constraintTop_toBottomOf="@+id/card_max_el" />
<TextView
android:id="@+id/card_pass_aos"
style="@style/CardSatPass.SideText"
android:layout_marginEnd="4dp"
android:text="@string/card_pass_aos"
app:layout_constraintBaseline_toBaselineOf="@+id/card_pass_start"
app:layout_constraintEnd_toStartOf="@+id/card_pass_start" />
<TextView
android:id="@+id/card_pass_los"
style="@style/CardSatPass.SideText"
android:text="@string/card_pass_los"
app:layout_constraintBaseline_toBaselineOf="@+id/card_pass_end"
app:layout_constraintEnd_toEndOf="@+id/card_pass_aos" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/values/strings.xml
+3 -5
View File
@@ -22,12 +22,10 @@
<string name="menu_about">About the App</string>
<string name="card_sat_name">Meteor M2–2</string>
<string name="card_pass_vector">V: 180° -> 360°</string>
<string name="card_pass_vector">Az: 180° -> 360°</string>
<string name="card_max_el">75.5°</string>
<string name="card_pass_aos">AOS -</string>
<string name="card_pass_los">LOS -</string>
<string name="card_pass_aos_time">13:14:15</string>
<string name="card_pass_los_time">16:17:18</string>
<string name="card_pass_aos_time">AOS - 13:14:15</string>
<string name="card_pass_los_time">LOS - 16:17:18</string>
<string name="btn_ok">OK</string>
<string name="btn_cancel">Cancel</string>