summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/import_export_activity.xml34
-rw-r--r--app/src/main/res/layout/opml_import.xml65
-rw-r--r--app/src/main/res/layout/time_dialog.xml122
-rw-r--r--app/src/main/res/xml/preferences_import_export.xml36
-rw-r--r--app/src/main/res/xml/preferences_storage.xml21
5 files changed, 116 insertions, 162 deletions
diff --git a/app/src/main/res/layout/import_export_activity.xml b/app/src/main/res/layout/import_export_activity.xml
deleted file mode 100644
index 97ff34e41..000000000
--- a/app/src/main/res/layout/import_export_activity.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:id="@+id/import_export_layout"
- android:padding="8dp"
- android:clipToPadding="false">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/import_export_warning"
- android:gravity="center_horizontal"/>
-
- <Button
- android:text="@string/label_export"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/button_export"
- android:layout_marginTop="24dp"/>
-
- <Button
- android:text="@string/label_import"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/button_import"/>
- </LinearLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml
deleted file mode 100644
index 9b2036228..000000000
--- a/app/src/main/res/layout/opml_import.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingTop="8dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingBottom="8dp"
- tools:background="@android:color/darker_gray">
-
- <TextView
- android:id="@+id/txtvHeadingExplanation"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/AntennaPod.TextView.Heading"
- android:text="@string/txtvfeedurl_label"/>
-
- <TextView
- android:id="@+id/txtvExplanation"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/opml_import_explanation_1"
- android:textSize="@dimen/text_size_medium"
- android:layout_marginTop="4dp"
- tools:background="@android:color/holo_green_dark" />
-
- <Button
- android:id="@+id/butChooseFileFromFilesystem"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="8dp"
- android:text="@string/choose_file_from_filesystem" />
-
- <View
- android:id="@+id/divider"
- android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:layout_margin="16dp"
- android:background="?android:attr/listDivider"/>
-
- <TextView
- android:id="@+id/txtvHeadingExplanationOpenWith"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/AntennaPod.TextView.Heading"
- android:text="@string/txtvfeedurl_label"/>
-
- <TextView
- android:id="@+id/txtvExplanationOpenWith"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/opml_import_explanation_3"
- android:textSize="@dimen/text_size_medium"
- android:layout_marginTop="4dp"
- tools:background="@android:color/holo_green_dark" />
-
- </LinearLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index b3742c20c..8ada0d6cf 100644
--- a/app/src/main/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
@@ -1,67 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center"
- android:padding="16dp">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ android:padding="16dp">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <EditText
- android:id="@+id/etxtTime"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_margin="8dp"
- android:ems="2"
- android:hint="@string/enter_time_here_label"
- android:inputType="number"
- android:maxLength="2" >
-
- <requestFocus />
- </EditText>
-
- <Spinner
- android:id="@+id/spTimeUnit"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp" />
+ android:id="@+id/timeSetup"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <EditText
+ android:id="@+id/etxtTime"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_margin="8dp"
+ android:ems="2"
+ android:inputType="number"
+ android:maxLength="3"/>
+
+ <Spinner
+ android:id="@+id/spTimeUnit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:layout_marginTop="8dp"/>
+ </LinearLayout>
+
+ <Button
+ android:text="@string/set_sleeptimer_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/setSleeptimerButton"/>
</LinearLayout>
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/timeDisplay"
+ android:orientation="vertical"
+ android:visibility="gone">
<TextView
- android:layout_width="wrap_content"
+ android:text="00:00:00"
+ android:layout_gravity="center"
+ android:textSize="32sp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/time"/>
+
+ <Button
+ android:text="@string/disable_sleeptimer_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/disableSleeptimerButton"/>
+
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:text="@string/timer_about_to_expire_label"
- android:textSize="16sp" />
+ android:orientation="vertical"
+ android:layout_marginTop="8dp">
<CheckBox
- android:id="@+id/cbShakeToReset"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/shake_to_reset_label" />
+ android:id="@+id/cbShakeToReset"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/shake_to_reset_label"/>
<CheckBox
- android:id="@+id/cbVibrate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/timer_vibration_label" />
+ android:id="@+id/cbVibrate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/timer_vibration_label"/>
<CheckBox
- android:id="@+id/chAutoEnable"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/auto_enable_label" />
+ android:id="@+id/chAutoEnable"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/auto_enable_label"/>
</LinearLayout>
diff --git a/app/src/main/res/xml/preferences_import_export.xml b/app/src/main/res/xml/preferences_import_export.xml
new file mode 100644
index 000000000..12e27236d
--- /dev/null
+++ b/app/src/main/res/xml/preferences_import_export.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch">
+
+ <PreferenceCategory android:title="@string/database">
+ <Preference
+ android:key="prefDatabaseExport"
+ search:keywords="@string/import_export_search_keywords"
+ android:title="@string/database_export_label"
+ android:summary="@string/database_export_summary"/>
+ <Preference
+ android:key="prefDatabaseImport"
+ search:keywords="@string/import_export_search_keywords"
+ android:title="@string/database_import_label"
+ android:summary="@string/database_import_summary"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/opml">
+ <Preference
+ android:key="prefOpmlExport"
+ android:title="@string/opml_export_label"
+ android:summary="@string/opml_export_summary"/>
+ <Preference
+ android:key="prefOpmlImport"
+ android:title="@string/opml_import_label"
+ android:summary="@string/opml_import_summary"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory android:title="@string/html">
+ <Preference
+ android:key="prefHtmlExport"
+ android:title="@string/html_export_label"
+ android:summary="@string/html_export_summary"/>
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml
index 9f394ad12..18e2abb31 100644
--- a/app/src/main/res/xml/preferences_storage.xml
+++ b/app/src/main/res/xml/preferences_storage.xml
@@ -31,20 +31,9 @@
android:key="prefDeleteRemovesFromQueue"
android:summary="@string/pref_delete_removes_from_queue_sum"
android:title="@string/pref_delete_removes_from_queue_title"/>
-
- <PreferenceCategory android:title="@string/import_export_pref">
- <Preference
- android:key="prefOpmlExport"
- android:title="@string/opml_export_label"/>
- <Preference
- android:key="prefOpmlImport"
- android:title="@string/opml_import_label"/>
- <Preference
- android:key="prefHtmlExport"
- android:title="@string/html_export_label"/>
- <Preference
- android:key="importExport"
- search:keywords="@string/import_export_search_keywords"
- android:title="@string/import_export"/>
- </PreferenceCategory>
+ <Preference
+ android:title="@string/import_export_pref"
+ android:summary="@string/import_export_summary"
+ android:key="prefImportExport"
+ search:ignore="true"/>
</PreferenceScreen>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 08:35:33 +0000