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/edit_tags_dialog.xml40
-rw-r--r--app/src/main/res/layout/fragment_subscriptions.xml1
-rw-r--r--app/src/main/res/layout/nav_list.xml2
-rw-r--r--app/src/main/res/xml/feed_settings.xml6
4 files changed, 48 insertions, 1 deletions
diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml
new file mode 100644
index 000000000..e83cce9cf
--- /dev/null
+++ b/app/src/main/res/layout/edit_tags_dialog.xml
@@ -0,0 +1,40 @@
+<?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="match_parent"
+ android:orientation="vertical"
+ android:padding="16dp">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/tagsRecycler"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <CheckBox
+ android:id="@+id/rootFolderCheckbox"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/feed_folders_include_root" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <EditText
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:inputType="text"
+ android:ems="10"
+ android:id="@+id/newTagEditText"/>
+
+ <ImageButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="?attr/content_new"
+ android:contentDescription="@string/new_label"
+ android:id="@+id/newTagButton"/>
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index d08e0c501..c738300c5 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -12,6 +12,7 @@
android:theme="?attr/actionBarTheme"
android:layout_alignParentTop="true"
app:title="@string/subscriptions_label"
+ app:navigationIcon="?homeAsUpIndicator"
android:id="@+id/toolbar"/>
<TextView
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index ed850cc86..70a71a453 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -57,7 +57,7 @@
android:background="?android:attr/listDivider"
tools:background="@android:color/holo_red_dark" />
- <ListView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/nav_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 13288fbda..8a63ac8e9 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -23,6 +23,12 @@
android:title="@string/authentication_label"
android:summary="@string/authentication_descr"/>
+ <Preference
+ android:key="tags"
+ android:icon="?attr/ic_folder"
+ android:title="@string/feed_folders_label"
+ android:summary="@string/feed_folders_summary"/>
+
<ListPreference
android:key="feedPlaybackSpeed"
android:icon="?attr/ic_settings_speed"