From 1376b5284849e198f2a2c8346d681d49d30a4234 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Thu, 22 Aug 2013 15:11:37 +0200
Subject: Improved AddFeedActivity layout, added gpodder.net toplist fragment

---
 res/layout-v14/addfeed.xml              | 69 ++++++++++++++++++++++-----------
 res/layout/addfeed.xml                  | 64 ++++++++++++++++++++----------
 res/layout/gpodnet_main.xml             | 12 ++++++
 res/layout/gpodnet_podcast_list.xml     | 34 ++++++++++++++++
 res/layout/gpodnet_podcast_listitem.xml | 44 +++++++++++++++++++++
 res/values/ids.xml                      |  1 +
 res/values/strings.xml                  |  6 +--
 7 files changed, 185 insertions(+), 45 deletions(-)
 create mode 100644 res/layout/gpodnet_main.xml
 create mode 100644 res/layout/gpodnet_podcast_list.xml
 create mode 100644 res/layout/gpodnet_podcast_listitem.xml

(limited to 'res')

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/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/gpodnet_main.xml b/res/layout/gpodnet_main.xml
new file mode 100644
index 000000000..7e382a641
--- /dev/null
+++ b/res/layout/gpodnet_main.xml
@@ -0,0 +1,12 @@
+<?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">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/toplist_fragment"/>
+
+</LinearLayout>
\ No newline at end of file
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..596eee136
--- /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"
+        android:layout_height="@dimen/thumbnail_length"
+        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"
+        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/values/ids.xml b/res/values/ids.xml
index 4d393e675..7cbc4699a 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,5 +15,6 @@
     <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"/>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b3f9975cb..78a92e249 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,7 @@
     <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>
 
     <!-- Webview actions -->
     <string name="open_in_browser_label">Open in browser</string>
@@ -50,7 +51,8 @@
 
     <!-- '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>
@@ -229,8 +231,6 @@
 
     <!-- Miro Guide -->
     <string name="loading_categories_label">Loading categories...</string>
-    <string name="browse_miroguide_label">Browse Miro Guide</string>
-    <string name="txtv_browse_miroguide_label">Or browse the Miro Guide:</string>
     <string name="miro_guide_label">Miro Guide</string>
     <string name="miro_search_hint">Search Miro Guide</string>
     <string name="popular_label">Popular</string>
-- 
cgit v1.2.3


From 74b9bfdcc3b4a9465cb35c7aeddf87f8df7128be Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 24 Aug 2013 14:23:31 +0200
Subject: Added search, taglist, pocdasttaglist etc.

---
 res/layout/gpodnet_main.xml             | 21 ++++++++++++------
 res/layout/gpodnet_podcast_listitem.xml |  6 ++---
 res/layout/gpodnet_search.xml           | 12 ++++++++++
 res/layout/gpodnet_tag_activity.xml     | 12 ++++++++++
 res/layout/itemdescription_listitem.xml | 27 +++++++++++++++++++++++
 res/layout/onlinefeedview_header.xml    | 39 +++++++++++++++++++++++++++++++++
 res/values/colors.xml                   |  1 +
 res/values/strings.xml                  |  5 +++++
 res/xml/gpodnet_searchable.xml          |  5 +++++
 9 files changed, 118 insertions(+), 10 deletions(-)
 create mode 100644 res/layout/gpodnet_search.xml
 create mode 100644 res/layout/gpodnet_tag_activity.xml
 create mode 100644 res/layout/itemdescription_listitem.xml
 create mode 100644 res/layout/onlinefeedview_header.xml
 create mode 100644 res/xml/gpodnet_searchable.xml

(limited to 'res')

