From cb56bf053c22b958bb819d11aa5391c18c7e8c70 Mon Sep 17 00:00:00 2001
From: Michael Kaiser <patheticpat@googlemail.com>
Date: Tue, 8 Oct 2013 17:23:04 +0200
Subject: Add feed preference to include/exclude certain feeds from auto
 downloads

---
 res/layout/feedinfo.xml | 12 ++++++++++++
 res/values/strings.xml  |  1 +
 2 files changed, 13 insertions(+)

(limited to 'res')

diff --git a/res/layout/feedinfo.xml b/res/layout/feedinfo.xml
index b018eabbe..c146e5c25 100644
--- a/res/layout/feedinfo.xml
+++ b/res/layout/feedinfo.xml
@@ -93,6 +93,18 @@
                     android:layout_below="@id/txtvAuthor"
                     android:layout_margin="8dp"
                     android:layout_toRightOf="@id/center_divider" />
+
+                <CheckBox
+                    android:id="@+id/cbxAutoDownload"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_below="@id/txtvLanguage"
+                    android:layout_margin="8dp"
+                    android:text="@string/auto_download_label"
+                    android:enabled="false"
+                    android:textStyle="bold" />
+
             </RelativeLayout>
 
             <TextView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a0da91420..19c8ae04d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="image_of_prefix">Image of:\u0020</string>
     <string name="save_username_password_label">Save username and password</string>
     <string name="close_label">Close</string>
+    <string name="auto_download_label">Include in auto downloads</string>
     
 
     <!-- 'Add Feed' Activity labels -->
-- 
cgit v1.2.3


From cdd9a0dfdeef8d319063f844fce1e1722f7d9529 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Tue, 8 Oct 2013 23:22:04 +0200
Subject: Added settings and description label to FeedInfoActivity, improved
 layout

---
 res/layout/feedinfo.xml | 76 +++++++++++++++++++++++++++++++------------------
 res/values/strings.xml  |  2 ++
 2 files changed, 50 insertions(+), 28 deletions(-)

(limited to 'res')

diff --git a/res/layout/feedinfo.xml b/res/layout/feedinfo.xml
index c146e5c25..e1c1c10a3 100644
--- a/res/layout/feedinfo.xml
+++ b/res/layout/feedinfo.xml
@@ -1,14 +1,14 @@
 <?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:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical" >
+        android:gravity="center_vertical">
 
         <ImageView
             android:id="@+id/imgvCover"
@@ -16,7 +16,7 @@
             android:layout_height="70dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:layout_margin="4dp" />
+            android:layout_margin="4dp"/>
 
         <TextView
             android:id="@+id/txtvTitle"
@@ -26,37 +26,38 @@
             android:layout_margin="4dp"
             android:layout_toRightOf="@id/imgvCover"
             android:textSize="@dimen/text_size_large"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:textColor="?android:attr/textColorPrimary"/>
 
         <View
             android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/imgvCover"
-            android:background="@color/bright_blue" />
+            android:background="@color/bright_blue"/>
     </RelativeLayout>
 
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" >
+        android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp" >
+                android:layout_marginBottom="16dp">
 
                 <View
                     android:id="@+id/center_divider"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:layout_centerHorizontal="true" />
+                    android:layout_centerHorizontal="true"/>
 
                 <TextView
                     android:id="@+id/lblAuthor"
@@ -65,7 +66,7 @@
                     android:layout_alignParentLeft="true"
                     android:layout_margin="8dp"
                     android:text="@string/author_label"
-                    android:textStyle="bold" />
+                    android:textColor="?android:attr/textColorPrimary"/>
 
                 <TextView
                     android:id="@+id/txtvAuthor"
@@ -73,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_margin="8dp"
-                    android:layout_toRightOf="@id/center_divider" />
+                    android:layout_toRightOf="@id/center_divider"/>
 
                 <TextView
                     android:id="@+id/lblLanguage"
@@ -83,7 +84,7 @@
                     android:layout_below="@id/txtvAuthor"
                     android:layout_margin="8dp"
                     android:text="@string/language_label"
-                    android:textStyle="bold" />
+                    android:textColor="?android:attr/textColorPrimary"/>
 
                 <TextView
                     android:id="@+id/txtvLanguage"
@@ -92,26 +93,45 @@
                     android:layout_alignParentRight="true"
                     android:layout_below="@id/txtvAuthor"
                     android:layout_margin="8dp"
-                    android:layout_toRightOf="@id/center_divider" />
-
-                <CheckBox
-                    android:id="@+id/cbxAutoDownload"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_below="@id/txtvLanguage"
-                    android:layout_margin="8dp"
-                    android:text="@string/auto_download_label"
-                    android:enabled="false"
-                    android:textStyle="bold" />
-
+                    android:layout_toRightOf="@id/center_divider"/>
             </RelativeLayout>
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="24dp"
+                android:textSize="@dimen/text_size_medium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:text="@string/description_label"/>
+
             <TextView
                 android:id="@+id/txtvDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp" />
+                android:layout_margin="8dp"/>
+
+            <TextView
+                android:id="@+id/txtvSettings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/podcast_settings_label"
+                android:textSize="@dimen/text_size_medium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_marginLeft="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="24dp"/>
+
+            <CheckBox
+                android:id="@+id/cbxAutoDownload"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/auto_download_label"
+                android:enabled="false"
+                android:textColor="?android:attr/textColorPrimary"/>
         </LinearLayout>
     </ScrollView>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19c8ae04d..a4c342ac4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="cancel_label">Cancel</string>
     <string name="author_label">Author</string>
     <string name="language_label">Language</string>
+    <string name="podcast_settings_label">Settings</string>
     <string name="cover_label">Cover</string>
     <string name="error_label">Error</string>
     <string name="error_msg_prefix">An error occurred:</string>
@@ -41,6 +42,7 @@
     <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string>
     <string name="chapters_label">Chapters</string>
     <string name="shownotes_label">Shownotes</string>
+    <string name="description_label">Description</string>
     <string name="most_recent_prefix">Most Recent Episode:\u0020</string>
     <string name="episodes_suffix">\u0020episodes</string>
     <string name="published_prefix">Published:\u0020</string>
-- 
cgit v1.2.3