mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-05 03:57:24 +00:00
Various UI and code changes to SourcesDialog.kt
This commit is contained in:
Arty Bishop committed
1 parent
22d0db1d78
commit
97e6f8b7f5
8 files changed
+164
-152
No files matched your search
@@ -1,82 +1,86 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/sources_root"
|
||||
android:layout_width="match_parent"
|
||||
style="@style/SurfaceCard"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/surfaceCard">
|
||||
android:layout_gravity="center">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sources_title"
|
||||
style="@style/DialogTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/sources_title"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sources_warning"
|
||||
style="@style/DialogTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/sources_https"
|
||||
app:layout_constraintStart_toStartOf="@+id/sources_title"
|
||||
app:layout_constraintTop_toBottomOf="@+id/sources_title" />
|
||||
<TextView
|
||||
android:id="@+id/sources_title"
|
||||
style="@style/DialogTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="22dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/sources_title"
|
||||
android:textSize="18sp"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_add"
|
||||
app:layout_constraintEnd_toStartOf="@+id/sources_btn_add"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="@+id/sources_btn_neg" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/sources_btn_add"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:backgroundTint="@color/surfaceButton"
|
||||
android:src="@drawable/ic_add"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/sources_warning"
|
||||
app:layout_constraintDimensionRatio="h,1:1"
|
||||
app:layout_constraintEnd_toEndOf="@+id/sources_recycler"
|
||||
app:layout_constraintTop_toTopOf="@+id/sources_title"
|
||||
app:tint="@color/themeAccent" />
|
||||
<Button
|
||||
android:id="@+id/sources_btn_add"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="@string/btn_add"
|
||||
app:layout_constraintEnd_toEndOf="@+id/sources_btn_pos"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/sources_title"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/sources_recycler"
|
||||
style="@style/Recycler"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="280dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/sources_warning">
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/sources_recycler"
|
||||
style="@style/Recycler"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="2dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/sources_btn_pos"
|
||||
app:layout_constraintDimensionRatio="w,1:1"
|
||||
app:layout_constraintEnd_toEndOf="@+id/sources_btn_pos"
|
||||
app:layout_constraintStart_toStartOf="@+id/sources_btn_neg"
|
||||
app:layout_constraintTop_toBottomOf="@+id/sources_btn_add" />
|
||||
|
||||
</androidx.recyclerview.widget.RecyclerView>
|
||||
<Button
|
||||
android:id="@+id/sources_btn_neg"
|
||||
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:text="@string/btn_cancel"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/sources_btn_pos"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/sources_btn_neg"
|
||||
style="@style/DialogButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="12dp"
|
||||
android:text="@string/btn_cancel"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_pos"
|
||||
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
<Button
|
||||
android:id="@+id/sources_btn_pos"
|
||||
style="@style/NormalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBaseline_toBaselineOf="@+id/sources_btn_neg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toEndOf="@+id/sources_btn_neg" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/sources_btn_pos"
|
||||
style="@style/DialogButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="12dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:text="@string/btn_accept"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/sources_recycler" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
@@ -1,38 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/source_root"
|
||||
android:id="@+id/source_input"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="4dp"
|
||||
android:paddingBottom="4dp">
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:hint="@string/sources_hint"
|
||||
app:endIconDrawable="@drawable/ic_clear"
|
||||
app:endIconMode="custom">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/source_input"
|
||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/sources_hint"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/source_btn"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/source_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:inputType="textUri" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/source_url"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:inputType="textUri" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/source_btn"
|
||||
style="@style/ToolbarButton"
|
||||
android:rotation="45"
|
||||
android:src="@drawable/ic_add"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/source_input"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/source_input" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
@@ -2,8 +2,9 @@
|
||||
<resources>
|
||||
<string name="yes">Да</string>
|
||||
<string name="no">Нет</string>
|
||||
<string name="btn_cancel">Отмена</string>
|
||||
<string name="btn_accept">Принять</string>
|
||||
<string name="btn_add">Добавить</string>
|
||||
<string name="btn_cancel">Отмена</string>
|
||||
|
||||
<string name="menu_satellites">Спутники</string>
|
||||
<string name="menu_passes">Пролеты</string>
|
||||
@@ -11,10 +12,8 @@
|
||||
<string name="menu_map">Карта</string>
|
||||
<string name="menu_settings">Настройки</string>
|
||||
|
||||
<string name="sources_title">Управление TLE</string>
|
||||
<string name="sources_hint">URL источника</string>
|
||||
<string name="sources_https">Только протокол HTTPS</string>
|
||||
<string name="sources_error">Пожалуйста, проверьте URL</string>
|
||||
<string name="sources_title">Источники данных</string>
|
||||
<string name="sources_hint">Протокол HTTPS</string>
|
||||
|
||||
<string name="entries_title">Спутники</string>
|
||||
<string name="entries_update">Обновить спутники:</string>
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<dimen name="text_size_copyright">13sp</dimen>
|
||||
<dimen name="text_size_small">15sp</dimen>
|
||||
<dimen name="text_size_medium">16sp</dimen>
|
||||
<dimen name="text_size_mediumLarge">18sp</dimen>
|
||||
<dimen name="text_size_large">20sp</dimen>
|
||||
<dimen name="text_size_frequency">24sp</dimen>
|
||||
<dimen name="text_size_app_timer">42sp</dimen>
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
|
||||
<string name="yes">Yes</string>
|
||||
<string name="no">No</string>
|
||||
<string name="btn_cancel">Cancel</string>
|
||||
<string name="btn_accept">Accept</string>
|
||||
<string name="btn_add">Add</string>
|
||||
<string name="btn_cancel">Cancel</string>
|
||||
|
||||
<string name="menu_satellites">Satellites</string>
|
||||
<string name="menu_passes">Passes</string>
|
||||
@@ -13,10 +14,8 @@
|
||||
<string name="menu_map">World Map</string>
|
||||
<string name="menu_settings">Settings</string>
|
||||
|
||||
<string name="sources_title">Manage TLE sources</string>
|
||||
<string name="sources_hint">Source URL</string>
|
||||
<string name="sources_https">Protocol HTTPS only</string>
|
||||
<string name="sources_error">Please check the entered URL</string>
|
||||
<string name="sources_title">Manage data sources</string>
|
||||
<string name="sources_hint">HTTPS Source</string>
|
||||
|
||||
<string name="entries_title">Satellites</string>
|
||||
<string name="entries_update">TLE data update:</string>
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:backgroundTint">@color/surfaceButton</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:minWidth">96dp</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textColor">@color/themeLight</item>
|
||||
@@ -159,12 +160,18 @@
|
||||
</style>
|
||||
|
||||
<style name="DialogButton">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:backgroundTint">@color/surfaceButton</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
<item name="android:minWidth">96dp</item>
|
||||
<item name="android:maxLines">1</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textColor">@color/themeAccent</item>
|
||||
<item name="android:textColor">@color/themeLight</item>
|
||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||
<item name="cornerRadius">@dimen/btn_corner_high</item>
|
||||
<item name="iconTint">@color/themeLight</item>
|
||||
<item name="rippleColor">@color/themeLight</item>
|
||||
</style>
|
||||
|
||||
<style name="DialogText">
|
||||
@@ -174,11 +181,8 @@
|
||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||
</style>
|
||||
|
||||
<style name="DialogTitle">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:textColor">@color/themeAccent</item>
|
||||
<item name="android:textSize">@dimen/text_size_medium</item>
|
||||
<style name="DialogTitle" parent="ToolbarTitle">
|
||||
<item name="android:textSize">@dimen/text_size_mediumLarge</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
Reference in new issue
Block a user