diff --git a/res/layout/gpodnet_main.xml b/res/layout/gpodnet_main.xml
index 7e382a641..1017a6a65 100644
--- a/res/layout/gpodnet_main.xml
+++ b/res/layout/gpodnet_main.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
+              android:id="@+id/main_view"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
-    <FrameLayout
+              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="match_parent"
-        android:id="@+id/toplist_fragment"/>
+        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>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/gpodnet_podcast_listitem.xml b/res/layout/gpodnet_podcast_listitem.xml
index 596eee136..f6ddb3bd8 100644
--- a/res/layout/gpodnet_podcast_listitem.xml
+++ b/res/layout/gpodnet_podcast_listitem.xml
@@ -5,8 +5,8 @@
                 android:layout_height="match_parent">
     <ImageView
         android:id="@+id/imgvCover"
-        android:layout_width="@dimen/thumbnail_length"
-        android:layout_height="@dimen/thumbnail_length"
+        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"
@@ -16,7 +16,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/thumbnail_length"
+        android:layout_height="@dimen/thumbnail_length_itemlist"
         android:layout_centerVertical="true"
         android:layout_toRightOf="@id/imgvCover"
         android:layout_marginRight="8dp"
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/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..59b7a9b24
--- /dev/null
+++ b/res/layout/onlinefeedview_header.xml
@@ -0,0 +1,39 @@
+<?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_alignParentTop="true"
+        android:layout_margin="4dp"/>
+
+    <TextView
+        android:id="@+id/txtvTitle"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:layout_alignTop="@id/imgvCover"
+        android:layout_alignBottom="@id/imgvCover"
+        android:layout_toRightOf="@id/imgvCover"
+        android:layout_alignParentRight="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_large"
+        android:layout_margin="4dp"/>
+
+    <TextView
+        android:id="@+id/txtvDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/imgvCover"
+        android:maxLines="3"
+        android:ellipsize="end"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="@dimen/text_size_micro"
+        android:layout_margin="4dp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5cf84ec4a..a666f8967 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,6 +28,7 @@
     <color name="status_playing">#E0EE5F52</color>
     <color name="overlay_dark">#262C31</color>
     <color name="overlay_light">#DDDDDD</color>
+    <color name="default_image_color">#858585</color>
     
     <!-- Use Gingerbread-orange -->
     <color name="selection_background_color_dark">#FEBB20</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 78a92e249..2709f6c4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,6 +238,11 @@
     <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_search_hint">Search gpodder.net</string>
+
     <!-- Directory chooser -->
     <string name="selected_folder_label">Selected folder:</string>
     <string name="create_folder_label">Create folder</string>
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
-- 
cgit v1.2.3


From a60ff4dd36de07abf6b640caf7e0723817162286 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 31 Aug 2013 14:26:54 +0200
Subject: Added subscribe button to online feed view

---
 res/layout/onlinefeedview_header.xml | 39 ++++++++++++++++++++++++++++++------
 res/values/dimens.xml                |  1 +
 res/values/strings.xml               |  4 ++++
 3 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout/onlinefeedview_header.xml b/res/layout/onlinefeedview_header.xml
index 59b7a9b24..6bbecde1e 100644
--- a/res/layout/onlinefeedview_header.xml
+++ b/res/layout/onlinefeedview_header.xml
@@ -6,8 +6,8 @@
 
     <ImageView
         android:id="@+id/imgvCover"
-        android:layout_width="@dimen/thumbnail_length_itemlist"
-        android:layout_height="@dimen/thumbnail_length_itemlist"
+        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"/>
@@ -15,25 +15,52 @@
     <TextView
         android:id="@+id/txtvTitle"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:layout_alignTop="@id/imgvCover"
-        android:layout_alignBottom="@id/imgvCover"
         android:layout_toRightOf="@id/imgvCover"
         android:layout_alignParentRight="true"
+        android:lines="1"
         android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_large"
+        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/imgvCover"
+        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/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/strings.xml b/res/values/strings.xml
index 2709f6c4c..31d9b0425 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,4 +256,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>
 
+    <!-- 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
-- 
cgit v1.2.3


From 7df102daa3a6e950810187c85a836efab8336ffc Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 31 Aug 2013 15:42:48 +0200
Subject: Images in podcast directory should now be displayed correctly

