mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-04 19:47:22 +00:00
Various changes to layouts, styles, strings and drawables
This commit is contained in:
1 parent
567200cfe4
commit
9fd0d5f2e2
60 files changed
+368
-438
No files matched your search
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/navigation_host"
|
||||
android:id="@+id/nav_host"
|
||||
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:defaultNavHost="true"
|
||||
app:navGraph="@navigation/navigation_graph" />
|
||||
app:navGraph="@navigation/nav_graph" />
|
||||
@@ -21,7 +21,7 @@
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/about_title"
|
||||
app:tint="@color/themeAccent" />
|
||||
app:tint="@color/accent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/about_title"
|
||||
@@ -32,7 +32,7 @@
|
||||
android:layout_marginEnd="8dp"
|
||||
android:includeFontPadding="false"
|
||||
android:text="@string/app_name"
|
||||
android:textColor="@color/themeAccent"
|
||||
android:textColor="@color/accent"
|
||||
android:textSize="@dimen/text_size_app_title"
|
||||
app:layout_constraintBottom_toTopOf="@+id/about_version"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@@ -45,8 +45,8 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/about_version"
|
||||
android:textColor="@color/themeLight"
|
||||
android:text="@string/app_version"
|
||||
android:textColor="@color/textMain"
|
||||
android:textSize="@dimen/text_size_large"
|
||||
app:layout_constraintBottom_toTopOf="@+id/about_subtitle"
|
||||
app:layout_constraintEnd_toEndOf="@+id/about_title"
|
||||
@@ -59,8 +59,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:text="@string/about_subtitle"
|
||||
android:textColor="@color/themeLight"
|
||||
android:text="@string/app_subtitle"
|
||||
android:textColor="@color/textMain"
|
||||
android:textSize="@dimen/text_size_large"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -31,48 +31,50 @@
|
||||
app:layout_constraintTop_toTopOf="@+id/data_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/data_satellites"
|
||||
android:id="@+id/data_entries"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/location_lat"
|
||||
app:layout_constraintEnd_toStartOf="@+id/data_transmitters"
|
||||
android:text="@string/fmt_entries"
|
||||
app:layout_constraintEnd_toStartOf="@+id/data_radios"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="@+id/data_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/data_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/data_transmitters"
|
||||
android:id="@+id/data_radios"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/location_lon"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/data_satellites"
|
||||
android:text="@string/fmt_radios"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/data_entries"
|
||||
app:layout_constraintEnd_toEndOf="@+id/data_progress"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/data_satellites" />
|
||||
app:layout_constraintStart_toEndOf="@+id/data_entries" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/data_btn_web"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_web"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/data_btn_file"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/data_satellites" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/data_entries" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/data_btn_file"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="2dp"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:text="@string/btn_file"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/data_btn_web"
|
||||
app:layout_constraintEnd_toStartOf="@+id/data_btn_clear"
|
||||
@@ -83,7 +85,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_clear"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/data_btn_web"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/other_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/other_title"
|
||||
app:trackTint="@color/themeDisabled" />
|
||||
app:trackTint="@color/textDisabled" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/other_switch_sweep"
|
||||
@@ -49,7 +49,7 @@
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/other_switch_utc"
|
||||
app:layout_constraintTop_toBottomOf="@+id/other_switch_utc"
|
||||
app:trackTint="@color/themeDisabled" />
|
||||
app:trackTint="@color/textDisabled" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/other_switch_sensors"
|
||||
@@ -64,7 +64,7 @@
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/other_switch_utc"
|
||||
app:layout_constraintTop_toBottomOf="@+id/other_switch_sweep"
|
||||
app:trackTint="@color/themeDisabled" />
|
||||
app:trackTint="@color/textDisabled" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
@@ -8,45 +8,45 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/warranty_title"
|
||||
android:id="@+id/outro_title"
|
||||
style="@style/SettingsTitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:text="@string/warranty_title"
|
||||
app:layout_constraintBottom_toTopOf="@+id/warranty_thanks"
|
||||
android:text="@string/outro_title"
|
||||
app:layout_constraintBottom_toTopOf="@+id/outro_thanks"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/warranty_thanks"
|
||||
android:id="@+id/outro_thanks"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/warranty_thanks"
|
||||
app:layout_constraintBottom_toTopOf="@+id/warranty_license"
|
||||
app:layout_constraintEnd_toEndOf="@+id/warranty_title"
|
||||
android:text="@string/outro_thanks"
|
||||
app:layout_constraintBottom_toTopOf="@+id/outro_license"
|
||||
app:layout_constraintEnd_toEndOf="@+id/outro_title"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/warranty_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/warranty_title" />
|
||||
app:layout_constraintStart_toStartOf="@+id/outro_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/outro_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/warranty_license"
|
||||
android:id="@+id/outro_license"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:text="@string/warranty_license"
|
||||
android:text="@string/outro_license"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/warranty_title"
|
||||
app:layout_constraintEnd_toEndOf="@+id/outro_title"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/warranty_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/warranty_thanks" />
|
||||
app:layout_constraintStart_toStartOf="@+id/outro_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/outro_thanks" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
+28
-26
@@ -8,7 +8,7 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/location_title"
|
||||
android:id="@+id/position_title"
|
||||
style="@style/SettingsTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -19,81 +19,83 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/location_progress"
|
||||
android:id="@+id/position_progress"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/location_title"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/position_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/location_title"
|
||||
app:layout_constraintTop_toTopOf="@+id/location_title" />
|
||||
app:layout_constraintStart_toEndOf="@+id/position_title"
|
||||
app:layout_constraintTop_toTopOf="@+id/position_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/location_lat"
|
||||
android:id="@+id/position_lat"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="@string/location_lat"
|
||||
app:layout_constraintEnd_toStartOf="@+id/location_lon"
|
||||
app:layout_constraintEnd_toStartOf="@+id/position_lon"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="@+id/location_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/location_title" />
|
||||
app:layout_constraintStart_toStartOf="@+id/position_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/position_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/location_lon"
|
||||
android:id="@+id/position_lon"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/location_lon"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/location_lat"
|
||||
app:layout_constraintEnd_toEndOf="@+id/location_progress"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/position_lat"
|
||||
app:layout_constraintEnd_toEndOf="@+id/position_progress"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/location_lat" />
|
||||
app:layout_constraintStart_toEndOf="@+id/position_lat" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/location_btn_gps"
|
||||
android:id="@+id/position_btn_gps"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:drawableStart="@drawable/ic_gps"
|
||||
android:text="@string/btn_gps"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/location_btn_manual"
|
||||
app:layout_constraintEnd_toStartOf="@+id/position_btn_manual"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/location_lat" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/position_lat" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/location_btn_manual"
|
||||
android:id="@+id/position_btn_manual"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="2dp"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:drawableStart="@drawable/ic_gps"
|
||||
android:text="@string/btn_manual"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/location_btn_gps"
|
||||
app:layout_constraintEnd_toStartOf="@+id/location_btn_qth"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/position_btn_gps"
|
||||
app:layout_constraintEnd_toStartOf="@+id/position_btn_qth"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/location_btn_gps" />
|
||||
app:layout_constraintStart_toEndOf="@+id/position_btn_gps" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/location_btn_qth"
|
||||
android:id="@+id/position_btn_qth"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:drawableStart="@drawable/ic_qth"
|
||||
android:text="@string/btn_qth"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/location_btn_gps"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/position_btn_gps"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/location_btn_manual" />
|
||||
app:layout_constraintStart_toEndOf="@+id/position_btn_manual" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
+24
-24
@@ -8,7 +8,7 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tracking_title"
|
||||
android:id="@+id/remote_title"
|
||||
style="@style/SettingsTitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -21,54 +21,54 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/tracking_switch"
|
||||
android:id="@+id/remote_switch"
|
||||
style="@style/SettingsText"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="42dp"
|
||||
android:text="@string/tracking_switch"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tracking_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/tracking_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tracking_title"
|
||||
app:trackTint="@color/themeDisabled" />
|
||||
app:layout_constraintEnd_toEndOf="@+id/remote_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/remote_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/remote_title"
|
||||
app:trackTint="@color/textDisabled" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tracking_ip"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||
android:id="@+id/remote_ip"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tracking_port"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="@+id/tracking_switch"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tracking_switch"
|
||||
app:layout_constraintWidth_percent="0.69">
|
||||
app:layout_constraintEnd_toStartOf="@+id/remote_port"
|
||||
app:layout_constraintStart_toStartOf="@+id/remote_switch"
|
||||
app:layout_constraintTop_toBottomOf="@+id/remote_switch"
|
||||
app:layout_constraintWidth_percent="0.64">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tracking_ip_edit"
|
||||
android:id="@+id/remote_ip_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/tracking_ip_hint" />
|
||||
android:hint="@string/tracking_ip_hint"
|
||||
android:textColorHint="@color/textMain" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/tracking_port"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||
android:id="@+id/remote_port"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tracking_ip"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tracking_switch"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/tracking_ip"
|
||||
app:layout_constraintTop_toTopOf="@+id/tracking_ip">
|
||||
app:layout_constraintBottom_toBottomOf="@+id/remote_ip"
|
||||
app:layout_constraintEnd_toEndOf="@+id/remote_switch"
|
||||
app:layout_constraintStart_toEndOf="@+id/remote_ip"
|
||||
app:layout_constraintTop_toTopOf="@+id/remote_ip">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/tracking_port_edit"
|
||||
android:id="@+id/remote_port_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/tracking_port_hint" />
|
||||
android:hint="@string/tracking_port_hint"
|
||||
android:textColorHint="@color/textMain" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -103,9 +103,9 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/filter_pos_btn"
|
||||
@@ -119,7 +119,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/filter_neg_btn"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/location_title"
|
||||
android:id="@+id/position_title"
|
||||
style="@style/DialogTitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -34,9 +34,9 @@
|
||||
android:minHeight="48dp"
|
||||
app:endIconMode="clear_text"
|
||||
app:layout_constraintBottom_toTopOf="@+id/location_lon_layout"
|
||||
app:layout_constraintEnd_toEndOf="@+id/location_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/location_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/location_title">
|
||||
app:layout_constraintEnd_toEndOf="@+id/position_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/position_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/position_title">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/location_lat_edit"
|
||||
@@ -74,9 +74,9 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/location_pos_btn"
|
||||
@@ -90,7 +90,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/location_neg_btn"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -66,9 +66,9 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/locator_pos_btn"
|
||||
@@ -82,7 +82,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/locator_neg_btn"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/sources_title"
|
||||
android:text="@string/entries_modes"
|
||||
android:minHeight="48dp"
|
||||
app:layout_constraintEnd_toEndOf="@+id/modes_btn_pos"
|
||||
app:layout_constraintStart_toStartOf="@+id/modes_btn_neg"
|
||||
@@ -40,8 +40,8 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/modes_btn_pos"
|
||||
@@ -54,7 +54,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/modes_btn_neg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -58,9 +58,8 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/sources_btn_pos"
|
||||
@@ -73,8 +72,7 @@
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_neg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
android:includeFontPadding="false"
|
||||
android:maxLines="1"
|
||||
android:text="@string/map_copyright"
|
||||
android:textColor="@color/themeDisabled"
|
||||
android:textColor="@color/textDisabled"
|
||||
android:textSize="@dimen/text_size_copyright"
|
||||
app:layout_constraintEnd_toEndOf="@+id/map_card"
|
||||
app:layout_constraintStart_toStartOf="@+id/map_card"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<TextView
|
||||
android:id="@+id/settings_title"
|
||||
style="@style/ToolbarTitle"
|
||||
android:text="@string/settings_title" />
|
||||
android:text="@string/btn_settings" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
android:layout_marginTop="60dp"
|
||||
android:layout_marginEnd="@dimen/view_default_margin"
|
||||
android:layout_marginBottom="62dp"
|
||||
android:backgroundTint="@color/surfaceBg">
|
||||
android:backgroundTint="@color/background">
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/settings_scroll"
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
<include
|
||||
android:id="@+id/settings_location"
|
||||
layout="@layout/card_location"
|
||||
layout="@layout/card_position"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/view_default_margin"
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
<include
|
||||
android:id="@+id/settings_tracking"
|
||||
layout="@layout/card_tracking"
|
||||
layout="@layout/card_remote"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/view_default_margin"
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
<include
|
||||
android:id="@+id/settings_warranty"
|
||||
layout="@layout/card_info"
|
||||
layout="@layout/card_outro"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/view_default_margin"
|
||||
@@ -113,7 +113,7 @@
|
||||
style="@style/BottomBar">
|
||||
|
||||
<Button
|
||||
android:id="@+id/settings_prev_btn"
|
||||
android:id="@+id/settings_github_btn"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="@dimen/button_width_max"
|
||||
android:layout_marginStart="@dimen/button_margin_side"
|
||||
@@ -121,7 +121,7 @@
|
||||
android:text="@string/btn_github" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/settings_next_btn"
|
||||
android:id="@+id/settings_fdroid_btn"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="@dimen/button_width_max"
|
||||
android:layout_marginEnd="@dimen/button_margin_side"
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="41dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@color/surfaceCard"
|
||||
android:background="@color/cardRegular"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:padding="6dp"
|
||||
android:textColor="@color/themeLight"
|
||||
android:textColor="@color/textMain"
|
||||
android:textSize="@dimen/text_size_medium" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
@@ -7,11 +7,11 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="41dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:background="@color/surfaceCard"
|
||||
android:background="@color/cardRegular"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:padding="4dp"
|
||||
android:textColor="@color/themeLight"
|
||||
android:textColor="@color/textMain"
|
||||
android:textSize="@dimen/text_size_medium" />
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
@@ -17,7 +17,7 @@
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="@string/pass_satName"
|
||||
android:textSize="@dimen/text_size_small"
|
||||
android:textColor="@color/themeAccent"
|
||||
android:textColor="@color/accent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
android:layout_marginEnd="6dp"
|
||||
android:text="@string/pass_satId"
|
||||
android:textSize="@dimen/text_size_small"
|
||||
android:textColor="@color/themeAccent"
|
||||
android:textColor="@color/accent"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/pass_name"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="@+id/radio_info"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/radio_info"
|
||||
android:contentDescription="@string/downlink"
|
||||
app:srcCompat="@drawable/ic_next" />
|
||||
|
||||
<TextView
|
||||
@@ -58,6 +59,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="@+id/radio_info"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/radio_info"
|
||||
android:contentDescription="@string/uplink"
|
||||
app:srcCompat="@drawable/ic_next" />
|
||||
|
||||
<TextView
|
||||
|
||||
Reference in new issue
Block a user