From 3e4353fc87e8a99546327e0197332de2d344c26e Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sat, 28 Feb 2015 13:40:52 +0100
Subject: Correct audio player cover scaling

---
 app/src/main/res/layout/cover_fragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index 7d86346e3..18540aa1f 100644
--- a/app/src/main/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:adjustViewBounds="true"
-        android:scaleType="centerCrop"
+        android:scaleType="centerInside"
         tools:src="@android:drawable/sym_def_app_icon" />
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From dcada04621fb79c3c236152629fab9f0e90d5712 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 1 Mar 2015 16:35:23 +0100
Subject: Delete items from the queue by swiping

---
 app/src/main/res/layout/queue_fragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index d184eb28d..6ac7fbb63 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -20,7 +20,8 @@
         dslv:float_alpha="0.6"
         dslv:float_background_color="?attr/dragview_float_background"
         dslv:max_drag_scroll_speed="0.5"
-        dslv:remove_enabled="false"
+        dslv:remove_enabled="true"
+        dslv:remove_mode="flingRemove"
         dslv:slide_shuffle_speed="0.3"
         dslv:sort_enabled="true"
         dslv:track_drag_sort="true"
-- 
cgit v1.2.3


From 6c81f6c868971fc343cfa49d54927dd845a39ede Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 4 Mar 2015 10:41:40 +0100
Subject: MERGE stash.

---
 app/src/main/res/layout/queue_listitem.xml | 50 +++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 12 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 74c6ed785..5d41c52cd 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -32,7 +32,7 @@
 
     <RelativeLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
         android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding"
         android:layout_marginRight="@dimen/listitem_threeline_textrightpadding"
@@ -40,46 +40,72 @@
         android:layout_weight="1"
         tools:background="@android:color/holo_red_dark">
 
+        <!-- order is important, pubDate first! -->
+        <TextView
+            android:id="@+id/txtvPubDate"
+            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="2"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="8dp"
+            android:gravity="right|bottom"
+            android:text="Feb\n12"
+            tools:background="@android:color/holo_blue_light" />
+
         <TextView
             android:id="@+id/txtvTitle"
             style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/txtvPubDate"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:text="Queue item title"
+            android:ellipsize="end"
             tools:background="@android:color/holo_blue_light" />
 
         <RelativeLayout
             android:id="@+id/bottom_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_below="@id/txtvTitle"
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="16dp">
+            android:layout_alignParentRight="true">
 
             <TextView
-                android:id="@+id/txtvPosition"
+                android:id="@+id/txtvProgressLeft"
                 style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_marginBottom="0dp"
                 android:text="00:42:23"
-                tools:background="@android:color/holo_blue_light" />
+                tools:background="@android:color/holo_blue_light"/>
+
+            <TextView
+                android:id="@+id/txtvProgressRight"
+                style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginBottom="0dp"
+                tools:text="Jan 23"
+                tools:background="@android:color/holo_green_dark" />
 
             <ProgressBar
-                android:id="@+id/pbar_download_progress"
+                android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="8dp"
-                android:layout_toRightOf="@id/txtvPosition"
+                android:layout_below="@id/txtvProgressLeft"
+                android:layout_marginTop="-2dp"
                 android:max="100"
                 tools:background="@android:color/holo_blue_light" />
 
+
         </RelativeLayout>
     </RelativeLayout>
 
-- 
cgit v1.2.3


From 9444f266730b4b2b2a064a3d2557962d5db16a5f Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 4 Mar 2015 14:34:35 +0100
Subject: Show UndoBar when dismiss-by-swipe

---
 app/src/main/res/layout/queue_fragment.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index 6ac7fbb63..307d95a8d 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -43,4 +43,18 @@
         android:indeterminateOnly="true"
         android:visibility="gone" />
 
