Merge pull request #3229 from ByteHamster/feed-settings-update

Updated feed settings screen

3 files changed, 129 insertions, 207 deletions

diff --git a/app/src/main/res/layout/episode_filter_dialog.xml b/app/src/main/res/layout/episode_filter_dialog.xml
new file mode 100644
index 000000000..6a02c82f7
--- /dev/null
+++ b/app/src/main/res/layout/episode_filter_dialog.xml
@@ -0,0 +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="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/radio_filter_group"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RadioButton
+                android:id="@+id/radio_filter_include"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/episode_filters_include" />
+
+            <RadioButton
+                android:id="@+id/radio_filter_exclude"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/episode_filters_exclude" />
+        </RadioGroup>
+
+        <EditText
+            android:id="@+id/etxtEpisodeFilterText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:lines="8"
+            android:minLines="1"
+            android:maxLines="20"
+            android:scrollbars="vertical"
+            android:hint="@string/episode_filters_hint"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:cursorVisible="true" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/footer"
+        android:layout_width="fill_parent"
+        android:layout_height="48dp">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_alignParentTop="true"
+            android:background="?android:attr/dividerVertical" />
+
+        <View
+            android:id="@+id/horizontal_divider"
+            android:layout_width="1dip"
+            android:layout_height="fill_parent"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:background="?android:attr/dividerVertical" />
+
+        <Button
+            android:id="@+id/butCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@id/horizontal_divider"
+            android:layout_toStartOf="@id/horizontal_divider"
+            android:background="?android:attr/selectableItemBackground"
+            android:text="@string/cancel_label" />
+
+        <Button
+            android:id="@+id/butConfirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/horizontal_divider"
+            android:layout_toEndOf="@id/horizontal_divider"
+            android:background="?android:attr/selectableItemBackground"
+            android:text="@string/confirm_label" />
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/feedsettings.xml b/app/src/main/res/layout/feedsettings.xml
index 9e5f2245b..b40148b00 100644
--- a/app/src/main/res/layout/feedsettings.xml
+++ b/app/src/main/res/layout/feedsettings.xml
@@ -1,218 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
 
     <include layout="@layout/feeditemlist_header" />
 
-    <ScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scrollbarStyle="outsideOverlay"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="8dp"
-        android:clipToPadding="false">
-
-        <LinearLayout
+    <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.GridLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:columnCount="2"
-                app:rowCount="1">
-
-                <TextView
-                    android:id="@+id/txtvFeedAutoDelete"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/auto_delete_label"
-                    app:layout_row="0"
-                    app:layout_column="0"
-                    app:layout_gravity="center_vertical"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginEnd="10dp" />
-
-                <Spinner
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:id="@+id/spnAutoDelete"
-                    android:entries="@array/spnAutoDeleteItems"
-                    android:layout_marginTop="8dp"
-                    app:layout_row="0"
-                    app:layout_column="1"
-                    android:spinnerMode="dropdown"
-                    app:layout_gravity="center"
-                    android:dropDownWidth="wrap_content"
-                    android:clickable="true" />
-            </android.support.v7.widget.GridLayout>
-
-            <CheckBox
-                android:id="@+id/cbxKeepUpdated"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/keep_updated"
-                android:enabled="true"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:background="@android:color/holo_red_light"
-                android:checked="true" />
-
-            <TextView
-                android:id="@+id/txtvAuthentication"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/authentication_label"
-                android:textSize="@dimen/text_size_medium"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <TextView
-                android:id="@+id/txtvAuthenticationDescr"
-                android:text="@string/authentication_descr"
-                android:textSize="@dimen/text_size_small"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"/>
-
-            <android.support.v7.widget.GridLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:columnCount="2"
-                app:rowCount="3"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:id="@+id/txtvUsername"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="8dp"
-                    app:layout_row="0"
-                    app:layout_column="0"
-                    android:text="@string/username_label"
-                    android:textColor="?android:attr/textColorPrimary"/>
-
-                <EditText
-                    android:id="@+id/etxtUsername"
-                    android:layout_width="140sp"
-                    android:layout_height="wrap_content"
-                    app:layout_row="0"
-                    app:layout_column="1"
-                    android:hint="@string/username_label"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:cursorVisible="true"/>
-
-                <TextView
-                    android:id="@+id/txtvPassword"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="8dp"
-                    app:layout_row="1"
-                    app:layout_column="0"
-                    android:text="@string/password_label"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <EditText
-                    android:id="@+id/etxtPassword"
-                    android:layout_width="140sp"
-                    android:layout_height="wrap_content"
-                    app:layout_row="1"
-                    app:layout_column="1"
-                    android:hint="@string/password_label"
-                    android:inputType="textPassword"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:cursorVisible="true"/>
-
-            </android.support.v7.widget.GridLayout>
-
-            <TextView
-                android:id="@+id/txtvAutoDownloadSettings"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/auto_download_settings_label"
-                android:textSize="@dimen/text_size_medium"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <CheckBox
-                android:id="@+id/cbxAutoDownload"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/auto_download_label"
-                android:enabled="false"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:background="@android:color/holo_red_light"
-                android:checked="false" />
-
-            <TextView
-                android:id="@+id/txtvEpisodeFilters"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/episode_filters_label"
-                android:textSize="@dimen/text_size_medium"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <TextView
-                android:id="@+id/txtvEpisodeFiltersDescription"
-                android:text="@string/episode_filters_description"
-                android:textSize="@dimen/text_size_small"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"/>
-
-            <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
-                        android:id="@+id/radio_filter_group"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-                <RadioButton android:id="@+id/radio_filter_include"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:text="@string/episode_filters_include" />
-                <RadioButton android:id="@+id/radio_filter_exclude"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:text="@string/episode_filters_exclude" />
-            </RadioGroup>
-
-            <EditText
-                android:id="@+id/etxtEpisodeFilterText"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="8"
-                android:minLines="1"
-                android:maxLines="20"
-                android:scrollbars="vertical"
-                android:hint="@string/episode_filters_hint"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:cursorVisible="true"/>
-
-        </LinearLayout>
-
-    </ScrollView>
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:id="@+id/settings_fragment_container" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
new file mode 100644
index 000000000..5fd6b2038
--- /dev/null
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <SwitchPreference
+            android:key="keepUpdated"
+            android:title="@string/keep_updated"
+            android:summary="@string/keep_updated_summary"/>
+
+    <Preference
+            android:key="authentication"
+            android:title="@string/authentication_label"
+            android:summary="@string/authentication_descr"/>
+
+    <ListPreference
+            android:entries="@array/spnAutoDeleteItems"
+            android:entryValues="@array/spnAutoDeleteValues"
+            android:title="@string/auto_delete_label"
+            android:key="autoDelete"/>
+
+    <PreferenceCategory android:title="@string/auto_download_settings_label">
+        <SwitchPreference
+                android:key="autoDownload"
+                android:title="@string/auto_download_label"/>
+        <Preference
+                android:key="episodeFilter"
+                android:title="@string/episode_filters_label"
+                android:summary="@string/episode_filters_description"/>
+    </PreferenceCategory>
+</PreferenceScreen>