---
 res/values/colors.xml | 3 +--
 res/values/ids.xml    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index a666f8967..7ce05bc13 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,8 +28,7 @@
     <color name="status_playing">#E0EE5F52</color>
     <color name="overlay_dark">#262C31</color>
     <color name="overlay_light">#DDDDDD</color>
-    <color name="default_image_color">#858585</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/ids.xml b/res/values/ids.xml
index 7cbc4699a..995cebbad 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -16,5 +16,6 @@
     <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"/>
 
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e29d1179425238672b8be7b01dfac14f98257198 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 31 Aug 2013 20:02:56 +0200
Subject: Implemented authentication process

---
 res/layout/gpodnetauth_activity.xml    |  10 +++
 res/layout/gpodnetauth_credentials.xml |  84 +++++++++++++++++++++++++
 res/layout/gpodnetauth_device.xml      | 107 ++++++++++++++++++++++++++++++++
 res/layout/gpodnetauth_finish.xml      |  44 ++++++++++++++
 res/values/arrays.xml                  |   1 -
 res/values/strings.xml                 |  25 ++++++++
 res/xml/preferences.xml                | 108 ++++++++++++++++++++++++---------
 7 files changed, 348 insertions(+), 31 deletions(-)
 create mode 100644 res/layout/gpodnetauth_activity.xml
 create mode 100644 res/layout/gpodnetauth_credentials.xml
 create mode 100644 res/layout/gpodnetauth_device.xml
 create mode 100644 res/layout/gpodnetauth_finish.xml

(limited to 'res')

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..43268d291
--- /dev/null
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -0,0 +1,84 @@
+<?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/gpodnet_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/gpodnet_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="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/etxtPassword"
+        android:layout_alignParentLeft="true"
+        android:layout_alignBottom="@id/butLogin"
+        android:textColor="@color/download_failed_red"
+        android:textSize="@dimen/text_size_medium"
+        android:gravity="center"
+        android:layout_margin="16dp"/>
+
+    <ProgressBar
+        android:id="@+id/progBarLogin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@id/butLogin"
+        android:layout_below="@id/etxtPassword"
+        android:layout_alignBottom="@id/butLogin"
+        android:visibility="gone"/>
+
+    <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..3f8d0716c
--- /dev/null
+++ b/res/layout/gpodnetauth_device.xml
@@ -0,0 +1,107 @@
+<?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/etxtDeviceID"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/gpodnetauth_device_deviceID"
+        android:layout_below="@id/txtvDescription"
+        android:layout_margin="8dp"/>
+
+    <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/etxtDeviceID"
+        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/etxtCaption"
+        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_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"
+        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="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/txtvChooseExistingDevice"
+        android:layout_alignParentRight="true"
+        android:layout_margin="16dp"
+        android:text="@string/gpodnetauth_device_butChoose"/>
+
+    <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_toLeftOf="@id/butChooseExistingDevice"
+
+        android:layout_margin="16dp"/>
+
+</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/values/arrays.xml b/res/values/arrays.xml
index 4036ff0f4..ce50942ed 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -42,5 +42,4 @@
         <item>0</item>
         <item>1</item>
     </string-array>
-
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31d9b0425..00cddd4d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,6 +18,7 @@
     <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>
@@ -154,6 +155,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>
@@ -190,6 +193,8 @@
 	<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>
    
 
     <!-- Search -->
@@ -242,6 +247,26 @@
     <string name="gpodnet_taglist_header">CATEGORIES</string>
     <string name="gpodnet_toplist_header">TOP PODCASTS</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="gpodnet_username_label">Username</string>
+    <string name="gpodnet_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>
 
     <!-- Directory chooser -->
     <string name="selected_folder_label">Selected folder:</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e94d1c47e..3216b7ad8 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,69 +1,117 @@
 <?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"/>
-        <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"/>
+
     </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="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/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="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>
         </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
-- 
cgit v1.2.3


