mirror of
https://github.com/rt-bishop/Look4Sat.git
synced 2026-10-04 03:47:24 +00:00
Added more satellite parameters to the map screen
This commit is contained in:
Arty Bishop committed
1 parent
488fe352cd
commit
ec553bf429
8 files changed
+112
-60
No files matched your search
@@ -21,15 +21,8 @@
|
||||
android:src="@drawable/ic_back" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_title"
|
||||
style="@style/ToolbarTitle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="52dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginEnd="52dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:text="@string/map_title" />
|
||||
android:id="@+id/map_timer"
|
||||
style="@style/ToolbarTimer" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
@@ -66,7 +59,7 @@
|
||||
android:includeFontPadding="false"
|
||||
android:maxLines="1"
|
||||
android:text="@string/map_copyright"
|
||||
android:textColor="@color/textDisabled"
|
||||
android:textColor="@color/textMain"
|
||||
android:textSize="@dimen/text_size_copyright"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_card"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_card"
|
||||
@@ -88,6 +81,66 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_azimuth"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/map_azimuth"
|
||||
app:layout_constraintBottom_toTopOf="@+id/map_data_alt"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_visibility"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_visibility" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_lat"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/map_latitude"
|
||||
app:layout_constraintBottom_toTopOf="@+id/map_data_qth"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_alt"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_alt" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_lon"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_longitude"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_lat"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_dst" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_alt"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/map_altitude"
|
||||
app:layout_constraintBottom_toTopOf="@+id/map_data_lat"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_azimuth"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_azimuth" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_dst"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_distance"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_alt"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_elevation" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_elevation"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_elevation"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_azimuth"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_phase" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_visibility"
|
||||
style="@style/WorldMapText"
|
||||
@@ -96,6 +149,7 @@
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/map_visibility"
|
||||
app:layout_constraintBottom_toTopOf="@+id/map_azimuth"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
@@ -109,55 +163,17 @@
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_visibility"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_lat"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/map_latitude"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_visibility"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_visibility" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_lon"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/map_longitude"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_lat"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_lat" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_qth"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="@string/map_qth"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_lon"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_lon" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_alt"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_altitude"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_lat"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_phase" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_dst"
|
||||
style="@style/WorldMapText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_distance"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_lon"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_alt" />
|
||||
app:layout_constraintStart_toStartOf="@+id/map_data_lat"
|
||||
app:layout_constraintTop_toBottomOf="@+id/map_data_lat" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/map_data_vel"
|
||||
@@ -166,7 +182,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/map_velocity"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/map_data_qth"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_dst" />
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_data_lon" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
@@ -101,6 +101,8 @@
|
||||
<string name="map_title">Карта Мира</string>
|
||||
<string name="map_sat_name">%s</string>
|
||||
<string name="map_sat_id">Id:%d</string>
|
||||
<string name="map_azimuth">Азимут: %.1f°</string>
|
||||
<string name="map_elevation">Элевация: %.1f°</string>
|
||||
<string name="map_latitude">Широта: %.1f°</string>
|
||||
<string name="map_longitude">Долгота: %.1f°</string>
|
||||
<string name="map_qth">QTH Локатор: %s</string>
|
||||
|
||||
@@ -102,6 +102,8 @@
|
||||
<string name="map_title">World Map</string>
|
||||
<string name="map_sat_name">%s</string>
|
||||
<string name="map_sat_id">Id:%d</string>
|
||||
<string name="map_azimuth">Azimuth: %.1f°</string>
|
||||
<string name="map_elevation">Elevation: %.1f°</string>
|
||||
<string name="map_latitude">Latitude: %.1f°</string>
|
||||
<string name="map_longitude">Longitude: %.1f°</string>
|
||||
<string name="map_qth">QTH Locator: %s</string>
|
||||
|
||||
Reference in new issue
Block a user