summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-v14/addfeed.xml69
-rw-r--r--res/layout-v14/authentication_dialog.xml81
-rw-r--r--res/layout/addfeed.xml64
-rw-r--r--res/layout/authentication_dialog.xml62
-rw-r--r--res/layout/gpodnet_main.xml19
-rw-r--r--res/layout/gpodnet_podcast_list.xml34
-rw-r--r--res/layout/gpodnet_podcast_listitem.xml44
-rw-r--r--res/layout/gpodnet_search.xml12
-rw-r--r--res/layout/gpodnet_tag_activity.xml12
-rw-r--r--res/layout/gpodnetauth_activity.xml10
-rw-r--r--res/layout/gpodnetauth_credentials.xml85
-rw-r--r--res/layout/gpodnetauth_device.xml104
-rw-r--r--res/layout/gpodnetauth_finish.xml44
-rw-r--r--res/layout/itemdescription_listitem.xml27
-rw-r--r--res/layout/onlinefeedview_header.xml66
-rw-r--r--res/values/arrays.xml4
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/ids.xml4
-rw-r--r--res/values/strings.xml57
-rw-r--r--res/xml/gpodnet_searchable.xml5
-rw-r--r--res/xml/preferences.xml114
22 files changed, 839 insertions, 81 deletions
diff --git a/res/layout-v14/addfeed.xml b/res/layout-v14/addfeed.xml
index 14d3a2a67..5760bea95 100644
--- a/res/layout-v14/addfeed.xml
+++ b/res/layout-v14/addfeed.xml
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
<RelativeLayout
android:id="@+id/footer"
android:layout_width="fill_parent"
android:layout_height="48dp"
- android:layout_alignParentBottom="true" >
+ android:focusableInTouchMode="true"
+ android:layout_alignParentBottom="true">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_alignParentTop="true"
- android:background="?android:attr/dividerVertical" />
+ android:background="?android:attr/dividerVertical"/>
<View
android:id="@+id/horizontal_divider"
@@ -24,7 +25,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
- android:background="?android:attr/dividerVertical" />
+ android:background="?android:attr/dividerVertical"/>
<Button
android:id="@+id/butCancel"
@@ -35,7 +36,7 @@
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/horizontal_divider"
android:background="?android:attr/selectableItemBackground"
- android:text="@string/cancel_label" />
+ android:text="@string/cancel_label"/>
<Button
android:id="@+id/butConfirm"
@@ -46,7 +47,7 @@
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/horizontal_divider"
android:background="?android:attr/selectableItemBackground"
- android:text="@string/confirm_label" />
+ android:text="@string/confirm_label"/>
</RelativeLayout>
<ScrollView
@@ -54,21 +55,22 @@
android:layout_height="0dp"
android:layout_above="@id/footer"
android:layout_alignParentTop="true"
- android:scrollbars="vertical" >
+ android:scrollbars="vertical">
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/txtvFeedurl"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_margin="8dp"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:text="@string/txtvfeedurl_label" />
+ android:layout_margin="16dp"
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/txtvfeedurl_label"/>
<EditText
android:id="@+id/etxtFeedurl"
@@ -77,23 +79,35 @@
android:layout_below="@id/txtvFeedurl"
android:layout_margin="8dp"
android:hint="@string/feedurl_label"
- android:inputType="textUri" />
+ android:inputType="textUri"/>
<TextView
- android:id="@+id/txtvBrowseMiroguide"
+ android:id="@+id/txtvPodcastDirectories"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/etxtFeedurl"
android:layout_margin="8dp"
- android:text="@string/txtv_browse_miroguide_label" />
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/podcastdirectories_label"/>
+
+ <Button
+ android:id="@+id/butBrowseGpoddernet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvPodcastDirectories"
+ android:layout_margin="8dp"
+ android:text="@string/gpodnet_main_label"/>
<Button
android:id="@+id/butBrowseMiroguide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvBrowseMiroguide"
+ android:layout_below="@id/butBrowseGpoddernet"
android:layout_margin="8dp"
- android:text="@string/browse_miroguide_label" />
+ android:text="@string/miro_guide_label"/>
+
<TextView
android:id="@+id/txtvOpmlImport"
@@ -101,17 +115,28 @@
android:layout_height="wrap_content"
android:layout_below="@id/butBrowseMiroguide"
android:layout_margin="8dp"
- android:text="@string/opml_import_txtv_button_lable" />
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/opml_import_label"/>
+
+ <TextView
+ android:id="@+id/txtvOpmlImportExpl"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvOpmlImport"
+ android:layout_margin="8dp"
+ android:text="@string/opml_import_txtv_button_lable"/>
<Button
android:id="@+id/butOpmlImport"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvOpmlImport"
+ android:layout_below="@id/txtvOpmlImportExpl"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
- android:text="@string/opml_import_label" />
+ android:text="@string/opml_import_label"/>
</RelativeLayout>
</ScrollView>
diff --git a/res/layout-v14/authentication_dialog.xml b/res/layout-v14/authentication_dialog.xml
new file mode 100644
index 000000000..ed05dab1c
--- /dev/null
+++ b/res/layout-v14/authentication_dialog.xml
@@ -0,0 +1,81 @@
+<?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" >
+
+ <EditText
+ android:id="@+id/etxtUsername"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_margin="16dp"
+ android:hint="@string/username_label"/>
+
+ <EditText
+ android:id="@+id/etxtPassword"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_margin="16dp"
+ android:inputType="textPassword"
+ android:hint="@string/password_label"/>
+
+ <CheckBox
+ android:id="@+id/chkSaveUsernamePassword"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ android:text="@string/save_username_password_label"/>
+ </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_alignParentTop="true"
+ android:layout_toLeftOf="@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_alignParentTop="true"
+ android:layout_toRightOf="@id/horizontal_divider"
+ android:background="?android:attr/selectableItemBackground"
+ android:text="@string/confirm_label" />
+ </RelativeLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/addfeed.xml b/res/layout/addfeed.xml
index 39552976b..bb72a2be1 100644
--- a/res/layout/addfeed.xml
+++ b/res/layout/addfeed.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/footer"
@@ -10,21 +10,21 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:orientation="horizontal" >
+ android:orientation="horizontal">
<Button
android:id="@+id/butConfirm"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/confirm_label" />
+ android:text="@string/confirm_label"/>
<Button
android:id="@+id/butCancel"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/cancel_label" />
+ android:text="@string/cancel_label"/>
</LinearLayout>
<ScrollView
@@ -32,21 +32,22 @@
android:layout_height="0dp"
android:layout_above="@id/footer"
android:layout_alignParentTop="true"
- android:scrollbars="vertical" >
+ android:scrollbars="vertical">
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/txtvFeedurl"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_margin="8dp"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:text="@string/txtvfeedurl_label" />
+ android:layout_margin="16dp"
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/txtvfeedurl_label"/>
<EditText
android:id="@+id/etxtFeedurl"
@@ -55,23 +56,35 @@
android:layout_below="@id/txtvFeedurl"
android:layout_margin="8dp"
android:hint="@string/feedurl_label"
- android:inputType="textUri" />
+ android:inputType="textUri"/>
<TextView
- android:id="@+id/txtvBrowseMiroguide"
+ android:id="@+id/txtvPodcastDirectories"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/etxtFeedurl"
android:layout_margin="8dp"
- android:text="@string/txtv_browse_miroguide_label" />
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/podcastdirectories_label"/>
+
+ <Button
+ android:id="@+id/butBrowseGpoddernet"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvPodcastDirectories"
+ android:layout_margin="8dp"
+ android:text="@string/gpodnet_main_label"/>
<Button
android:id="@+id/butBrowseMiroguide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvBrowseMiroguide"
+ android:layout_below="@id/butBrowseGpoddernet"
android:layout_margin="8dp"
- android:text="@string/browse_miroguide_label" />
+ android:text="@string/miro_guide_label"/>
+
<TextView
android:id="@+id/txtvOpmlImport"
@@ -79,17 +92,28 @@
android:layout_height="wrap_content"
android:layout_below="@id/butBrowseMiroguide"
android:layout_margin="8dp"
- android:text="@string/opml_import_txtv_button_lable" />
+ android:textSize="@dimen/text_size_large"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"
+ android:text="@string/opml_import_label"/>
+
+ <TextView
+ android:id="@+id/txtvOpmlImportExpl"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvOpmlImport"
+ android:layout_margin="8dp"
+ android:text="@string/opml_import_txtv_button_lable"/>
<Button
android:id="@+id/butOpmlImport"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/txtvOpmlImport"
+ android:layout_below="@id/txtvOpmlImportExpl"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
- android:text="@string/opml_import_label" />
+ android:text="@string/opml_import_label"/>
</RelativeLayout>
</ScrollView>
diff --git a/res/layout/authentication_dialog.xml b/res/layout/authentication_dialog.xml
new file mode 100644
index 000000000..82260eb43
--- /dev/null
+++ b/res/layout/authentication_dialog.xml
@@ -0,0 +1,62 @@
+<?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">
+
+ <EditText
+ android:id="@+id/etxtUsername"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_margin="16dp"
+ android:hint="@string/username_label"/>
+
+ <EditText
+ android:id="@+id/etxtPassword"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_margin="16dp"
+ android:inputType="textPassword"
+ android:hint="@string/password_label"/>
+
+ <CheckBox
+ android:id="@+id/chkSaveUsernamePassword"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ android:text="@string/save_username_password_label"/>
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ style="@android:style/ButtonBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/butConfirm"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="8dp"
+ android:text="@string/confirm_label"
+ android:layout_weight="1"/>
+
+ <Button
+ android:id="@+id/butCancel"
+ android:text="@string/cancel_label"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+ </LinearLayout>
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/gpodnet_main.xml b/res/layout/gpodnet_main.xml
new file mode 100644
index 000000000..1017a6a65
--- /dev/null
+++ b/res/layout/gpodnet_main.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/main_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/viewpager"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1">
+ <android.support.v4.view.PagerTabStrip
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top" />
+ </android.support.v4.view.ViewPager>
+
+</LinearLayout>
diff --git a/res/layout/gpodnet_podcast_list.xml b/res/layout/gpodnet_podcast_list.xml
new file mode 100644
index 000000000..e69c2dbee
--- /dev/null
+++ b/res/layout/gpodnet_podcast_list.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <GridView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/gridView"
+ android:stretchMode="columnWidth"
+ android:numColumns="auto_fit"
+ android:verticalSpacing="4dp"
+ android:horizontalSpacing="4dp"
+ android:gravity="center"
+ android:columnWidth="200dp"
+ tools:listitem="@layout/gpodnet_podcast_listitem"/>
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/progressBar"
+ android:layout_gravity="center"
+ android:indeterminateOnly="true"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/txtvError"
+ android:layout_gravity="center"
+ android:visibility="gone"
+ android:textSize="@dimen/text_size_small"/>
+</FrameLayout> \ No newline at end of file
diff --git a/res/layout/gpodnet_podcast_listitem.xml b/res/layout/gpodnet_podcast_listitem.xml
new file mode 100644
index 000000000..f6ddb3bd8
--- /dev/null
+++ b/res/layout/gpodnet_podcast_listitem.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <ImageView
+ android:id="@+id/imgvCover"
+ android:layout_width="@dimen/thumbnail_length_itemlist"
+ android:layout_height="@dimen/thumbnail_length_itemlist"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="4dip"
+ android:adjustViewBounds="true"
+ android:cropToPadding="true"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/thumbnail_length_itemlist"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@id/imgvCover"
+ android:layout_marginRight="8dp"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/txtvTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_size_small" />
+
+ <TextView
+ android:id="@+id/txtvDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_micro" />
+
+ </LinearLayout>
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/gpodnet_search.xml b/res/layout/gpodnet_search.xml
new file mode 100644
index 000000000..deb9cffd6
--- /dev/null
+++ b/res/layout/gpodnet_search.xml
@@ -0,0 +1,12 @@
+<?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" >
+
+ <FrameLayout
+ android:id="@+id/searchListFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/gpodnet_tag_activity.xml b/res/layout/gpodnet_tag_activity.xml
new file mode 100644
index 000000000..01feb216f
--- /dev/null
+++ b/res/layout/gpodnet_tag_activity.xml
@@ -0,0 +1,12 @@
+<?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" >
+
+ <FrameLayout
+ android:id="@+id/taglistFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/gpodnetauth_activity.xml b/res/layout/gpodnetauth_activity.xml
new file mode 100644
index 000000000..cd428fbdf
--- /dev/null
+++ b/res/layout/gpodnetauth_activity.xml
@@ -0,0 +1,10 @@
+<?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">
+<ViewFlipper
+ android:id="@+id/viewflipper"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+</ScrollView> \ No newline at end of file
diff --git a/res/layout/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml
new file mode 100644
index 000000000..b66fc9414
--- /dev/null
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@id/txtvTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_login_title"
+ android:layout_alignParentTop="true"
+ android:textSize="@dimen/text_size_large"
+ android:layout_margin="16dp"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"/>
+
+ <TextView
+ android:id="@id/txtvDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_login_descr"
+ android:layout_below="@id/txtvTitle"
+ android:textSize="@dimen/text_size_medium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_margin="16dp"/>
+
+ <EditText
+ android:id="@+id/etxtUsername"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/username_label"
+ android:layout_below="@id/txtvDescription"
+ android:layout_margin="8dp"/>
+
+ <EditText
+ android:id="@+id/etxtPassword"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/password_label"
+ android:layout_below="@id/etxtUsername"
+ android:inputType="textPassword"
+ android:layout_margin="8dp"/>
+
+ <Button
+ android:id="@+id/butLogin"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/etxtPassword"
+ android:layout_alignParentRight="true"
+ android:text="@string/gpodnetauth_login_butLabel"
+ android:layout_margin="8dp"/>
+
+ <TextView
+ android:id="@+id/txtvError"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/etxtPassword"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/butLogin"
+ android:textColor="@color/download_failed_red"
+ android:textSize="@dimen/text_size_small"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:layout_margin="16dp"/>
+
+ <ProgressBar
+ android:id="@+id/progBarLogin"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:layout_alignTop="@+id/butLogin"
+ android:layout_toLeftOf="@+id/butLogin"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="@dimen/text_size_medium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_margin="16dp"
+ android:text="@string/gpodnetauth_login_register"
+ android:autoLink="web"
+ android:layout_below="@id/butLogin"/>
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml
new file mode 100644
index 000000000..ac08cb5ad
--- /dev/null
+++ b/res/layout/gpodnetauth_device.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/txtvTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_device_title"
+ android:layout_alignParentTop="true"
+ android:textSize="@dimen/text_size_large"
+ android:layout_margin="16dp"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"/>
+
+ <TextView
+ android:id="@+id/txtvDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_device_descr"
+ android:layout_below="@id/txtvTitle"
+ android:textSize="@dimen/text_size_medium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_margin="16dp"/>
+
+ <EditText
+ android:id="@+id/etxtCaption"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/gpodnetauth_device_caption"
+ android:layout_below="@id/txtvDescription"
+ android:layout_margin="8dp"/>
+
+ <EditText
+ android:id="@+id/etxtDeviceID"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/gpodnetauth_device_deviceID"
+ android:layout_below="@id/etxtCaption"
+ android:layout_margin="8dp"/>
+
+ <Button
+ android:id="@+id/butCreateNewDevice"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:layout_alignParentRight="true"
+ android:layout_below="@id/etxtDeviceID"
+ android:text="@string/gpodnetauth_device_butCreateNewDevice"/>
+
+ <TextView
+ android:id="@+id/txtvError"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@id/etxtCaption"
+ android:layout_alignBottom="@id/butCreateNewDevice"
+ android:textColor="@color/download_failed_red"
+ android:layout_margin="16dp"
+ android:textSize="@dimen/text_size_medium"
+ />
+
+ <ProgressBar
+ android:id="@+id/progbarCreateDevice"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@id/butCreateNewDevice"
+ android:layout_toLeftOf="@id/butCreateNewDevice"
+ android:textColor="@color/download_failed_red"
+ android:textSize="@dimen/text_size_medium"
+ android:visibility="gone"
+ />
+
+ <TextView
+ android:id="@+id/txtvChooseExistingDevice"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_device_chooseExistingDevice"
+ android:layout_below="@id/butCreateNewDevice"
+ android:textSize="@dimen/text_size_medium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_margin="16dp"/>
+
+ <Button
+ android:id="@+id/butChooseExistingDevice"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_device_butChoose"
+ android:layout_below="@+id/spinnerChooseDevice"
+ android:layout_alignLeft="@+id/butCreateNewDevice"
+ android:layout_alignRight="@+id/butCreateNewDevice"/>
+
+ <Spinner
+ android:id="@+id/spinnerChooseDevice"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvChooseExistingDevice"
+ android:layout_alignParentLeft="true"
+ android:layout_margin="8dp"
+ android:layout_alignParentRight="true"/>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/gpodnetauth_finish.xml b/res/layout/gpodnetauth_finish.xml
new file mode 100644
index 000000000..3b0b10d04
--- /dev/null
+++ b/res/layout/gpodnetauth_finish.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/txtvTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_finish_title"
+ android:layout_alignParentTop="true"
+ android:textSize="@dimen/text_size_large"
+ android:layout_margin="16dp"
+ android:textColor="@color/bright_blue"
+ android:textStyle="italic"/>
+
+ <TextView
+ android:id="@+id/txtvDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/gpodnetauth_finish_descr"
+ android:layout_below="@id/txtvTitle"
+ android:textSize="@dimen/text_size_medium"
+ android:textColor="?android:attr/textColorSecondary"
+ android:layout_margin="16dp"/>
+
+ <Button
+ android:id="@+id/butSyncNow"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/txtvDescription"
+ android:layout_margin="16dp"
+ android:text="@string/gpodnetauth_finish_butsyncnow"/>
+
+ <Button
+ android:id="@+id/butGoMainscreen"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/butSyncNow"
+ android:layout_margin="16dp"
+ android:text="@string/gpodnetauth_finish_butgomainscreen"/>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/itemdescription_listitem.xml b/res/layout/itemdescription_listitem.xml
new file mode 100644
index 000000000..d6a3f6a16
--- /dev/null
+++ b/res/layout/itemdescription_listitem.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/txtvTitle"
+ android:layout_margin="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lines="1"
+ android:ellipsize="end"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_size_small"/>
+
+ <TextView
+ android:id="@+id/txtvDescription"
+ android:layout_margin="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lines="3"
+ android:ellipsize="end"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_micro"/>
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/onlinefeedview_header.xml b/res/layout/onlinefeedview_header.xml
new file mode 100644
index 000000000..6bbecde1e
--- /dev/null
+++ b/res/layout/onlinefeedview_header.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/imgvCover"
+ android:layout_width="@dimen/thumbnail_length_onlinefeedview"
+ android:layout_height="@dimen/thumbnail_length_onlinefeedview"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_margin="4dp"/>
+
+ <TextView
+ android:id="@+id/txtvTitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:layout_alignTop="@id/imgvCover"
+ android:layout_toRightOf="@id/imgvCover"
+ android:layout_alignParentRight="true"
+ android:lines="1"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_size_medium"
+ android:layout_margin="4dp"/>
+
+ <TextView
+ android:id="@+id/txtvAuthor"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:layout_below="@id/txtvTitle"
+ android:layout_toRightOf="@id/imgvCover"
+ android:lines="1"
+ android:ellipsize="end"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="@dimen/text_size_small"/>
+
+ <Button
+ android:id="@+id/butSubscribe"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:text="@string/subscribe_label"
+ android:layout_below="@id/txtvAuthor"
+ android:layout_alignParentRight="true"
+ />
+
+
+ <TextView
+ android:id="@+id/txtvDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/butSubscribe"
+ android:maxLines="3"
+ android:ellipsize="end"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="@dimen/text_size_micro"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:layout_margin="4dp"/>
+</RelativeLayout> \ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 534b9df50..b0d6e66f1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -81,7 +81,7 @@
<item>3.90</item>
<item>4.00</item>
</string-array>
-
+
<string-array name="autodl_select_networks_default_entries">
<item>N/A</item>
</string-array>
@@ -96,6 +96,4 @@
<item>0</item>
<item>1</item>
</string-array>
-
-
</resources> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5cf84ec4a..7ce05bc13 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,7 +28,7 @@
<color name="status_playing">#E0EE5F52</color>
<color name="overlay_dark">#262C31</color>
<color name="overlay_light">#DDDDDD</color>
-
+
<!-- Use Gingerbread-orange -->
<color name="selection_background_color_dark">#FEBB20</color>
<color name="selection_background_color_light">#FEBB20</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3b7e7475a..8dea65a5b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -12,4 +12,5 @@
<dimen name="text_size_large">22sp</dimen>
<dimen name="status_indicator_width">36dp</dimen>
<dimen name="thumbnail_length_itemlist">80dp</dimen>
+ <dimen name="thumbnail_length_onlinefeedview">110dp</dimen>
</resources> \ No newline at end of file
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 4d393e675..5356cd119 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,5 +15,9 @@
<item name="organize_queue_item" type="id"/>
<item name="drag_handle" type="id"/>
<item name="skip_episode_item" type="id"/>
+ <item name="image_disk_cache_key" type="id"/>
+ <item name="imageloader_key" type="id"/>
+ <item name="notification_gpodnet_sync_error" type="id"/>
+ <item name="notification_gpodnet_sync_autherror" type="id"/>
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5895e7f55..a0da91420 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,8 @@
<string name="cancel_download_label">Cancel Download</string>
<string name="download_log_label">Download log</string>
<string name="playback_history_label">Playback history</string>
+ <string name="gpodnet_main_label">gpodder.net</string>
+ <string name="gpodnet_auth_label">gpodder.net login</string>
<!-- Webview actions -->
<string name="open_in_browser_label">Open in browser</string>
@@ -47,12 +49,14 @@
<string name="processing_label">Processing</string>
<string name="loading_label">Loading...</string>
<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>
<!-- 'Add Feed' Activity labels -->
<string name="feedurl_label">Feed URL</string>
- <string name="txtvfeedurl_label">Type in the URL of the Feed here:</string>
+ <string name="txtvfeedurl_label">Add Podcast by URL</string>
+ <string name="podcastdirectories_label">Podcast directories</string>
<!-- Actions on feeds -->
<string name="mark_all_read_label">Mark all as read</string>
@@ -160,6 +164,8 @@
<string name="other_pref">Other</string>
<string name="about_pref">About</string>
<string name="queue_label">Queue</string>
+ <string name="services_label">Services</string>
+ <string name="flattr_label">Flattr</string>
<string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string>
<string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
<string name="playback_pref">Playback</string>
@@ -193,9 +199,15 @@
<string name="pref_theme_title_light">Light</string>
<string name="pref_theme_title_dark">Dark</string>
<string name="pref_episode_cache_unlimited">Unlimited</string>
- <string name="pref_update_interval_hours_plural">hours</string>
- <string name="pref_update_interval_hours_singular">hour</string>
- <string name="pref_update_interval_hours_manual">Manual</string>
+ <string name="pref_update_interval_hours_plural">hours</string>
+ <string name="pref_update_interval_hours_singular">hour</string>
+ <string name="pref_update_interval_hours_manual">Manual</string>
+ <string name="pref_gpodnet_authenticate_title">Login</string>
+ <string name="pref_gpodnet_authenticate_sum">Login with your gpodder.net account in order to sync your subscriptions.</string>
+ <string name="pref_gpodnet_logout_title">Logout</string>
+ <string name="pref_gpodnet_logout_toast">Logout was successful</string>
+ <string name="pref_gpodnet_setlogin_information_title">Change login information</string>
+ <string name="pref_gpodnet_setlogin_information_sum">Change the login information for your gpodder.net account.</string>
<string name="pref_playback_speed_title">Playback Speeds</string>
<string name="pref_playback_speed_sum">Customize the speeds available for variable speed audio playback</string>
@@ -248,6 +260,37 @@
<string name="add_feed_label">Add feed</string>
<string name="miro_feed_added">Feed is being added</string>
+ <!-- gpodder.net -->
+ <string name="gpodnet_taglist_header">CATEGORIES</string>
+ <string name="gpodnet_toplist_header">TOP PODCASTS</string>
+ <string name="gpodnet_suggestions_header">SUGGESTIONS</string>
+ <string name="gpodnet_search_hint">Search gpodder.net</string>
+ <string name="gpodnetauth_login_title">Login</string>
+ <string name="gpodnetauth_login_descr">Welcome to the gpodder.net login process. First, type in your login information:</string>
+ <string name="gpodnetauth_login_butLabel">Login</string>
+ <string name="gpodnetauth_login_register">If you do not have an account yet, you can create one here:\nhttps://gpodder.net/register/</string>
+ <string name="username_label">Username</string>
+ <string name="password_label">Password</string>
+ <string name="gpodnetauth_device_title">Device Selection</string>
+ <string name="gpodnetauth_device_descr">Create a new device to use for your gpodder.net account or choose an existing one:</string>
+ <string name="gpodnetauth_device_deviceID">Device ID</string>
+ <string name="gpodnetauth_device_caption">Caption</string>
+ <string name="gpodnetauth_device_butCreateNewDevice">Create new device</string>
+ <string name="gpodnetauth_device_chooseExistingDevice">Choose existring device:</string>
+ <string name="gpodnetauth_device_errorEmpty">Device ID must not be empty</string>
+ <string name="gpodnetauth_device_errorAlreadyUsed">Device ID already in use</string>
+
+ <string name="gpodnetauth_device_butChoose">Choose</string>
+ <string name="gpodnetauth_finish_title">Login successful!</string>
+ <string name="gpodnetauth_finish_descr">Congratulations! Your gpodder.net account is now linked with your device. AntennaPod will from now on automagically sync subscriptions on your device with your gpodder.net account.</string>
+ <string name="gpodnetauth_finish_butsyncnow">Start sync now</string>
+ <string name="gpodnetauth_finish_butgomainscreen">Go to main screen</string>
+
+ <string name="gpodnetsync_auth_error_title">gpodder.net authentication error</string>
+ <string name="gpodnetsync_auth_error_descr">Wrong username or password</string>
+ <string name="gpodnetsync_error_title">gpodder.net sync error</string>
+ <string name="gpodnetsync_error_descr">An error occurred during syncing:\u0020</string>
+
<!-- Directory chooser -->
<string name="selected_folder_label">Selected folder:</string>
<string name="create_folder_label">Create folder</string>
@@ -261,4 +304,8 @@
<string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string>
<string name="set_to_default_folder">Choose default folder</string>
-</resources>
+ <!-- Online feed view -->
+ <string name="subscribe_label">Subscribe</string>
+ <string name="subscribed_label">Subscribed</string>
+ <string name="downloading_label">Downloading...</string>
+</resources> \ No newline at end of file
diff --git a/res/xml/gpodnet_searchable.xml b/res/xml/gpodnet_searchable.xml
new file mode 100644
index 000000000..d2c14d7f7
--- /dev/null
+++ b/res/xml/gpodnet_searchable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android" android:hint="@string/gpodnet_search_hint" android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+
+
+</searchable> \ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 34916a8fc..099ad27e9 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,73 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/user_interface_label">
- <!--<CheckBoxPreference android:title="@string/pref_display_only_episodes_title" android:summary="@string/pref_display_only_episodes_sum" android:key="prefDisplayOnlyEpisodes" android:visibility="gone"/>-->
- <ListPreference android:entryValues="@array/theme_values" android:entries="@array/theme_options" android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" android:defaultValue="0"/>
- </PreferenceCategory><PreferenceCategory android:title="@string/playback_pref" >
+ <CheckBoxPreference
+ android:title="@string/pref_display_only_episodes_title"
+ android:summary="@string/pref_display_only_episodes_sum"
+ android:key="prefDisplayOnlyEpisodes"/>
+ <ListPreference
+ android:entryValues="@array/theme_values"
+ android:entries="@array/theme_options"
+ android:title="@string/pref_set_theme_title"
+ android:key="prefTheme"
+ android:summary="@string/pref_set_theme_sum"
+ android:defaultValue="0"/>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/playback_pref">
<CheckBoxPreference
android:defaultValue="true"
android:enabled="true"
android:key="prefPauseOnHeadsetDisconnect"
android:summary="@string/pref_pauseOnHeadsetDisconnect_sum"
- android:title="@string/pref_pauseOnHeadsetDisconnect_title" />
+ android:title="@string/pref_pauseOnHeadsetDisconnect_title"/>
<CheckBoxPreference
android:defaultValue="false"
android:enabled="true"
android:key="prefFollowQueue"
android:summary="@string/pref_followQueue_sum"
- android:title="@string/pref_followQueue_title" />
+ android:title="@string/pref_followQueue_title"/>
<Preference
android:key="prefPlaybackSpeedLauncher"
android:summary="@string/pref_playback_speed_sum"
android:title="@string/pref_playback_speed_title" />
-
</PreferenceCategory>
- <PreferenceCategory android:title="@string/network_pref" >
+ <PreferenceCategory android:title="@string/network_pref">
<ListPreference
android:defaultValue="0"
android:entries="@array/update_intervall_values"
android:entryValues="@array/update_intervall_values"
android:key="prefAutoUpdateIntervall"
android:summary="@string/pref_autoUpdateIntervall_sum"
- android:title="@string/pref_autoUpdateIntervall_title" />
+ android:title="@string/pref_autoUpdateIntervall_title"/>
<CheckBoxPreference
android:defaultValue="false"
android:enabled="true"
android:key="prefMobileUpdate"
android:summary="@string/pref_mobileUpdate_sum"
- android:title="@string/pref_mobileUpdate_title" />
- <ListPreference android:defaultValue="20" android:entries="@array/episode_cache_size_entries" android:key="prefEpisodeCacheSize" android:title="@string/pref_episode_cache_title" android:entryValues="@array/episode_cache_size_values"/><PreferenceScreen android:summary="@string/pref_automatic_download_sum" android:key="prefAutoDownloadSettings" android:title="@string/pref_automatic_download_title">
- <CheckBoxPreference android:key="prefEnableAutoDl" android:title="@string/pref_automatic_download_title" android:defaultValue="false"/><CheckBoxPreference android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/>
-
+ android:title="@string/pref_mobileUpdate_title"/>
+ <ListPreference
+ android:defaultValue="20"
+ android:entries="@array/episode_cache_size_entries"
+ android:key="prefEpisodeCacheSize"
+ android:title="@string/pref_episode_cache_title"
+ android:entryValues="@array/episode_cache_size_values"/>
+ <PreferenceScreen
+ android:summary="@string/pref_automatic_download_sum"
+ android:key="prefAutoDownloadSettings"
+ android:title="@string/pref_automatic_download_title">
+ <CheckBoxPreference
+ android:key="prefEnableAutoDl"
+ android:title="@string/pref_automatic_download_title"
+ android:defaultValue="false"/>
+ <CheckBoxPreference
+ android:key="prefEnableAutoDownloadWifiFilter"
+ android:title="@string/pref_autodl_wifi_filter_title"
+ android:summary="@string/pref_autodl_wifi_filter_sum"/>
+
</PreferenceScreen>
-
+
</PreferenceCategory>
- <PreferenceCategory android:title="@string/flattr_settings_label" >
+ <PreferenceCategory android:title="@string/services_label">
+ <PreferenceScreen
+ android:key="prefFlattrSettings"
+ android:title="@string/flattr_label">
+ <PreferenceScreen
+ android:key="pref_flattr_authenticate"
+ android:summary="@string/pref_flattr_auth_sum"
+ android:title="@string/pref_flattr_auth_title">
+ <intent android:action=".activities.FlattrAuthActivity"/>
+ </PreferenceScreen>
+
+ <Preference
+ android:key="prefRevokeAccess"
+ android:summary="@string/pref_revokeAccess_sum"
+ android:title="@string/pref_revokeAccess_title"/>
+ </PreferenceScreen>
<PreferenceScreen
- android:key="pref_flattr_authenticate"
- android:summary="@string/pref_flattr_auth_sum"
- android:title="@string/pref_flattr_auth_title" >
- <intent android:action=".activities.FlattrAuthActivity" />
+ android:key="prefFlattrSettings"
+ android:title="@string/gpodnet_main_label">
+
+ <PreferenceScreen
+ android:key="pref_gpodnet_authenticate"
+ android:title="@string/pref_gpodnet_authenticate_title"
+ android:summary="@string/pref_gpodnet_authenticate_sum">
+ <intent android:action=".activity.gpoddernet.GpodnetAuthenticationActivity"/>
+ </PreferenceScreen>
+ <Preference
+ android:key="pref_gpodnet_setlogin_information"
+ android:title="@string/pref_gpodnet_setlogin_information_title"
+ android:summary="@string/pref_gpodnet_setlogin_information_sum"/>
+ <Preference
+ android:key="pref_gpodnet_logout"
+ android:title="@string/pref_gpodnet_logout_title"/>
</PreferenceScreen>
- <Preference
- android:key="prefRevokeAccess"
- android:summary="@string/pref_revokeAccess_sum"
- android:title="@string/pref_revokeAccess_title" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/other_pref" >
- <Preference android:title="@string/choose_data_directory" android:key="prefChooseDataDir"/><Preference
+ <PreferenceCategory android:title="@string/other_pref">
+ <Preference
+ android:title="@string/choose_data_directory"
+ android:key="prefChooseDataDir"/>
+ <Preference
android:key="prefFlattrThisApp"
android:summary="@string/pref_flattr_this_app_sum"
- android:title="@string/pref_flattr_this_app_title" >
+ android:title="@string/pref_flattr_this_app_title">
</Preference>
- <Preference android:key="prefOpmlExport" android:title="@string/opml_export_label"/><Preference
+ <Preference
+ android:key="prefOpmlExport"
+ android:title="@string/opml_export_label"/>
+ <Preference
android:key="prefAbout"
- android:title="@string/about_pref" />
-
-
+ android:title="@string/about_pref"/>
+
+
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file