-</FrameLayout>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/undobar"
+        style="@style/UndoBar">
+
+        <TextView
+            android:id="@+id/undobar_message"
+            style="@style/UndoBarMessage"/>
+
+        <Button
+            android:id="@+id/undobar_button"
+            style="@style/UndoBarButton"/>
+
+    </LinearLayout>
+
+</FrameLayout>
-- 
cgit v1.2.3


From 2ce366da6418dfed08447cf100fd8af39345bcea Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 5 Mar 2015 09:42:46 +0100
Subject: Show duration and pubDate on episode display

... which was - despite the commit message - missing from last commit...
---
 .../main/res/layout/feeditem_fragment_header.xml   | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/feeditem_fragment_header.xml b/app/src/main/res/layout/feeditem_fragment_header.xml
index 5956ae062..a21488306 100644
--- a/app/src/main/res/layout/feeditem_fragment_header.xml
+++ b/app/src/main/res/layout/feeditem_fragment_header.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:orientation="horizontal"
-        android:paddingBottom="8dp">
+        android:paddingBottom="0dp">
 
         <ImageView
             android:id="@+id/imgvCover"
@@ -59,6 +59,29 @@
             android:maxLines="5"
             tools:text="Podcast title"
             tools:background="@android:color/holo_green_dark" />
+
+        <TextView
+            android:id="@+id/txtvDuration"
+            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/imgvCover"
+            android:layout_below="@id/txtvTitle"
+            android:layout_marginLeft="16dp"
+            tools:text="00:42:23"
+            tools:background="@android:color/holo_green_dark"/>
+
+        <TextView
+            android:id="@+id/txtvPublished"
+            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/butMoreActions"
+            android:layout_marginRight="8dp"
+            tools:text="Jan 23"
+            tools:background="@android:color/holo_green_dark"
+            android:layout_below="@+id/txtvTitle"/>
+
     </RelativeLayout>
 
     <ProgressBar
-- 
cgit v1.2.3


From 3fab6ab75735cc34b590a14f62ca9c744f527928 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 14 Mar 2015 11:11:09 +0100
Subject: Queue: Drag section now over 4x the size

---
 app/src/main/res/layout/queue_listitem.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 5d41c52cd..d2d51378b 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -9,9 +9,10 @@
 
     <ImageView
         android:id="@+id/drag_handle"
-        android:layout_width="24dp"
+        android:layout_width="104dp"
         android:layout_height="match_parent"
-        android:layout_margin="8dp"
+        android:layout_marginLeft="-32dp"
+        android:layout_marginRight="-32dp"
         android:contentDescription="@string/drag_handle_content_description"
         android:scaleType="center"
         android:src="?attr/dragview_background"
-- 
cgit v1.2.3


From 24e0db1cdef2d6bb84f489bc26be66d83449aadd Mon Sep 17 00:00:00 2001
From: Ercan Erden <ercerden@gmail.com>
Date: Tue, 24 Feb 2015 04:21:11 -0500
Subject: Add ability to search iTunes for podcasts

---
 app/src/main/res/layout/addfeed.xml                |  9 ++++-
 app/src/main/res/layout/fragment_itunes_search.xml | 26 +++++++++++++++
 .../main/res/layout/itunes_podcast_listitem.xml    | 38 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/fragment_itunes_search.xml
 create mode 100644 app/src/main/res/layout/itunes_podcast_listitem.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index 09502eb7b..a740d88cf 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -66,12 +66,19 @@
                 android:layout_margin="8dp"
                 android:text="@string/browse_gpoddernet_label"/>
 
+            <Button
+                android:id="@+id/butSearchItunes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/butBrowseGpoddernet"
+                android:layout_margin="8dp"
+                android:text="@string/search_itunes_label"/>
 
             <TextView
                 android:id="@+id/txtvOpmlImport"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/butBrowseGpoddernet"
+                android:layout_below="@id/butSearchItunes"
                 android:layout_margin="8dp"
                 style="@style/AntennaPod.TextView.Heading"
                 android:text="@string/opml_import_label"/>
diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml
new file mode 100644
index 000000000..17ffe349b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_itunes_search.xml
@@ -0,0 +1,26 @@
+<RelativeLayout 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"
+tools:context="de.danoeh.antennapod.activity.ITunesSearchActivity">
+<android.support.v7.widget.SearchView
+    android:id="@+id/itunes_search_view"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    />
+<GridView
+    android:id="@+id/gridView"
+    android:layout_below="@id/itunes_search_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:columnWidth="200dp"
+    android:gravity="center"
+    android:horizontalSpacing="8dp"
+    android:numColumns="auto_fit"
+    android:paddingBottom="@dimen/list_vertical_padding"
+    android:paddingTop="@dimen/list_vertical_padding"
+    android:stretchMode="columnWidth"
+    android:verticalSpacing="8dp"
+    tools:listitem="@layout/gpodnet_podcast_listitem" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
new file mode 100644
index 000000000..41b1f495f
--- /dev/null
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:tools="http://schemas.android.com/tools"
+android:layout_width="match_parent"
+android:layout_height="@dimen/listitem_threeline_height"
+tools:background="@android:color/darker_gray">
+
+<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_marginBottom="@dimen/listitem_threeline_verticalpadding"
+    android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
+    android:layout_marginRight="8dp"
+    android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
+    android:adjustViewBounds="true"
+    android:contentDescription="@string/cover_label"
+    android:cropToPadding="true"
+    android:scaleType="fitXY"
+    tools:src="@drawable/ic_stat_antenna_default"
+    tools:background="@android:color/holo_green_dark" />
+
+<TextView
+    android:id="@+id/txtvTitle"
+    style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
+    android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
+    android:layout_toRightOf="@id/imgvCover"
+    android:maxLines="1"
+    tools:text="Podcast title"
+    tools:background="@android:color/holo_green_dark" />
+</RelativeLayout>
-- 
cgit v1.2.3


From 9c337c787584187b74a2eccf8b90d4bbfc7ccbca Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Mon, 16 Mar 2015 18:07:10 +0100
Subject: Gpodder search shows feed url and number of subscribers

---
 .../main/res/layout/gpodnet_podcast_listitem.xml   | 65 ++++++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 2ade8e478..8890f1b77 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,16 +23,71 @@
         tools:src="@drawable/ic_stat_antenna_default"
         tools:background="@android:color/holo_green_dark" />
 
+    <LinearLayout
+        android:id="@+id/subscribers_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/txtvTitle"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/imgFeed"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginRight="-4dp"
+            android:src="?attr/feed" />
+
+        <TextView
+            android:id="@+id/txtvSubscribers"
+            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            tools:text="150"
+            tools:background="@android:color/holo_green_dark" />
+
+    </LinearLayout>
+
     <TextView
         android:id="@+id/txtvTitle"
         style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
+        android:layout_marginBottom="@dimen/list_vertical_padding"
         android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
         android:layout_toRightOf="@id/imgvCover"
-        android:maxLines="1"
-        tools:text="Podcast title"
+        android:layout_toLeftOf="@id/subscribers_container"
+        android:layout_alignTop="@id/imgvCover"
+        android:lines="1"
+        tools:text="Title"
         tools:background="@android:color/holo_green_dark" />
+
+    <TextView
+        android:id="@+id/txtvUrl"
+        style="android:style/TextAppearance.Small"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
+        android:layout_toRightOf="@id/imgvCover"
+        android:layout_below="@id/txtvTitle"
+        android:textSize="14sp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:ellipsize="middle"
+        android:maxLines="2"
+        tools:text="http://www.example.com/feed"
+        tools:background="@android:color/holo_green_dark"/>
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="textPersonName"
+        android:text="Name"
+        android:ems="10"
+        android:id="@+id/editText"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="231dp"/>
 </RelativeLayout>
-- 
cgit v1.2.3


From 596462b7a2805748dcae4e80c4ff83200f915d09 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Tue, 17 Mar 2015 12:36:04 +0100
Subject: Gpodder categories shows title instead of tag and additionally the
 usage

