mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-04 11:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added more satellite info to the MapFragment.kt

Browse Source
This commit is contained in:
Arty Bishop committed 2020-11-27 17:05:51 +00:00
1 parent 2fac5814d8
commit e9eba47429
4 files changed
+70 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/fragment_map.xml
+54 -19
View File
@@ -24,13 +24,15 @@
android:keepScreenOn="true">
<org.osmdroid.views.MapView
android:id="@+id/map_view"
android:id="@+id/mapView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
</org.osmdroid.views.MapView>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -41,56 +43,89 @@
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/id_name"
android:id="@+id/qthLocator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/map_qth"
android:textColor="@color/themeLight"
app:layout_constraintBaseline_toBaselineOf="@+id/velocity"
app:layout_constraintEnd_toEndOf="@+id/distance"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/velocity" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/idName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/pat_osm_idName"
android:textColor="@color/themeLight"
app:layout_constraintEnd_toEndOf="parent"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="@+id/distance"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="@+id/altitude"
app:layout_constraintTop_toBottomOf="@+id/latLon" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/altitude"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:text="@string/pat_altitude"
android:textColor="@color/themeLight"
app:layout_constraintEnd_toStartOf="@+id/distance"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/id_name" />
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginEnd="6dp"
android:text="@string/pat_distance"
android:textColor="@color/themeLight"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/altitude"
app:layout_constraintTop_toBottomOf="@+id/altitude" />
app:layout_constraintBaseline_toBaselineOf="@+id/altitude"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/altitude" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/velocity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="4dp"
android:text="@string/pat_osm_vel"
android:textColor="@color/themeLight"
app:layout_constraintBaseline_toBaselineOf="@+id/altitude"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/qthLocator"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="@+id/altitude"
app:layout_constraintTop_toBottomOf="@+id/idName" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/lat_lon"
android:id="@+id/latLon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pat_osm_latLon"
android:textColor="@color/themeLight"
app:layout_constraintBaseline_toBaselineOf="@+id/distance"
app:layout_constraintEnd_toEndOf="@+id/velocity" />
app:layout_constraintBaseline_toBaselineOf="@+id/altitude"
app:layout_constraintEnd_toEndOf="@+id/distance"
app:layout_constraintStart_toStartOf="@+id/altitude" />
<TextView
android:id="@+id/mapCoverage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/map_coverage"
android:textColor="@color/themeLight"
app:layout_constraintBaseline_toBaselineOf="@+id/velocity"
app:layout_constraintEnd_toEndOf="@+id/qthLocator"
app:layout_constraintStart_toStartOf="@+id/velocity" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values-ru/strings.xml
+4 -2
View File
@@ -49,10 +49,12 @@
<string name="trans_inverted">Инверсия: %s</string>
<string name="trans_no_data">Не найдены трансиверы для этого спутника</string>
<string name="map_coverage">Покрытие: %.0f км</string>
<string name="pat_azimuth">Азим: %.1f°</string>
<string name="pat_elevation">Элев: %.1f°</string>
<string name="pat_distance">Дист: %.0fкм</string>
<string name="pat_altitude">Выс: %.0fкм</string>
<string name="pat_distance">Дист: %.0f км</string>
<string name="pat_altitude">Выс: %.0f км</string>
<string name="pat_osm_latLon">Шир: %.1f°, Дол: %.1f°</string>
<string name="pat_osm_vel">Скор: %.2f км/с</string>
app/src/main/res/values/strings.xml
+3 -1
View File
@@ -63,13 +63,15 @@
<string name="trans_link_lowHigh" translatable="false">%.4f - %.4f</string>
<string name="trans_no_data">No transceivers found for this satellite</string>
<string name="map_qth" translatable="false">QTH: %s</string>
<string name="map_coverage">Coverage: %.0f km</string>
<string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string>
<string name="pat_azimuth">Az: %.1f°</string>
<string name="pat_elevation">El: %.1f°</string>
<string name="pat_distance">Dst: %.0f km</string>
<string name="pat_altitude">Alt: %.0f km</string>
<string name="pat_osm_idName" translatable="false">%s / %s</string>
<string name="pat_osm_idName" translatable="false">Id:%s / %s</string>
<string name="pat_osm_latLon">Lat: %.1f°, Lon: %.1f°</string>
<string name="pat_osm_vel">Vel: %.2f km/s</string>