Interfaces and classes refactoring and code cleanup

This commit is contained in:
Arty Bishop committed 2022-02-22 19:30:07 +00:00
1 parent 0c71c4db29
commit 74cbad5127
43 files changed
+403 -521

No files matched your search

+11 -10
View File
@@ -174,20 +174,21 @@
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<Button
android:id="@+id/radar_prev_btn"
android:id="@+id/radar_btn_notify"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_marginStart="@dimen/button_margin_side"
android:text="@string/btn_notify"
android:textColor="@color/textDisabled"
app:layout_constraintBottom_toBottomOf="@+id/radar_coordinator"
app:layout_constraintEnd_toStartOf="@+id/radar_data_name"
app:layout_constraintEnd_toStartOf="@+id/radar_sat_id"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/radar_coordinator"
app:layout_constraintStart_toStartOf="@+id/radar_coordinator"
app:layout_constraintTop_toTopOf="@+id/radar_coordinator" />
<TextView
android:id="@+id/radar_data_name"
android:id="@+id/radar_sat_id"
style="@style/WorldMapText"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -196,20 +197,20 @@
android:ellipsize="end"
android:gravity="center_horizontal"
android:maxLines="1"
android:text="@string/pat_osm_idName"
app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"
app:layout_constraintEnd_toStartOf="@+id/radar_next_btn"
android:text="@string/radar_sat_id"
app:layout_constraintBaseline_toBaselineOf="@+id/radar_btn_notify"
app:layout_constraintEnd_toStartOf="@+id/radar_btn_settings"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/radar_prev_btn" />
app:layout_constraintStart_toEndOf="@+id/radar_btn_notify" />
<Button
android:id="@+id/radar_next_btn"
android:id="@+id/radar_btn_settings"
style="@style/NormalButton"
android:layout_width="0dp"
android:layout_marginEnd="@dimen/button_margin_side"
android:text="@string/btn_settings"
app:layout_constraintBaseline_toBaselineOf="@+id/radar_prev_btn"
app:layout_constraintBaseline_toBaselineOf="@+id/radar_btn_notify"
app:layout_constraintEnd_toEndOf="@+id/radar_coordinator"
app:layout_constraintStart_toEndOf="@+id/radar_data_name" />
app:layout_constraintStart_toEndOf="@+id/radar_sat_id" />
</androidx.constraintlayout.widget.ConstraintLayout>
+1 -1
View File
@@ -6,7 +6,7 @@
android:id="@+id/mode_checkbox"
android:layout_width="match_parent"
android:layout_height="41dp"
android:layout_marginStart="4dp"
android:layout_marginStart="6dp"
android:background="@color/cardRegular"
android:ellipsize="end"
android:lines="1"
+2
View File
@@ -72,6 +72,8 @@
<string name="radar_alt_value">%.0f km</string>
<string name="radar_dist_text">Дальн.</string>
<string name="radar_dist_value">%.0f km</string>
<string name="radar_sat_id">Id: %d</string>
<string name="radar_sat_name">%s</string>
<string name="pat_azimuth">Азимут: %.1f°</string>
<string name="pat_elevation">Элевация: %.1f°</string>
+2
View File
@@ -84,6 +84,8 @@
<string name="radar_alt_value">%.0f km</string>
<string name="radar_dist_text">Distance</string>
<string name="radar_dist_value">%.0f km</string>
<string name="radar_sat_id">Id: %d</string>
<string name="radar_sat_name">%s</string>
<string name="pat_azimuth">Azimuth: %.1f°</string>
<string name="pat_elevation">Elevation: %.1f°</string>