---
 app/src/main/res/layout/gpodnet_tag_listitem.xml | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/src/main/res/layout/gpodnet_tag_listitem.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/gpodnet_tag_listitem.xml b/app/src/main/res/layout/gpodnet_tag_listitem.xml
new file mode 100644
index 000000000..8a4167c34
--- /dev/null
+++ b/app/src/main/res/layout/gpodnet_tag_listitem.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:background="@android:color/darker_gray">
+
+    <TextView
+        android:id="@+id/txtvTitle"
+        style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
+        android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
+        android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
+        android:lines="1"
+        tools:text="Tag Title"
+        tools:background="@android:color/holo_green_dark" />
+
+    <TextView
+        android:id="@+id/txtvUsage"
+        style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
+        android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
+        android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
+        tools:text="301"
+        tools:background="@android:color/holo_green_dark"/>
+
+</RelativeLayout>
-- 
cgit v1.2.3


From 61dbe18a90f164011e43e23d349a5c1400cb76e8 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Tue, 17 Mar 2015 12:53:04 +0100
Subject: Removed unintended layout element to make list items clickable again

---
 app/src/main/res/layout/gpodnet_podcast_listitem.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 8890f1b77..84c6c280e 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -79,15 +79,4 @@
         tools:text="http://www.example.com/feed"
         tools:background="@android:color/holo_green_dark"/>
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inputType="textPersonName"
-        android:text="Name"
-        android:ems="10"
-        android:id="@+id/editText"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginTop="231dp"/>
 </RelativeLayout>
-- 
cgit v1.2.3


From 75d683a6db785b9a01a90f3b3e5c3e00723603a3 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Tue, 17 Mar 2015 13:26:30 +0100
Subject: Gpodder tags alignment

---
 app/src/main/res/layout/gpodnet_tag_listitem.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/gpodnet_tag_listitem.xml b/app/src/main/res/layout/gpodnet_tag_listitem.xml
index 8a4167c34..9e545e59d 100644
--- a/app/src/main/res/layout/gpodnet_tag_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_tag_listitem.xml
@@ -4,6 +4,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center_vertical"
                 tools:background="@android:color/darker_gray">
 
     <TextView
-- 
cgit v1.2.3


From a5a149df6f4756aea45dc4354d386743100ce837 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 27 Mar 2015 22:46:16 +0100
Subject: Drawer slide fixed, drag handle is now 9 patch PNG

---
 app/src/main/res/layout/queue_listitem.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index d2d51378b..bc5b951a2 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -9,12 +9,12 @@
 
     <ImageView
         android:id="@+id/drag_handle"
-        android:layout_width="104dp"
+        android:layout_width="100dp"
         android:layout_height="match_parent"
-        android:layout_marginLeft="-32dp"
-        android:layout_marginRight="-32dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="-64dp"
         android:contentDescription="@string/drag_handle_content_description"
-        android:scaleType="center"
+        android:scaleType="fitXY"
         android:src="?attr/dragview_background"
         tools:src="@drawable/ic_drag_handle"
         tools:background="@android:color/holo_green_dark" />
-- 
cgit v1.2.3


From 680c9db075ffb2afafed936dc23a5562db0a7b63 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Mon, 30 Mar 2015 12:18:16 +0200
Subject: "Add feed" facelift, OPML import with better explanations and usage
 of external apps

---
 app/src/main/res/layout/addfeed.xml     | 180 ++++++++++++++++----------------
 app/src/main/res/layout/opml_import.xml |  80 ++++++++++++--
 2 files changed, 160 insertions(+), 100 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index a740d88cf..b7babbafa 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -1,107 +1,107 @@
 <?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">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="vertical">
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical">
+        android:paddingTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/txtvFeedurl"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/txtvfeedurl_label"/>
 
