mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-02 19:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now showing the active transmitters of the selected satellite in the RadarView recycler

Browse Source
This commit is contained in:
Arty Bishop committed 2019-12-01 14:57:52 +00:00
1 parent 52b23bf628
commit b44ff7272f
9 files changed
+283 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/card_transmitter.xml
+57
View File
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_trans"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
app:cardElevation="4dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/trans_description"
style="@style/CardTransText"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:text="@string/trans_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/trans_downlink"
style="@style/CardTransText"
android:text="@string/trans_downlink"
app:layout_constraintStart_toStartOf="@+id/trans_description"
app:layout_constraintTop_toBottomOf="@+id/trans_description" />
<TextView
android:id="@+id/trans_uplink"
style="@style/CardTransText"
android:text="@string/trans_uplink"
app:layout_constraintStart_toStartOf="@+id/trans_description"
app:layout_constraintTop_toBottomOf="@+id/trans_downlink" />
<TextView
android:id="@+id/trans_mode"
style="@style/CardTransText"
android:layout_marginBottom="4dp"
android:text="@string/trans_mode"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/trans_description"
app:layout_constraintTop_toBottomOf="@+id/trans_uplink" />
<TextView
android:id="@+id/trans_inverted"
style="@style/CardTransText"
android:layout_marginEnd="8dp"
android:text="@string/trans_inverted"
app:layout_constraintBaseline_toBaselineOf="@+id/trans_mode"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/fragment_radar.xml
+32 -21
View File
@@ -17,29 +17,16 @@
</FrameLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/radar_recycler"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
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"
style="@style/RadarText"
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"
style="@style/RadarText"
android:layout_marginEnd="4dp"
android:text="@string/card_max_el"
app:layout_constraintEnd_toEndOf="@+id/radar_sky_frame"
@@ -47,21 +34,45 @@
<TextView
android:id="@+id/radar_aos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/RadarText"
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"
style="@style/RadarText"
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.recyclerview.widget.RecyclerView
android:id="@+id/radar_recycler"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_trans_header" />
<TextView
android:id="@+id/radar_trans_header"
style="@style/RadarText"
android:text="@string/trans_header"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_sky_frame" />
<TextView
android:id="@+id/radar_trans_no_found"
style="@style/RadarText"
android:text="@string/no_trans"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/radar_trans_header" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/sat_pass_card.xml
+15 -13
View File
@@ -3,11 +3,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
style="@style/CardSatPass"
android:layout_height="104dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
app:cardElevation="8dp">
app:cardElevation="4dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -29,10 +28,10 @@
style="@style/CardSatPass.SideText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginTop="4dp"
android:text="@string/card_sat_name"
app:layout_constraintBottom_toTopOf="@+id/card_pass_vector"
app:layout_constraintEnd_toEndOf="@+id/card_pass_vector"
app:layout_constraintEnd_toStartOf="@+id/card_max_el"
app:layout_constraintStart_toStartOf="@+id/card_pass_vector"
app:layout_constraintTop_toTopOf="parent" />
@@ -40,12 +39,12 @@
android:id="@+id/card_pass_vector"
style="@style/CardSatPass.SideText"
android:layout_width="0dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_vector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/card_max_el"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/card_max_el" />
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/card_max_el"
@@ -59,17 +58,20 @@
<TextView
android:id="@+id/card_pass_start"
style="@style/CardSatPass.SideText"
android:layout_marginEnd="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:text="@string/card_pass_aos_time"
app:layout_constraintBottom_toTopOf="@+id/card_max_el"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView" />
<TextView
android:id="@+id/card_pass_end"
style="@style/CardSatPass.SideText"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:text="@string/card_pass_los_time"
app:layout_constraintStart_toStartOf="@+id/card_pass_start"
app:layout_constraintTop_toBottomOf="@+id/card_max_el" />
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/values/strings.xml
+22
View File
@@ -39,7 +39,29 @@
<string name="pass_pref_tv_maxEl">Show passes with max elevation above</string>
<string name="pass_pref_hint_maxEl">Max elevation</string>
<string name="no">No</string>
<string name="yes">Yes</string>
<string name="no_mode">Mode: Null</string>
<string name="no_uplink">Uplink: Null</string>
<string name="no_downlink">Downlink: Null</string>
<string name="no_trans">No transmitters found for this Satellite</string>
<string name="trans_description">ARGOS-3 A-DCS 465.9875MHz</string>
<string name="trans_downlink">Downlink: 465.9875 MHz</string>
<string name="trans_uplink">Uplink: 465.9875 MHz</string>
<string name="trans_mode">Mode: BPSK400</string>
<string name="trans_inverted">Inverted: Yes</string>
<string name="trans_header">Transmitters:</string>
<string name="pattern_aos">AOS -%02d:%02d:%02d</string>
<string name="pattern_trans_mode">Mode: %s</string>
<string name="pattern_trans_inverted">Inverted: %s</string>
<string name="pattern_trans_uplink_low">Uplink: %.4f MHz</string>
<string name="pattern_trans_uplink_lowHigh">Uplink: %.4f - %.4f MHz</string>
<string name="pattern_trans_downlink_low">Downlink: %.4f MHz</string>
<string name="pattern_trans_downlink_lowHigh">Downlink: %.4f - %.4f MHz</string>
<string name="map_content">Nasa Map</string>
<string name="placeholder">Placeholder</string>
</resources>
app/src/main/res/values/styles.xml
+12
View File
@@ -85,4 +85,16 @@
<item name="android:textStyle">bold</item>
</style>
<style name="RadarText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
</style>
<style name="CardTransText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">16sp</item>
</style>
</resources>