Cleaned up strings and styles

This commit is contained in:
Arty Bishop committed 2020-05-27 11:30:46 +01:00
1 parent 389edcb33a
commit 8f34c6d6b9
17 files changed
+101 -160

No files matched your search

+12 -2
View File
@@ -23,17 +23,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/pref_tv_title"
style="@style/DialogText"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:text="@string/dialog_filter_passes"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/pref_tv_hoursAhead"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/pref_hours_ahead_summary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/pref_tv_title" />
<EditText
android:id="@+id/pref_et_hoursAhead"
@@ -66,4 +75,5 @@
app:layout_constraintEnd_toEndOf="@+id/pref_tv_minEl"
app:layout_constraintStart_toStartOf="@+id/pref_tv_minEl"
app:layout_constraintTop_toBottomOf="@+id/pref_tv_minEl" />
</androidx.constraintlayout.widget.ConstraintLayout>
+14 -15
View File
@@ -26,25 +26,24 @@
<TextView
android:id="@+id/dialog_title"
style="@style/DialogText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/dialog_select_sat"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="@+id/dialog_btn_positive"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="@+id/dialog_btn_neutral"
app:layout_constraintTop_toTopOf="parent" />
<SearchView
android:id="@+id/dialog_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
app:layout_constraintEnd_toEndOf="@+id/dialog_title"
app:layout_constraintStart_toStartOf="@+id/dialog_title"
android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_title" />
<androidx.recyclerview.widget.RecyclerView
@@ -54,13 +53,13 @@
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/dialog_btn_negative"
app:layout_constraintEnd_toEndOf="@+id/dialog_title"
app:layout_constraintStart_toStartOf="@+id/dialog_title"
app:layout_constraintEnd_toEndOf="@+id/dialog_search"
app:layout_constraintStart_toStartOf="@+id/dialog_search"
app:layout_constraintTop_toBottomOf="@+id/dialog_search" />
<TextView
android:id="@+id/dialog_btn_neutral"
style="@style/SatEntryDialogText"
style="@style/DialogText"
android:layout_marginStart="8dp"
android:text="@string/btn_all_none"
app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_negative"
@@ -68,20 +67,20 @@
<TextView
android:id="@+id/dialog_btn_negative"
style="@style/SatEntryDialogText"
style="@style/DialogText"
android:layout_marginEnd="24dp"
android:text="@string/btn_cancel"
android:text="@android:string/cancel"
app:layout_constraintBaseline_toBaselineOf="@+id/dialog_btn_positive"
app:layout_constraintEnd_toStartOf="@+id/dialog_btn_positive" />
<TextView
android:id="@+id/dialog_btn_positive"
style="@style/SatEntryDialogText"
style="@style/DialogText"
android:layout_width="36dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="end"
android:text="@string/btn_ok"
android:text="@android:string/ok"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/dialog_recycler" />
+23 -30
View File
@@ -3,45 +3,44 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tleSourcesDialog"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="4dp">
<TextView
android:id="@+id/tleSourcesTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/DialogText"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/manage_tle_sources"
android:textSize="18sp"
android:layout_marginTop="10dp"
android:text="@string/dialog_tle_sources"
app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnAdd"
app:layout_constraintHorizontal_bias="0.51"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/tleSourceBtnAdd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="36dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:layout_marginEnd="10dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/tleSourcesTitle"
app:layout_constraintBottom_toBottomOf="@+id/tleSourcesWarning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/tleSourcesTitle"
app:layout_constraintTop_toTopOf="@+id/tleSourcesTitle"
app:srcCompat="@android:drawable/ic_menu_add" />
app:srcCompat="@drawable/ic_add" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tleSourcesRecycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesWarning"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
@@ -52,33 +51,27 @@
<TextView
android:id="@+id/tleSourcesWarning"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
style="@style/DialogText"
android:layout_marginTop="4dp"
android:gravity="center"
android:text="@string/please_make_sure_you_use_https_url_for_tle_source"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toEndOf="@+id/tleSourcesRecycler"
app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler" />
android:text="@string/https_only"
app:layout_constraintStart_toStartOf="@+id/tleSourcesTitle"
app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle" />
<TextView
android:id="@+id/tleSourcesBtnNeg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/DialogText"
android:layout_marginEnd="32dp"
android:text="@string/btn_cancel"
android:textSize="18sp"
android:text="@android:string/cancel"
app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"
app:layout_constraintHorizontal_chainStyle="spread_inside" />
<TextView
android:id="@+id/tleSourcesBtnPos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/DialogText"
android:layout_marginBottom="8dp"
android:text="@string/btn_ok"
android:textSize="18sp"
android:text="@android:string/ok"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />
@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/dialogTle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/dialogTleTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:text="@string/pref_tle_url_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/dialogTleInput"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/placeholder"
android:importantForAutofill="no"
android:inputType="textWebEditText"
app:layout_constraintEnd_toEndOf="@+id/dialogTlePos"
app:layout_constraintStart_toStartOf="@+id/dialogTleTitle"
app:layout_constraintTop_toBottomOf="@+id/dialogTleTitle" />
<TextView
android:id="@+id/dialogTleNeg"
style="@style/SatEntryDialogText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:text="@string/btn_cancel"
app:layout_constraintBaseline_toBaselineOf="@+id/dialogTlePos"
app:layout_constraintEnd_toStartOf="@+id/dialogTlePos" />
<TextView
android:id="@+id/dialogTlePos"
style="@style/SatEntryDialogText"
android:layout_width="36dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="12dp"
android:gravity="end"
android:text="@string/btn_ok"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialogTleInput" />
</androidx.constraintlayout.widget.ConstraintLayout>
+1 -1
View File
@@ -117,7 +117,7 @@
style="@style/DrawerHeader.Button"
android:layout_width="0dp"
android:drawableEnd="@drawable/ic_update_tle"
android:text="@string/update_tle"
android:text="@string/update_tle_web"
app:layout_constraintBottom_toTopOf="@+id/drawer_btn_trans"
app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
@@ -68,7 +68,7 @@
style="@style/MapText"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:text="@string/pat_range"
android:text="@string/pat_distance"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@@ -61,7 +61,7 @@
android:id="@+id/tv_polar_rng"
style="@style/PolarViewText"
android:layout_marginEnd="4dp"
android:text="@string/pat_range"
android:text="@string/pat_distance"
app:layout_constraintBottom_toBottomOf="@+id/frame_polar"
app:layout_constraintEnd_toEndOf="@+id/frame_polar" />
@@ -12,7 +12,6 @@
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnDel"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">