-            <TextView
-                android:id="@+id/txtvFeedurl"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_margin="16dp"
-                style="@style/AntennaPod.TextView.Heading"
-                android:text="@string/txtvfeedurl_label"/>
+        <EditText
+            android:id="@+id/etxtFeedurl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:hint="@string/etxtFeedurlHint"
+            android:inputType="textUri"/>
 
-            <EditText
-                android:id="@+id/etxtFeedurl"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txtvFeedurl"
-                android:layout_margin="8dp"
-                android:hint="@string/etxtFeedurlHint"
-                android:inputType="textUri"/>
+        <Button
+            android:id="@+id/butConfirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/confirm_label"/>
 
-            <Button
-                android:id="@+id/butConfirm"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/etxtFeedurl"
-                android:layout_margin="8dp"
-                android:text="@string/confirm_label"/>
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="16dp"
+            android:background="?android:attr/listDivider"/>
 
-            <TextView
-                android:id="@+id/txtvPodcastDirectories"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butConfirm"
-                android:layout_margin="8dp"
-                style="@style/AntennaPod.TextView.Heading"
-                android:text="@string/podcastdirectories_label"/>
+        <TextView
+            android:id="@+id/txtvPodcastDirectories"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/divider1"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/podcastdirectories_label"/>
 
-            <TextView
-                android:id="@+id/txtvPodcastDirectoriesDescr"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/podcastdirectories_descr"
-                android:textSize="@dimen/text_size_medium"
-                android:layout_below="@id/txtvPodcastDirectories"
-                android:layout_margin="8dp"/>
+        <TextView
+            android:id="@+id/txtvPodcastDirectoriesDescr"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/podcastdirectories_descr"
+            android:textSize="@dimen/text_size_medium"
+            android:layout_marginTop="4dp"/>
 
-            <Button
-                android:id="@+id/butBrowseGpoddernet"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txtvPodcastDirectoriesDescr"
-                android:layout_margin="8dp"
-                android:text="@string/browse_gpoddernet_label"/>
+        <Button
+            android:id="@+id/butBrowseGpoddernet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/browse_gpoddernet_label"/>
 
-            <Button
-                android:id="@+id/butSearchItunes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butBrowseGpoddernet"
-                android:layout_margin="8dp"
-                android:text="@string/search_itunes_label"/>
+        <Button
+            android:id="@+id/butSearchItunes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/search_itunes_label"/>
 
-            <TextView
-                android:id="@+id/txtvOpmlImport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butSearchItunes"
-                android:layout_margin="8dp"
-                style="@style/AntennaPod.TextView.Heading"
-                android:text="@string/opml_import_label"/>
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="16dp"
+            android:background="?android:attr/listDivider"/>
+
+        <TextView
+            android:id="@+id/txtvOpmlImport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            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:textSize="@dimen/text_size_medium"
-                android:text="@string/opml_import_txtv_button_lable"/>
+        <TextView
+            android:id="@+id/txtvOpmlImportExpl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:textSize="@dimen/text_size_medium"
+            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_marginTop="8dp"
+            android:text="@string/opml_import_label"/>
 
-            <Button
-                android:id="@+id/butOpmlImport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txtvOpmlImportExpl"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/opml_import_label"/>
-        </RelativeLayout>
-    </ScrollView>
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml
index 3e45a0400..5ece4f09f 100644
--- a/app/src/main/res/layout/opml_import.xml
+++ b/app/src/main/res/layout/opml_import.xml
@@ -1,32 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    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"
     android:orientation="vertical"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="8dp"
     tools:background="@android:color/darker_gray">
 
     <TextView
+        android:id="@+id/txtvHeadingExplanation1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/opml_import_explanation"
+        style="@style/AntennaPod.TextView.Heading"
+        android:text="@string/txtvfeedurl_label"/>
+
+    <TextView
+        android:id="@+id/txtvExplanation1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/opml_import_explanation_1"
+        android:textSize="@dimen/text_size_medium"
+        android:layout_marginTop="4dp"
         tools:background="@android:color/holo_green_dark" />
 
