Further changes to TLE custom sources dialog

This commit is contained in:
Arty Bishop committed 2020-05-19 15:50:38 +01:00
1 parent ec03c76fa1
commit 7f26d2b136
10 files changed
+200 -68

No files matched your search

+44 -25
View File
@@ -9,34 +9,65 @@
android:id="@+id/tleSourcesTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/placeholder"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/manage_tle_sources"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@+id/tleSourceBtnAdd"
app:layout_constraintHorizontal_bias="0.51"
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_marginStart="8dp"
android:layout_marginEnd="12dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/tleSourcesTitle"
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" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/tleSourcesRecycler"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
app:layout_constraintBottom_toTopOf="@+id/tleSourceBtnAdd"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesWarning"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tleSourcesTitle"
app:layout_constraintVertical_chainStyle="packed" />
app:layout_constraintTop_toBottomOf="@+id/tleSourceBtnAdd"
app:layout_constraintVertical_chainStyle="packed">
</androidx.recyclerview.widget.RecyclerView>
<TextView
android:id="@+id/tleSourcesWarning"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
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" />
<TextView
android:id="@+id/tleSourcesBtnNeg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginEnd="32dp"
android:text="@string/btn_cancel"
android:textSize="18sp"
app:layout_constraintBaseline_toBaselineOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toStartOf="@+id/tleSourcesBtnPos"
app:layout_constraintHorizontal_chainStyle="spread_inside" />
@@ -47,20 +78,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/btn_ok"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tleSourcesRecycler" />
<ImageView
android:id="@+id/tleSourceBtnAdd"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginBottom="8dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toTopOf="@+id/tleSourcesBtnPos"
app:layout_constraintEnd_toEndOf="@+id/tleSourcesRecycler"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@+id/tleSourcesRecycler"
app:layout_constraintTop_toBottomOf="@+id/tleSourcesRecycler"
app:srcCompat="@android:drawable/ic_menu_add" />
app:layout_constraintEnd_toEndOf="@+id/tleSourceBtnAdd" />
</androidx.constraintlayout.widget.ConstraintLayout>
+18 -10
View File
@@ -6,30 +6,38 @@
android:layout_height="wrap_content"
android:padding="4dp">
<EditText
android:id="@+id/tleSourceUrl"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tleSourceInputLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/placeholder"
android:importantForAutofill="no"
android:inputType="textUri"
android:text="@string/placeholder"
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" />
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/tleSourceUrl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/tle_source"
android:importantForAutofill="no"
android:inputType="textUri" />
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:id="@+id/tleSourceBtnDel"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:contentDescription="@string/placeholder"
app:layout_constraintBottom_toBottomOf="@+id/tleSourceUrl"
app:layout_constraintBottom_toBottomOf="@+id/tleSourceInputLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/tleSourceUrl"
app:layout_constraintTop_toTopOf="@+id/tleSourceUrl"
app:layout_constraintStart_toEndOf="@+id/tleSourceInputLayout"
app:layout_constraintTop_toTopOf="@+id/tleSourceInputLayout"
app:srcCompat="@android:drawable/ic_menu_close_clear_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>
+2
View File
@@ -141,4 +141,6 @@
<string name="map_gsp">СТЦ</string>
<string name="update_loc_failure">Проверьте ваши настройки GPS</string>
<string name="manage_tle_sources">Manage TLE sources</string>
<string name="tle_source">TLE source</string>
</resources>
+3
View File
@@ -166,4 +166,7 @@
<string name="map_gsp">GSP</string>
<string name="placeholder" translatable="false">Placeholder</string>
<string name="manage_tle_sources">Manage TLE sources</string>
<string name="please_make_sure_you_use_https_url_for_tle_source" translatable="false">Please use HTTPS URLs only</string>
<string name="tle_source">TLE source</string>
</resources>