From c5f848ead5037ec73daa9d5eda17e8556091ef90 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 1 Sep 2013 13:49:19 +0200
Subject: Added subscription syncing

---
 res/values/ids.xml      | 2 ++
 res/values/strings.xml  | 7 +++++++
 res/xml/preferences.xml | 3 +++
 3 files changed, 12 insertions(+)

(limited to 'res')

diff --git a/res/values/ids.xml b/res/values/ids.xml
index 995cebbad..5356cd119 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -17,5 +17,7 @@
     <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 00cddd4d6..2aa08296f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -195,6 +195,8 @@
 	<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>
    
 
     <!-- Search -->
@@ -268,6 +270,11 @@
     <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>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3216b7ad8..ac3160028 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -92,6 +92,9 @@
                 android:summary="@string/pref_gpodnet_authenticate_sum">
                 <intent android:action=".activity.gpoddernet.GpodnetAuthenticationActivity"/>
             </PreferenceScreen>
+            <Preference
+                android:key="pref_gpodnet_logout"
+                android:title="@string/pref_gpodnet_logout_title"/>
         </PreferenceScreen>
 
     </PreferenceCategory>
-- 
cgit v1.2.3


From d45b0e2ea901b63a86e9b21b7048ef5b76641141 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 1 Sep 2013 14:41:45 +0200
Subject: Added dialog to change password

---
 res/layout-v14/authentication_dialog.xml | 81 ++++++++++++++++++++++++++++++++
 res/layout/authentication_dialog.xml     | 62 ++++++++++++++++++++++++
 res/layout/gpodnetauth_credentials.xml   |  4 +-
 res/values/strings.xml                   | 10 ++--
 res/xml/preferences.xml                  |  4 ++
 5 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 res/layout-v14/authentication_dialog.xml
 create mode 100644 res/layout/authentication_dialog.xml

(limited to 'res')

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/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/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml
index 43268d291..8d32a5e2b 100644
--- a/res/layout/gpodnetauth_credentials.xml
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -29,7 +29,7 @@
         android:id="@+id/etxtUsername"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/gpodnet_username_label"
+        android:hint="@string/username_label"
         android:layout_below="@id/txtvDescription"
         android:layout_margin="8dp"/>
 
@@ -37,7 +37,7 @@
         android:id="@+id/etxtPassword"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/gpodnet_password_label"
+        android:hint="@string/password_label"
         android:layout_below="@id/etxtUsername"
         android:inputType="textPassword"
         android:layout_margin="8dp"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2aa08296f..6f11049c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -49,6 +49,7 @@
     <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>
 
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
@@ -197,7 +198,10 @@
     <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>
+
+
 
     <!-- Search -->
     <string name="search_hint">Search for Feeds or Episodes</string>
@@ -253,8 +257,8 @@
     <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="gpodnet_username_label">Username</string>
-    <string name="gpodnet_password_label">Password</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>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ac3160028..53754178d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -92,6 +92,10 @@
                 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"/>
-- 
cgit v1.2.3


From 730ba3cc26d65a2f4c6c8f2489ea98beab10364b Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 1 Sep 2013 16:27:01 +0200
Subject: Added suggestions list

Turned off at the moment
---
 res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f11049c4..631b721b5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -252,6 +252,7 @@
     <!-- 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>
-- 
cgit v1.2.3


From 1f594ad311b8f72fb78f14d137dfb53f59b03f85 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Mon, 2 Sep 2013 15:13:00 +0200
Subject: Upload changes instead of whole subscription list

---
 res/layout/gpodnetauth_device.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml
index 3f8d0716c..21f2ef295 100644
--- a/res/layout/gpodnetauth_device.xml
+++ b/res/layout/gpodnetauth_device.xml
@@ -26,19 +26,19 @@
         android:layout_margin="16dp"/>
 
     <EditText
-        android:id="@+id/etxtDeviceID"
+        android:id="@+id/etxtCaption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/gpodnetauth_device_deviceID"
+        android:hint="@string/gpodnetauth_device_caption"
         android:layout_below="@id/txtvDescription"
         android:layout_margin="8dp"/>
 
     <EditText