+    <Button
+        android:id="@+id/butChooseFileFromFilesystem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        android:text="@string/choose_file_from_filesystem" />
+
+    <View
+        android:id="@+id/divider1"
+        android:layout_width="fill_parent"
+        android:layout_height="1dp"
+        android:layout_margin="16dp"
+        android:background="?android:attr/listDivider"/>
+
     <TextView
-        android:id="@+id/txtvPath"
+        android:id="@+id/txtvHeadingExplanation2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        tools:text="Path"
+        style="@style/AntennaPod.TextView.Heading"
+        android:text="@string/txtvfeedurl_label"/>
+
+    <TextView
+        android:id="@+id/txtvExplanation2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/opml_import_explanation_2"
+        android:textSize="@dimen/text_size_medium"
+        android:layout_marginTop="4dp"
         tools:background="@android:color/holo_green_dark" />
 
     <Button
-        android:id="@+id/butStartImport"
-        android:layout_width="wrap_content"
+        android:id="@+id/butChooseFileFromExternal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
-        android:text="@string/start_import_label" />
+        android:layout_marginTop="8dp"
+        android:text="@string/choose_file_from_external_application" />
+
+    <View
+        android:id="@+id/divider2"
+        android:layout_width="fill_parent"
+        android:layout_height="1dp"
+        android:layout_margin="16dp"
+        android:background="?android:attr/listDivider"/>
+
+    <TextView
+        android:id="@+id/txtvHeadingExplanation3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/AntennaPod.TextView.Heading"
+        android:text="@string/txtvfeedurl_label"/>
+
+    <TextView
+        android:id="@+id/txtvExplanation3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/opml_import_explanation_3"
+        android:textSize="@dimen/text_size_medium"
+        android:layout_marginTop="4dp"
+        tools:background="@android:color/holo_green_dark" />
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b8d25d412312d2acff6d266655e8ab179896e9a0 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 3 Apr 2015 10:29:49 -0400
Subject: Adding drag handle allows swipe to remove.

Turns out all we needed was a drag handle to allow swipe to remove.

This still needs further testing, but is looking pretty good.

Will add an undo feature shortly.
---
 app/src/main/res/layout/new_episodes_fragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml
index 19db02f1d..de60bd5dc 100644
--- a/app/src/main/res/layout/new_episodes_fragment.xml
+++ b/app/src/main/res/layout/new_episodes_fragment.xml
@@ -16,7 +16,8 @@
             android:paddingBottom="@dimen/list_vertical_padding"
             android:clipToPadding="false"
             dslv:collapsed_height="2dp"
-            dslv:drag_enabled="false"
+            dslv:drag_enabled="true"
+            dslv:drag_handle_id="@id/drag_handle"
             dslv:drag_scroll_start="0.33"
             dslv:float_alpha="0.6"
             dslv:max_drag_scroll_speed="0.5"
-- 
cgit v1.2.3


From c277166f77351bdeda7c2dc10db21df420fb2987 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 3 Apr 2015 10:47:01 -0400
Subject: Can now undo swipe to mark as read.

Behavior isn't ideal when the user is displaying all the items in their feed.
(you can swipe new and read items and they don't go away (obviously)).
---
 app/src/main/res/layout/new_episodes_fragment.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml
index de60bd5dc..e90171630 100644
--- a/app/src/main/res/layout/new_episodes_fragment.xml
+++ b/app/src/main/res/layout/new_episodes_fragment.xml
@@ -50,4 +50,18 @@
         tools:layout_height="64dp"
         tools:background="@android:color/holo_red_light"/>
 
+    <LinearLayout
+        android:id="@+id/undobar"
+        style="@style/UndoBar">
+
+        <TextView
+            android:id="@+id/undobar_message"
+            style="@style/UndoBarMessage"/>
+
+        <Button
+            android:id="@+id/undobar_button"
+            style="@style/UndoBarButton"/>
+
+    </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3