-        android:id="@+id/etxtCaption"
+        android:id="@+id/etxtDeviceID"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/gpodnetauth_device_caption"
-        android:layout_below="@id/etxtDeviceID"
+        android:hint="@string/gpodnetauth_device_deviceID"
+        android:layout_below="@id/etxtCaption"
         android:layout_margin="8dp"/>
 
     <Button
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:layout_alignParentRight="true"
-        android:layout_below="@id/etxtCaption"
+        android:layout_below="@id/etxtDeviceID"
         android:text="@string/gpodnetauth_device_butCreateNewDevice"/>
 
     <TextView
@@ -89,10 +89,10 @@
         android:id="@+id/butChooseExistingDevice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/txtvChooseExistingDevice"
-        android:layout_alignParentRight="true"
         android:layout_margin="16dp"
-        android:text="@string/gpodnetauth_device_butChoose"/>
+        android:text="@string/gpodnetauth_device_butChoose"
+        android:layout_alignTop="@+id/spinnerChooseDevice"
+        android:layout_alignRight="@+id/txtvChooseExistingDevice"/>
 
     <Spinner
         android:id="@+id/spinnerChooseDevice"
-- 
cgit v1.2.3


From 8d94bf9e67fbc6496074ec14236f4de35503013e Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Wed, 4 Sep 2013 17:26:07 +0200
Subject: Improved layout of login GUI

---
 res/layout/gpodnetauth_credentials.xml | 15 ++++++++-------
 res/layout/gpodnetauth_device.xml      | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'res')

diff --git a/res/layout/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml
index 8d32a5e2b..b66fc9414 100644
--- a/res/layout/gpodnetauth_credentials.xml
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -53,13 +53,15 @@
 
     <TextView
         android:id="@+id/txtvError"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/etxtPassword"
         android:layout_alignParentLeft="true"
-        android:layout_alignBottom="@id/butLogin"
+        android:layout_toLeftOf="@id/butLogin"
         android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_medium"
+        android:textSize="@dimen/text_size_small"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:gravity="center"
         android:layout_margin="16dp"/>
 
@@ -67,10 +69,9 @@
         android:id="@+id/progBarLogin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/butLogin"
-        android:layout_below="@id/etxtPassword"
-        android:layout_alignBottom="@id/butLogin"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        android:layout_alignTop="@+id/butLogin"
+        android:layout_toLeftOf="@+id/butLogin"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml
index 21f2ef295..ac08cb5ad 100644
--- a/res/layout/gpodnetauth_device.xml
+++ b/res/layout/gpodnetauth_device.xml
@@ -66,11 +66,9 @@
         android:id="@+id/progbarCreateDevice"
         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:layout_alignTop="@id/butCreateNewDevice"
+        android:layout_toLeftOf="@id/butCreateNewDevice"
         android:textColor="@color/download_failed_red"
-        android:layout_margin="16dp"
         android:textSize="@dimen/text_size_medium"
         android:visibility="gone"
         />
@@ -87,12 +85,12 @@
 
     <Button
         android:id="@+id/butChooseExistingDevice"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
         android:text="@string/gpodnetauth_device_butChoose"
-        android:layout_alignTop="@+id/spinnerChooseDevice"
-        android:layout_alignRight="@+id/txtvChooseExistingDevice"/>
+        android:layout_below="@+id/spinnerChooseDevice"
+        android:layout_alignLeft="@+id/butCreateNewDevice"
+        android:layout_alignRight="@+id/butCreateNewDevice"/>
 
     <Spinner
         android:id="@+id/spinnerChooseDevice"
@@ -100,8 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/txtvChooseExistingDevice"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/butChooseExistingDevice"
-
-        android:layout_margin="16dp"/>
+        android:layout_margin="8dp"
+        android:layout_alignParentRight="true"/>
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3