From 67cc7c98857b3fa0897ab96b2b87f52d99e4de2f Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 28 Mar 2015 10:59:07 +0100
Subject: Sync episode actions with gpodder, smart mark as played

* Create episode actions when episodes are downloaded, played, deleted and marked as read
* Sync (download and upload) episode actions
* MediaPlayerActivity deletes almost completely played episode on close
* Improved parsing of datetime strings
* Smart mark as played can be disabled or set in the preferences
---
 app/src/main/res/xml/preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6d14349d5..eb6a3fe1f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -59,6 +59,13 @@
             android:key="prefAutoDelete"
             android:summary="@string/pref_auto_delete_sum"
             android:title="@string/pref_auto_delete_title"/>
+        <ListPreference
+            android:defaultValue="30"
+            android:entries="@array/smart_mark_as_played_values"
+            android:entryValues="@array/smart_mark_as_played_values"
+            android:key="prefSmartMarkAsPlayedSecs"
+            android:summary="@string/pref_smart_mark_as_played_sum"
+            android:title="@string/pref_smart_mark_as_played_title"/>
         <Preference
             android:key="prefPlaybackSpeedLauncher"
             android:summary="@string/pref_playback_speed_sum"
-- 
cgit v1.2.3


From fd30ec8189a1d9b47adfa31a9fe7dbc2085061f6 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Mon, 6 Apr 2015 18:32:06 +0200
Subject: Set fast forward and rewind time

---
 app/src/main/res/layout/audioplayer_activity.xml | 24 ++++++++++++++++++++++++
 app/src/main/res/xml/preferences.xml             |  8 --------
 2 files changed, 24 insertions(+), 8 deletions(-)

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

diff --git a/app/src/main/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml
index 644d8fe90..827e06e00 100644
--- a/app/src/main/res/layout/audioplayer_activity.xml
+++ b/app/src/main/res/layout/audioplayer_activity.xml
@@ -95,6 +95,18 @@
                     tools:src="@drawable/ic_fast_rewind_white_36dp"
                     tools:background="@android:color/holo_blue_dark" />
 
+                <TextView
+                    android:id="@+id/txtvRev"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:layout_alignTop="@id/butRev"
+                    android:layout_alignLeft="@id/butRev"
+                    android:layout_alignRight="@id/butRev"
+                    android:gravity="center"
+                    android:text="30"
+                    android:textSize="8dp"
+                    android:clickable="false"/>
+
                 <ImageButton
                     android:id="@+id/butFF"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"
@@ -106,6 +118,18 @@
                     tools:src="@drawable/ic_fast_forward_white_36dp"
                     tools:background="@android:color/holo_blue_dark" />
 
+                <TextView
+                    android:id="@+id/txtvFF"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:layout_alignTop="@id/butFF"
+                    android:layout_alignLeft="@id/butFF"
+                    android:layout_alignRight="@id/butFF"
+                    android:gravity="center"
+                    android:text="30"
+                    android:textSize="8dp"
+                    android:clickable="false"/>
+
                 <Button
                     android:id="@+id/butPlaybackSpeed"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index eb6a3fe1f..f06f83914 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -78,14 +78,6 @@
             android:summary="@string/pref_pausePlaybackForFocusLoss_sum"
             android:title="@string/pref_pausePlaybackForFocusLoss_title" />
 
-        <ListPreference
-            android:defaultValue="30"
-            android:entries="@array/seek_delta_values"
-            android:entryValues="@array/seek_delta_values"
-            android:key="prefSeekDeltaSecs"
-            android:summary="@string/pref_seek_delta_sum"
-            android:title="@string/pref_seek_delta_title" />
-
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref">
         <ListPreference
-- 
cgit v1.2.3


From 85ace6fb0180940450075990b35bbff6edf52184 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 17 Apr 2015 11:12:05 +0200
Subject: Layout changes and optimizations

---
 app/src/main/res/layout/nav_feedlistitem.xml |  6 ++----
 app/src/main/res/layout/nav_list.xml         | 25 ++++++++++---------------
 app/src/main/res/layout/nav_listitem.xml     | 12 ++++--------
 app/src/main/res/layout/nav_section_item.xml |  2 +-
 4 files changed, 17 insertions(+), 28 deletions(-)

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

diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index e942d1b08..38f4f21aa 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -18,8 +18,8 @@
         android:adjustViewBounds="true"
         android:cropToPadding="true"
         android:scaleType="fitXY"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
         tools:src="@drawable/ic_stat_antenna_default"
         tools:background="@android:color/holo_green_dark"/>
@@ -36,8 +36,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding"
-        android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding"
         android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_toRightOf="@id/imgvCover"
         tools:text="Navigation feed item title"
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 8c46e456d..e366a65b2 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_layout"
     android:layout_width="@dimen/drawer_width"
@@ -12,7 +13,7 @@
     <ListView
         android:id="@+id/nav_list"
         android:layout_width="@dimen/drawer_width"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:choiceMode="singleChoice"
         android:clipToPadding="false"
@@ -24,17 +25,11 @@
         tools:listitem="@layout/nav_listitem"
         tools:background="@android:color/holo_purple" />
 
-    <View
-        android:layout_width="@dimen/drawer_width"
-        android:layout_height="1dp"
-        android:layout_centerVertical="true"
-        android:background="?android:attr/listDivider"
-        tools:background="@android:color/holo_red_dark" />
-
     <LinearLayout
         android:id="@+id/nav_settings"
         android:layout_width="@dimen/drawer_width"
         android:layout_height="@dimen/listitem_iconwithtext_height"
+        android:layout_alignParentBottom="true"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/settings_label"
         android:orientation="horizontal">
@@ -45,9 +40,9 @@
             android:layout_height="@dimen/thumbnail_length_navlist"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="4dp"
             android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="4dp"
             android:adjustViewBounds="true"
             android:contentDescription="@string/cover_label"
             android:cropToPadding="true"
@@ -58,10 +53,10 @@
             tools:background="@android:color/holo_orange_dark" />
 
         <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_margin="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="@string/settings_label"
@@ -71,4 +66,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index bb5865ee6..d62672c34 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -16,11 +16,11 @@
         android:layout_centerVertical="true"
         android:adjustViewBounds="true"
         android:cropToPadding="true"
-        android:scaleType="centerCrop"
-        android:padding="8dp"
+        android:scaleType="centerInside"
+        android:padding="4dp"
         android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         tools:src="@drawable/ic_new_releases_white_24dp"
         tools:background="@android:color/holo_green_dark"/>
 
@@ -36,8 +36,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding"
-        android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding"
         android:layout_marginRight="48dp"
         android:layout_toRightOf="@id/imgvCover"
         tools:text="Navigation item title"
@@ -52,8 +50,6 @@
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="@dimen/text_size_navdrawer"
         android:layout_marginLeft="12dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="14dp"
         android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml
index 77b2ff253..fa1db865d 100644
--- a/app/src/main/res/layout/nav_section_item.xml
+++ b/app/src/main/res/layout/nav_section_item.xml
@@ -3,7 +3,7 @@
 <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="24dp"
+    android:layout_height="16dp"
     android:background="@android:color/transparent"
     android:orientation="vertical">
 
-- 
cgit v1.2.3


From 158821c0e1953b72dc89bc5896684de3ba1ce1fb Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 17 Apr 2015 11:12:54 +0200
Subject: Preference: Change nav drawer

Preference
---
 app/src/main/res/xml/preferences.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f06f83914..c1eb857d5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -9,6 +9,10 @@
             android:key="prefTheme"
             android:summary="@string/pref_set_theme_sum"
             android:defaultValue="0"/>
+        <Preference
+            android:key="prefHiddenDrawerItems"
+            android:summary="@string/pref_nav_drawer_items_sum"
+            android:title="@string/pref_nav_drawer_items_title" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
-- 
cgit v1.2.3


From 4aa68e74e099f7a18ee339a70d8a7ec0fdb6dffa Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 17 Apr 2015 13:16:14 +0200
Subject: Bux fixes, tests

---
 app/src/main/res/layout/nav_list.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index e366a65b2..2807cf15f 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -66,4 +66,12 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <View
+        android:layout_width="@dimen/drawer_width"
+        android:layout_height="1dp"
+        android:layout_centerVertical="true"
+        android:layout_above="@id/nav_settings"
+        android:background="?android:attr/listDivider"
+        tools:background="@android:color/holo_red_dark" />
+
+</RelativeLayout>
-- 
cgit v1.2.3


From 25f5c1e3606972762cff517935cde30bac3c462d Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 18 Apr 2015 23:10:40 +0200
Subject: Layout fix

---
 app/src/main/res/layout/nav_list.xml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

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

diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 2807cf15f..9fcf9d9fc 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -10,21 +10,6 @@
     android:background="?attr/nav_drawer_background"
     android:orientation="vertical">
 
-    <ListView
-        android:id="@+id/nav_list"
-        android:layout_width="@dimen/drawer_width"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:choiceMode="singleChoice"
-        android:clipToPadding="false"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="0dp"
-        android:paddingBottom="@dimen/list_vertical_padding"
-        android:paddingTop="@dimen/list_vertical_padding"
-        android:scrollbarStyle="outsideOverlay"
-        tools:listitem="@layout/nav_listitem"
-        tools:background="@android:color/holo_purple" />
-
     <LinearLayout
         android:id="@+id/nav_settings"
         android:layout_width="@dimen/drawer_width"
@@ -67,6 +52,7 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/divider"
         android:layout_width="@dimen/drawer_width"
         android:layout_height="1dp"
         android:layout_centerVertical="true"
@@ -74,4 +60,21 @@
         android:background="?android:attr/listDivider"
         tools:background="@android:color/holo_red_dark" />
 
+    <ListView
+        android:id="@+id/nav_list"
+        android:layout_width="@dimen/drawer_width"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_above="@id/divider"
+        android:layout_alignParentTop="true"
+        android:choiceMode="singleChoice"
+        android:clipToPadding="false"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="0dp"
+        android:paddingBottom="@dimen/list_vertical_padding"
+        android:paddingTop="@dimen/list_vertical_padding"
+        android:scrollbarStyle="outsideOverlay"
+        tools:listitem="@layout/nav_listitem"
+        tools:background="@android:color/holo_purple" />
+
 </RelativeLayout>
-- 
cgit v1.2.3


From 7829ddc94e8ddeb3f7e307205c07439e0f322dcd Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Tue, 21 Apr 2015 17:34:02 +0200
Subject: Show URL in feed info, layout optimizations

---
 app/src/main/res/layout/feedinfo.xml | 162 ++++++++++++++++++++---------------
 1 file changed, 95 insertions(+), 67 deletions(-)

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

diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index a52104afa..db897865c 100644
--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
@@ -11,7 +12,10 @@
         android:focusableInTouchMode="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="8dp">
 
         <ImageView
             android:id="@+id/imgvCover"
@@ -20,26 +24,26 @@
             android:layout_height="70dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:layout_margin="4dp"
             tools:src="@drawable/ic_stat_antenna_default"
-            tools:background="@android:color/holo_green_dark" />
+            tools:background="@android:color/holo_green_dark"/>
 
         <TextView
             android:id="@+id/txtvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_margin="4dp"
+            android:layout_marginLeft="8dp"
             android:layout_toRightOf="@id/imgvCover"
             style="@style/AntennaPod.TextView.Heading"
             tools:text="Feed title"
-            tools:background="@android:color/holo_green_dark" />
+            tools:background="@android:color/holo_green_dark"/>
 
         <View
             android:id="@+id/divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_below="@id/imgvCover"
+            android:layout_marginTop="8dp"
             android:background="@color/bright_blue"/>
     </RelativeLayout>
 
@@ -47,99 +51,120 @@
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:scrollbarStyle="outsideInset"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <android.support.v7.widget.GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp">
-
-                <View
-                    android:id="@+id/center_divider"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_centerHorizontal="true"/>
+                android:layout_marginTop="8dp"
+                app:columnCount="2"
+                app:rowCount="3">
 
                 <TextView
                     android:id="@+id/lblAuthor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_margin="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_row="0"
+                    app:layout_column="0"
+                    android:lines="1"
                     android:text="@string/author_label"
                     android:textColor="?android:attr/textColorPrimary"
-                    tools:background="@android:color/holo_red_light" />
+                    tools:background="@android:color/holo_red_light"/>
 
                 <TextView
                     android:id="@+id/txtvAuthor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_margin="8dp"
-                    android:layout_toRightOf="@id/center_divider"
+                    app:layout_row="0"
+                    app:layout_column="1"
                     tools:text="Daniel Oeh"
-                    tools:background="@android:color/holo_green_dark" />
+                    tools:background="@android:color/holo_green_dark"/>
 
                 <TextView
                     android:id="@+id/lblLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_below="@id/txtvAuthor"
-                    android:layout_margin="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_row="1"
+                    app:layout_column="0"
+                    android:lines="1"
                     android:text="@string/language_label"
                     android:textColor="?android:attr/textColorPrimary"
-                    tools:background="@android:color/holo_red_light" />
+                    tools:background="@android:color/holo_red_light"/>
 
                 <TextView
                     android:id="@+id/txtvLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@id/txtvAuthor"
-                    android:layout_margin="8dp"
-                    android:layout_toRightOf="@id/center_divider"
+                    app:layout_row="1"
+                    app:layout_column="1"
                     tools:text="English"
-                    tools:background="@android:color/holo_green_dark" />
-            </RelativeLayout>
+                    tools:background="@android:color/holo_green_dark"/>
+
+                <TextView
+                    android:id="@+id/lblUrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_row="2"
+                    app:layout_column="0"
+                    android:lines="1"
+                    android:text="@string/url_label"
+                    android:textColor="?android:attr/textColorPrimary"
+                    tools:background="@android:color/holo_red_light"/>
+
+                <TextView
+                    android:id="@+id/txtvUrl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_row="2"
+                    app:layout_column="1"
+                    tools:text="http://www.example.com/feed"
+                    tools:background="@android:color/holo_green_dark"/>
+
+            </android.support.v7.widget.GridLayout>
 
             <TextView
                 android:id="@+id/txtvSettings"
                 style="@style/AntennaPod.TextView.Heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
                 android:text="@string/podcast_settings_label"
-                android:layout_marginLeft="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="24dp"/>
+                android:layout_marginTop="8dp"/>
 
             <CheckBox
                 android:id="@+id/cbxAutoDownload"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/auto_download_label"
                 android:enabled="false"
                 android:textColor="?android:attr/textColorPrimary"
-                tools:background="@android:color/holo_red_light" />
+                tools:background="@android:color/holo_red_light"
+                android:checked="false"/>
 
             <TextView
                 android:id="@+id/txtvAuthentication"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/authentication_label"
                 android:textSize="@dimen/text_size_medium"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_marginLeft="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="24dp"/>
+                android:textColor="?android:attr/textColorPrimary"/>
 
             <TextView
                 android:id="@+id/txtvAuthenticationDescr"
@@ -148,71 +173,74 @@
                 android:textColor="?android:attr/textColorPrimary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"/>
+                android:layout_marginTop="8dp"/>
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <android.support.v7.widget.GridLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp">
+                android:layout_marginTop="8dp"
+                app:columnCount="2"
+                app:rowCount="3"
+                android:layout_gravity="center_horizontal">
 
                 <TextView
                     android:id="@+id/txtvUsername"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_row="0"
+                    app:layout_column="0"
                     android:text="@string/username_label"
                     android:textColor="?android:attr/textColorPrimary"/>
 
                 <EditText
                     android:id="@+id/etxtUsername"
-                    android:layout_width="0dp"
-                    android:layout_weight="2"
+                    android:layout_width="140sp"
                     android:layout_height="wrap_content"
+                    app:layout_row="0"
+                    app:layout_column="1"
                     android:hint="@string/username_label"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp">
 
                 <TextView
                     android:id="@+id/txtvPassword"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_row="1"
+                    app:layout_column="0"
                     android:text="@string/password_label"
                     android:textColor="?android:attr/textColorPrimary"/>
 
                 <EditText
                     android:id="@+id/etxtPassword"
-                    android:layout_width="0dp"
-                    android:layout_weight="2"
+                    android:layout_width="140sp"
                     android:layout_height="wrap_content"
+                    app:layout_row="1"
+                    app:layout_column="1"
                     android:hint="@string/password_label"
                     android:inputType="textPassword"/>
-            </LinearLayout>
+
+            </android.support.v7.widget.GridLayout>
 
             <TextView
                 style="@style/AntennaPod.TextView.Heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/description_label"/>
 
             <TextView
                 android:id="@+id/txtvDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/design_time_lorem_ipsum"
-                tools:background="@android:color/holo_green_dark" />
+                tools:background="@android:color/holo_green_dark"/>
 
         </LinearLayout>
+
     </ScrollView>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8050372ba0c0d0ee9f03535866a7ddf0e7c4e744 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Tue, 28 Apr 2015 16:49:41 +0200
Subject: Add ability to retry failed downloads in the download log

---
 app/src/main/res/layout/downloadlog_item.xml | 120 ++++++++++++++-------------
 1 file changed, 63 insertions(+), 57 deletions(-)

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

diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml
index df1501222..c6a34a517 100644
--- a/app/src/main/res/layout/downloadlog_item.xml
+++ b/app/src/main/res/layout/downloadlog_item.xml
@@ -1,78 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:orientation="vertical"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="8dp"
     tools:background="@android:color/darker_gray">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
-        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
-        android:layout_marginTop="@dimen/listitem_threeline_verticalpadding">
-
-        <TextView
-            android:id="@+id/txtvType"
-            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding"
-            tools:text="Media file"
-            tools:background="@android:color/holo_green_dark" />
-
-        <TextView
-            android:id="@+id/txtvTitle"
-            style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/txtvType"
-            tools:text="Download item title"
-            tools:background="@android:color/holo_blue_light" />
-    </RelativeLayout>
+    <TextView
+        android:id="@+id/txtvIcon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:textSize="48sp"
+        tools:text="[Icon]"
+        android:gravity="center" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
+    <Button
+        android:id="@+id/btnRetry"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
-        android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
-        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding">
+        android:layout_below="@id/txtvIcon"
+        android:layout_alignLeft="@id/txtvIcon"
+        android:layout_alignRight="@id/txtvIcon"
+        android:layout_marginTop="8dp"
+        tools:text="↻" />
 
-        <TextView
-            android:id="@+id/txtvDate"
-            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_marginRight="8dp"
-            tools:text="January 23"
-            tools:background="@android:color/holo_green_dark" />
+    <TextView
+        android:id="@+id/txtvType"
+        style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginBottom="8dp"
+        tools:text="Media file"
+        tools:background="@android:color/holo_green_dark" />
 
-        <TextView
-            android:id="@+id/txtvStatus"
-            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            tools:text="successful"
-            tools:background="@android:color/holo_green_dark" />
+    <TextView
+        android:id="@+id/txtvTitle"
+        style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/txtvIcon"
+        android:layout_toLeftOf="@id/txtvType"
+        android:layout_marginLeft="8dp"
+        android:layout_marginBottom="8dp"
+        android:minLines="1"
+        android:maxLines="2"
+        tools:text="Download item title"
+        tools:background="@android:color/holo_blue_light" />
 
-    </RelativeLayout>
+    <TextView
+        android:id="@+id/txtvDate"
+        style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/txtvIcon"
+        android:layout_below="@id/txtvTitle"
+        android:layout_marginLeft="8dp"
+        android:layout_marginBottom="8dp"
+        tools:text="January 23"
+        tools:background="@android:color/holo_green_dark" />
 
     <TextView
         android:id="@+id/txtvReason"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding"
-        android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
-        android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"
+        android:layout_below="@id/txtvDate"
+        android:layout_toRightOf="@id/txtvIcon"
+        android:layout_marginLeft="8dp"
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="@dimen/text_size_micro"
         tools:text="@string/design_time_downloaded_log_failure_reason"
         tools:background="@android:color/holo_green_dark" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 103fb635d16f270796adde0e6f3d212a671b7214 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 2 May 2015 21:04:30 +0200
Subject: Add ActionBar icon to enable/disable list drag (reorder, swipe)

---
 app/src/main/res/layout/queue_listitem.xml | 6 ++++--
 app/src/main/res/menu/queue.xml            | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index bc5b951a2..39e9c72a5 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -1,17 +1,19 @@
 <?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="@dimen/listitem_threeline_height"
     android:orientation="horizontal"
+    android:paddingLeft="16dp"
     tools:background="@android:color/darker_gray" >
 
     <ImageView
         android:id="@+id/drag_handle"
         android:layout_width="100dp"
         android:layout_height="match_parent"
-        android:layout_marginLeft="8dp"
+        android:layout_marginLeft="-8dp"
         android:layout_marginRight="-64dp"
         android:contentDescription="@string/drag_handle_content_description"
         android:scaleType="fitXY"
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index c7dd4d371..47e2a008e 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -3,6 +3,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/queue_lock"
+        android:title=""
+        android:menuCategory="container"
+        custom:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/refresh_item"
         android:title="@string/refresh_label"
-- 
cgit v1.2.3


From a92220f8dbb3339ea101abeac0cf77bd87d9b544 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sun, 3 May 2015 15:07:25 +0200
Subject: Show lock icon always, use correct search view text color on older
 devices

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

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

diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index 47e2a008e..127a17f7d 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -7,7 +7,7 @@
         android:id="@+id/queue_lock"
         android:title=""
         android:menuCategory="container"
-        custom:showAsAction="ifRoom" />
+        custom:showAsAction="always" />
 
     <item
         android:id="@+id/refresh_item"
-- 
cgit v1.2.3


From db0ce285a35841e1a781794b9214099bce38244d Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Sun, 3 May 2015 15:16:47 -0400
Subject: Optionally resume playback after call.

Defaults to true.

fixes AntennaPod/AntennaPod#753
---
 app/src/main/res/xml/preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c1eb857d5..e848915cf 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -81,6 +81,12 @@
             android:key="prefPauseForFocusLoss"
             android:summary="@string/pref_pausePlaybackForFocusLoss_sum"
             android:title="@string/pref_pausePlaybackForFocusLoss_title" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="prefResumeAfterCall"
+            android:summary="@string/pref_resumeAfterCall_sum"
+            android:title="@string/pref_resumeAfterCall_title"/>
 
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref">
-- 
cgit v1.2.3


From 9ec0d735c86c62c2d2a65229c1f1bf8e0e44dec5 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sun, 26 Apr 2015 13:37:27 +0200
Subject: Add feed item filter

---
 app/src/main/res/layout/feeditemlist_header.xml | 15 +++++++++++++--
 app/src/main/res/menu/feedlist.xml              |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 4619580e3..943f4fc92 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -3,7 +3,7 @@
 <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/feeditemlist_header_height"
+    android:layout_height="wrap_content"
     tools:context="de.danoeh.antennapod.activity.MainActivity"
     tools:background="@android:color/darker_gray">
 
@@ -11,7 +11,7 @@
         android:id="@+id/imgvBackground"
         style="@style/BigBlurryBackground"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="@dimen/feeditemlist_header_height" />
 
     <ImageView
         android:id="@+id/imgvCover"
@@ -78,5 +78,16 @@
         tools:text="Podcast author"
         tools:background="@android:color/holo_green_dark" />
 
+    <TextView
+        android:id="@+id/txtvInformation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/imgvBackground"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:text="(i) Information"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index b6512e828..00785a29b 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -2,6 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/hide_items"
+        android:icon="?attr/ic_filter"
+        android:menuCategory="container"
+        android:title="@string/hide_episodes_title"
+        custom:showAsAction="always">
+    </item>
     <item
         android:id="@+id/refresh_item"
         android:icon="?attr/navigation_refresh"
-- 
cgit v1.2.3


From 0f293a4d786482aeb59e8dc21708488c1a52f376 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Tue, 12 May 2015 19:02:39 +0200
Subject: Fix ActionBar SearchView

---
 app/src/main/res/menu/feedlist.xml         |  8 ++++++++
 app/src/main/res/menu/gpodder_podcasts.xml | 13 +++++++++++++
 app/src/main/res/menu/new_episodes.xml     |  7 +++++++
 app/src/main/res/menu/queue.xml            |  7 +++++++
 4 files changed, 35 insertions(+)
 create mode 100644 app/src/main/res/menu/gpodder_podcasts.xml

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

diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 00785a29b..97a40892a 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -22,6 +22,14 @@
         android:title="@string/load_complete_feed"
         custom:showAsAction="collapseActionView">
     </item>
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/action_search"
+        custom:showAsAction="collapseActionView|ifRoom"
+        custom:actionViewClass="android.support.v7.widget.SearchView"
+        android:title="@string/search_label"/>
+
     <item
         android:id="@+id/mark_all_read_item"
         android:menuCategory="container"
diff --git a/app/src/main/res/menu/gpodder_podcasts.xml b/app/src/main/res/menu/gpodder_podcasts.xml
new file mode 100644
index 000000000..88fa36a4a
--- /dev/null
+++ b/app/src/main/res/menu/gpodder_podcasts.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/action_search"
+        custom:showAsAction="collapseActionView|ifRoom"
+        custom:actionViewClass="android.support.v7.widget.SearchView"
+        android:title="@string/search_label"/>
+
+</menu>
diff --git a/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml
index d7bcdf0f6..3df640cc4 100644
--- a/app/src/main/res/menu/new_episodes.xml
+++ b/app/src/main/res/menu/new_episodes.xml
@@ -3,6 +3,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/action_search"
+        custom:showAsAction="collapseActionView|ifRoom"
+        custom:actionViewClass="android.support.v7.widget.SearchView"
+        android:title="@string/search_label"/>
+
     <item
         android:id="@+id/refresh_item"
         android:title="@string/refresh_label"
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index 127a17f7d..57977198e 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -16,6 +16,13 @@
         custom:showAsAction="always"
         android:icon="?attr/navigation_refresh"/>
 
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/action_search"
+        custom:showAsAction="collapseActionView|ifRoom"
+        custom:actionViewClass="android.support.v7.widget.SearchView"
+        android:title="@string/search_label"/>
+
     <item
         android:id="@+id/clear_queue"
         android:title="Clear Queue"
-- 
cgit v1.2.3


From 75f3756857f7ab71ec31f5a99b729beea49f841a Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 13 May 2015 09:29:46 +0200
Subject: Show always

---
 app/src/main/res/menu/feedlist.xml     | 2 +-
 app/src/main/res/menu/new_episodes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 97a40892a..e0da72667 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -26,7 +26,7 @@
     <item
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
-        custom:showAsAction="collapseActionView|ifRoom"
+        custom:showAsAction="always"
         custom:actionViewClass="android.support.v7.widget.SearchView"
         android:title="@string/search_label"/>
 
diff --git a/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml
index 3df640cc4..1e1d7ab78 100644
--- a/app/src/main/res/menu/new_episodes.xml
+++ b/app/src/main/res/menu/new_episodes.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
-        custom:showAsAction="collapseActionView|ifRoom"
+        custom:showAsAction="always"
         custom:actionViewClass="android.support.v7.widget.SearchView"
         android:title="@string/search_label"/>
 
-- 
cgit v1.2.3


From 333eccb0bcc54da4ffd6f5f6895afdcffed6213b Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Wed, 13 May 2015 15:53:43 +0200
Subject: Use localization for clear queue

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

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

diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index 127a17f7d..5ce27e2f7 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -18,7 +18,7 @@
 
     <item
         android:id="@+id/clear_queue"
-        android:title="Clear Queue"
+        android:title="@string/clear_queue_label"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
         android:icon="?attr/navigation_accept"/>
-- 
cgit v1.2.3


From e68ca0529bf996ef961fe85009092e9b27e1f699 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Wed, 22 Apr 2015 19:11:42 +0200
Subject: Mark as unplayed option

Users can mark feed items as unplayed from feed item fragment and the queue
---
 app/src/main/res/menu/queue_context.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 327600038..d20e57cc9 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -7,6 +7,16 @@
         android:menuCategory="container"
         android:title="@string/move_to_top_label" />
 
+    <item
+        android:id="@+id/mark_read_item"
+        android:menuCategory="container"
+        android:title="@string/mark_read_label" />
+
+    <item
+        android:id="@+id/mark_unread_item"
+        android:menuCategory="container"
+        android:title="@string/mark_unread_label" />
+
     <item
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
-- 
cgit v1.2.3


From 406dab0a24543f4332b338f64689948cdc96c3bc Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sun, 26 Apr 2015 12:59:01 +0200
Subject: Show feed new items and refresh failure

---
 app/src/main/res/layout/feeditemlist_header.xml   | 15 ++++++
 app/src/main/res/layout/feeditemlist_item.xml     | 56 +++++++++++++----------
 app/src/main/res/layout/nav_feedlistitem.xml      | 36 +++++++++++++--
 app/src/main/res/layout/new_episodes_listitem.xml | 46 +++++++++----------
 4 files changed, 101 insertions(+), 52 deletions(-)

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

diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 943f4fc92..667f777af 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -78,6 +78,21 @@
         tools:text="Podcast author"
         tools:background="@android:color/holo_green_dark" />
 
+    <IconTextView
+        android:id="@+id/txtvFailure"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/imgvBackground"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:background="@color/download_failed_red"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        android:text="@string/refresh_failed_msg"
+        tools:text="(!) Last refresh failed"
+        />
+
     <TextView
         android:id="@+id/txtvInformation"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 03595990e..6b7c45978 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -22,8 +22,10 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
-            android:layout_margin="16dp"
-            tools:text="Status unread"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            tools:text="NEW"
             tools:background="@android:color/white" />
 
         <TextView
@@ -36,9 +38,18 @@
             android:layout_marginBottom="8dp"
             android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
             android:layout_toLeftOf="@id/statusUnread"
-            tools:text="Feed item name"
+            tools:text="Episode title"
             tools:background="@android:color/holo_green_dark" />
 
+        <TextView
+            android:id="@+id/txtvLenSize"
+            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/txtvItemname"
+            tools:text="00:42:23"
+            tools:background="@android:color/holo_green_dark" />
 
         <ImageView
             android:id="@+id/imgvInPlaylist"
@@ -46,7 +57,7 @@
             android:layout_height="@dimen/enc_icons_size"
             android:layout_alignParentRight="true"
             android:layout_below="@id/txtvItemname"
-            android:layout_marginRight="4dp"
+            android:layout_marginRight="8dp"
             android:contentDescription="@string/in_queue_label"
             android:src="?attr/stat_playlist"
             android:visibility="visible"
@@ -58,20 +69,21 @@
             android:layout_width="@dimen/enc_icons_size"
             android:layout_height="@dimen/enc_icons_size"
             android:layout_below="@id/txtvItemname"
-            android:layout_marginRight="4dp"
-            android:layout_toLeftOf="@+id/imgvInPlaylist"
+            android:layout_marginRight="8dp"
+            android:layout_toLeftOf="@id/imgvInPlaylist"
             tools:ignore="ContentDescription"
             tools:src="@drawable/ic_hearing_white_18dp"
             tools:background="@android:color/holo_red_light" />
 
         <TextView
-            android:id="@+id/txtvLenSize"
+            android:id="@+id/txtvPublished"
             style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_below="@id/txtvItemname"
-            tools:text="00:42:23"
+            android:layout_marginRight="8dp"
+            android:layout_toLeftOf="@id/imgvType"
+            tools:text="Jan 23"
             tools:background="@android:color/holo_green_dark" />
 
         <ProgressBar
@@ -79,24 +91,20 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_below="@id/txtvItemname"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:layout_toLeftOf="@id/imgvType"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_toLeftOf="@id/txtvPublished"
             android:layout_toRightOf="@id/txtvLenSize"
-            tools:background="@android:color/holo_blue_light" />
+            android:layout_alignTop="@id/txtvPublished"
+            android:layout_alignBottom="@id/txtvPublished"
+            tools:background="@android:color/holo_blue_light"
+            android:max="100"
+            android:progress="42"
+            android:indeterminate="false"
+            />
+
 
 
-        <TextView
-            android:id="@+id/txtvPublished"
-            style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txtvItemname"
-            android:layout_marginRight="4dp"
-            android:layout_toLeftOf="@id/imgvType"
-            tools:text="Jan 23"
-            tools:background="@android:color/holo_green_dark" />
     </RelativeLayout>
 
     <include layout="@layout/vertical_list_divider"/>
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 38f4f21aa..238beff88 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -7,7 +7,6 @@
                 android:layout_height="@dimen/listitem_iconwithtext_height"
                 tools:background="@android:color/darker_gray">
 
-
     <ImageView
         android:id="@+id/imgvCover"
         android:contentDescription="@string/cover_label"
@@ -24,7 +23,6 @@
         tools:src="@drawable/ic_stat_antenna_default"
         tools:background="@android:color/holo_green_dark"/>
 
-
     <TextView
         android:id="@+id/txtvTitle"
         android:lines="1"
@@ -39,6 +37,34 @@
         android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_toRightOf="@id/imgvCover"
         tools:text="Navigation feed item title"
-        tools:background="@android:color/holo_green_dark"
-        />
-</RelativeLayout>
\ No newline at end of file
+        tools:background="@android:color/holo_green_dark"/>
+
+    <TextView
+        android:id="@+id/txtvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:lines="1"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="@dimen/text_size_navdrawer"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="@dimen/listitem_icon_rightpadding"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        tools:text="23"
+        tools:background="@android:color/holo_green_dark"/>
+
+    <IconTextView
+        android:id="@+id/itxtvFailure"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@id/txtvCount"
+        android:lines="1"
+        android:text="{fa-exclamation-circle}"
+        android:textColor="@color/download_failed_red"
+        android:textSize="@dimen/text_size_navdrawer"
+        android:layout_marginLeft="8dp"
+        android:layout_centerVertical="true"
+        tools:text="!"
+        tools:background="@android:color/holo_green_dark"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index 43ada14b0..b738cf836 100644
--- a/app/src/main/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
@@ -37,7 +37,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true" />
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="8dp"/>
 
         <TextView
             android:id="@+id/txtvTitle"
@@ -60,38 +61,26 @@
             android:layout_marginTop="16dp"
             tools:background="@android:color/holo_red_light" >
 
+            <TextView
+                android:id="@+id/txtvDuration"
+                style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                tools:text="00:42:23"
+                tools:background="@android:color/holo_blue_dark" />
+
             <ImageView
-                android:id="@id/imgvInPlaylist"
+                android:id="@+id/imgvInPlaylist"
                 android:layout_width="@dimen/enc_icons_size"
                 android:layout_height="@dimen/enc_icons_size"
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="8dp"
-                android:layout_marginRight="4dp"
                 android:contentDescription="@string/in_queue_label"
                 android:src="?attr/stat_playlist"
                 tools:src="@drawable/ic_list_grey600_24dp"
                 tools:background="@android:color/black" />
 
-            <ProgressBar
-                android:id="@+id/pbar_download_progress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_marginRight="8dp"
-                android:layout_toLeftOf="@id/imgvInPlaylist"
-                android:max="100" />
-
-            <TextView
-                android:id="@+id/txtvDuration"
-                style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@id/imgvInPlaylist"
-                tools:text="00:42:23"
-                tools:background="@android:color/holo_blue_dark" />
-
             <TextView
                 android:id="@+id/txtvPublished"
                 style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
@@ -103,6 +92,17 @@
                 tools:text="Jan 23"
                 tools:background="@android:color/holo_green_dark" />
 
+            <ProgressBar
+                android:id="@+id/pbar_download_progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_toLeftOf="@id/txtvPublished"
+                android:layout_toRightOf="@id/txtvDuration"
+                android:max="100" />
+
         </RelativeLayout>
     </RelativeLayout>
 
-- 
cgit v1.2.3


From 518e8207da568d04c3e780b407f29bc51e2d1995 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 8 May 2015 17:07:32 +0200
Subject: Reset dialog in progress

---
 app/src/main/res/menu/queue_context.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index d20e57cc9..b1589af3b 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -13,9 +13,9 @@
         android:title="@string/mark_read_label" />
 
     <item
-        android:id="@+id/mark_unread_item"
+        android:id="@+id/reset_attributes"
         android:menuCategory="container"
-        android:title="@string/mark_unread_label" />
+        android:title="@string/reset_attributes" />
 
     <item
         android:id="@+id/remove_from_queue_item"
-- 
cgit v1.2.3


From c829a4e9b2cf7ccee117269769d71c40432f92fa Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 9 May 2015 21:19:22 +0200
Subject: Context dialog for feed item list

---
 app/src/main/res/menu/feeditem.xml             | 77 --------------------------
 app/src/main/res/menu/feeditem_dialog.xml      | 48 ----------------
 app/src/main/res/menu/feeditem_options.xml     | 50 +++++++++++++++++
 app/src/main/res/menu/feeditemlist_context.xml | 51 +++++++++++++++++
 app/src/main/res/menu/queue_context.xml        | 19 ++++++-
 5 files changed, 118 insertions(+), 127 deletions(-)
 delete mode 100644 app/src/main/res/menu/feeditem.xml
 delete mode 100644 app/src/main/res/menu/feeditem_dialog.xml
 create mode 100644 app/src/main/res/menu/feeditem_options.xml
 create mode 100644 app/src/main/res/menu/feeditemlist_context.xml

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

diff --git a/app/src/main/res/menu/feeditem.xml b/app/src/main/res/menu/feeditem.xml
deleted file mode 100644
index 8227f8b14..000000000
--- a/app/src/main/res/menu/feeditem.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:custom="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/download_item"
-        android:icon="?attr/av_download"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/download_label">
-    </item>
-    <item
-        android:id="@+id/stream_item"
-        android:icon="?attr/action_stream"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/stream_label">
-    </item>
-    <item
-        android:id="@+id/play_item"
-        android:icon="?attr/av_play"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/play_label">
-    </item>
-    <item
-        android:id="@+id/remove_item"
-        android:icon="?attr/content_discard"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/remove_label">
-    </item>
-    <item
-        android:id="@id/skip_episode_item"
-        android:title="@string/skip_episode_label"
-        custom:showAsAction="collapseActionView">
-    </item>
-    <item
-        android:id="@+id/cancel_download_item"
-        android:icon="?attr/navigation_cancel"
-        custom:showAsAction="ifRoom|collapseActionView"
-        android:title="@string/cancel_download_label">
-    </item>
-    <item
-        android:id="@+id/mark_read_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/mark_read_label">
-    </item>
-    <item
-        android:id="@+id/mark_unread_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/mark_unread_label">
-    </item>
-    <item
-        android:id="@+id/add_to_queue_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/add_to_queue_label">
-    </item>
-    <item
-        android:id="@+id/remove_from_queue_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/remove_from_queue_label">
-    </item>
-    <item
-        android:id="@+id/share_link_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
-    </item>
-    <item
-        android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/visit_website_label">
-    </item>
-    <item
-        android:id="@+id/support_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/support_label">
-    </item>
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/feeditem_dialog.xml b/app/src/main/res/menu/feeditem_dialog.xml
deleted file mode 100644
index f33b7502a..000000000
--- a/app/src/main/res/menu/feeditem_dialog.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:custom="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@id/skip_episode_item"
-        android:title="@string/skip_episode_label"
-        custom:showAsAction="collapseActionView">
-    </item>
-
-    <item
-        android:id="@+id/mark_read_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/mark_read_label">
-    </item>
-    <item
-        android:id="@+id/mark_unread_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/mark_unread_label">
-    </item>
-    <item
-        android:id="@+id/add_to_queue_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/add_to_queue_label">
-    </item>
-    <item
-        android:id="@+id/remove_from_queue_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/remove_from_queue_label">
-    </item>
-    <item
-        android:id="@+id/share_link_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
-    </item>
-    <item
-        android:id="@+id/visit_website_item"
-        android:icon="?attr/location_web_site"
-        custom:showAsAction="ifRoom|collapseActionView"
-        android:title="@string/visit_website_label">
-    </item>
-    <item
-        android:id="@+id/support_item"
-        custom:showAsAction="collapseActionView"
-        android:title="@string/support_label">
-    </item>
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
new file mode 100644
index 000000000..bcffd019a
--- /dev/null
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@id/skip_episode_item"
+        android:title="@string/skip_episode_label"
+        custom:showAsAction="collapseActionView">
+    </item>
+
+    <item
+        android:id="@+id/mark_read_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/mark_read_label">
+    </item>
+    <item
+        android:id="@+id/mark_unread_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/mark_unread_label">
+    </item>
+
+    <item
+        android:id="@+id/add_to_queue_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/add_to_queue_label">
+    </item>
+    <item
+        android:id="@+id/remove_from_queue_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/remove_from_queue_label">
+    </item>
+
+    <item
+        android:id="@+id/share_link_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/share_link_label">
+    </item>
+    <item
+        android:id="@+id/visit_website_item"
+        android:icon="?attr/location_web_site"
+        custom:showAsAction="ifRoom|collapseActionView"
+        android:title="@string/visit_website_label">
+    </item>
+    <item
+        android:id="@+id/support_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/support_label">
+    </item>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
new file mode 100644
index 000000000..69b2c6a7a
--- /dev/null
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/mark_read_item"
+        android:menuCategory="container"
+        android:title="@string/mark_read_label" />
+    <item
+        android:id="@+id/mark_unread_item"
+        android:menuCategory="container"
+        android:title="@string/mark_unread_label" />
+
+    <item
+        android:id="@+id/add_to_queue_item"
+        android:menuCategory="container"
+        android:title="@string/add_to_queue_label" />
+    <item
+        android:id="@+id/remove_from_queue_item"
+        android:menuCategory="container"
+        android:title="@string/remove_from_queue_label" />
+
+    <item
+        android:id="@+id/reset_position"
+        android:menuCategory="container"
+        android:title="@string/reset_position" />
+
+    <item
+        android:id="@+id/activate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/activate_auto_download" />
+    <item
+        android:id="@+id/deactivate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/deactivate_auto_download" />
+
+    <item
+        android:id="@+id/share_link_item"
+        android:menuCategory="container"
+        android:title="@string/share_link_label" />
+    <item
+        android:id="@+id/visit_website_item"
+        android:menuCategory="container"
+        android:title="@string/visit_website_label" />
+
+    <item
+        android:id="@+id/support_item"
+        android:menuCategory="container"
+        android:title="@string/support_label" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index b1589af3b..7c9f8f928 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -13,15 +13,30 @@
         android:title="@string/mark_read_label" />
 
     <item
-        android:id="@+id/reset_attributes"
+        android:id="@+id/mark_unread_item_item"
         android:menuCategory="container"
-        android:title="@string/reset_attributes" />
+        android:title="@string/mark_unread_label" />
 
     <item
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
 
+    <item
+        android:id="@+id/reset_position"
+        android:menuCategory="container"
+        android:title="@string/reset_position" />
+
+    <item
+        android:id="@+id/activate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/activate_auto_download" />
+
+    <item
+        android:id="@+id/deactivate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/deactivate_auto_download" />
+
     <item
         android:id="@+id/move_to_bottom_item"
         android:menuCategory="container"
-- 
cgit v1.2.3


From 298b02b0aa20314187715aa9787d59e4292a0c64 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 11 May 2015 19:58:06 +0200
Subject: Fix for indicator, changes in context menus

---
 app/src/main/res/menu/allepisodes_context.xml  | 56 ++++++++++++++++++++++++++
 app/src/main/res/menu/feeditem_options.xml     | 17 ++++++++
 app/src/main/res/menu/feeditemlist_context.xml |  5 +++
 app/src/main/res/menu/queue_context.xml        | 21 ++++++++--
 4 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/menu/allepisodes_context.xml

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

diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
new file mode 100644
index 000000000..f89ad5065
--- /dev/null
+++ b/app/src/main/res/menu/allepisodes_context.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@id/skip_episode_item"
+        android:menuCategory="container"
+        android:title="@string/skip_episode_label" />
+
+    <item
+        android:id="@+id/mark_read_item"
+        android:menuCategory="container"
+        android:title="@string/mark_read_label" />
+    <item
+        android:id="@+id/mark_unread_item"
+        android:menuCategory="container"
+        android:title="@string/mark_unread_label" />
+
+    <item
+        android:id="@+id/add_to_queue_item"
+        android:menuCategory="container"
+        android:title="@string/add_to_queue_label" />
+    <item
+        android:id="@+id/remove_from_queue_item"
+        android:menuCategory="container"
+        android:title="@string/remove_from_queue_label" />
+
+    <item
+        android:id="@+id/reset_position"
+        android:menuCategory="container"
+        android:title="@string/reset_position" />
+
+    <item
+        android:id="@+id/activate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/activate_auto_download" />
+    <item
+        android:id="@+id/deactivate_auto_download"
+        android:menuCategory="container"
+        android:title="@string/deactivate_auto_download" />
+
+    <item
+        android:id="@+id/share_link_item"
+        android:menuCategory="container"
+        android:title="@string/share_link_label" />
+    <item
+        android:id="@+id/visit_website_item"
+        android:menuCategory="container"
+        android:title="@string/visit_website_label" />
+
+    <item
+        android:id="@+id/support_item"
+        android:menuCategory="container"
+        android:title="@string/support_label" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index bcffd019a..f8e9b9c75 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -30,6 +30,23 @@
         android:title="@string/remove_from_queue_label">
     </item>
 
+    <item
+        android:id="@+id/reset_position"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/reset_position">
+    </item>
+
+    <item
+        android:id="@+id/activate_auto_download"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/activate_auto_download">
+    </item>
+    <item
+        android:id="@+id/deactivate_auto_download"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/deactivate_auto_download">
+    </item>
+
     <item
         android:id="@+id/share_link_item"
         custom:showAsAction="collapseActionView"
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index 69b2c6a7a..f89ad5065 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -2,6 +2,11 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@id/skip_episode_item"
+        android:menuCategory="container"
+        android:title="@string/skip_episode_label" />
+
     <item
         android:id="@+id/mark_read_item"
         android:menuCategory="container"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 7c9f8f928..6ab2daabf 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -7,13 +7,18 @@
         android:menuCategory="container"
         android:title="@string/move_to_top_label" />
 
+    <item
+        android:id="@+id/move_to_bottom_item"
+        android:menuCategory="container"
+        android:title="@string/move_to_bottom_label" />
+
     <item
         android:id="@+id/mark_read_item"
         android:menuCategory="container"
         android:title="@string/mark_read_label" />
 
     <item
-        android:id="@+id/mark_unread_item_item"
+        android:id="@+id/mark_unread_item"
         android:menuCategory="container"
         android:title="@string/mark_unread_label" />
 
@@ -38,8 +43,18 @@
         android:title="@string/deactivate_auto_download" />
 
     <item
-        android:id="@+id/move_to_bottom_item"
+        android:id="@+id/share_link_item"
         android:menuCategory="container"
-        android:title="@string/move_to_bottom_label" />
+        android:title="@string/share_link_label" />
+    <item
+        android:id="@+id/visit_website_item"
+        android:menuCategory="container"
+        android:title="@string/visit_website_label" />
+
+    <item
+        android:id="@+id/support_item"
+        android:menuCategory="container"
+        android:title="@string/support_label" />
+
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 7aafe23b6b7eaddffedeb3f5539a5cfeb0f3e2f8 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Thu, 21 May 2015 18:45:39 -0400
Subject: restored alignment for progress bar in episode view. fixes
 AntennaPod/AntennaPod#822

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

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

diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index b738cf836..bf0d54b7e 100644
--- a/app/src/main/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
@@ -99,8 +99,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
-                android:layout_toLeftOf="@id/txtvPublished"
-                android:layout_toRightOf="@id/txtvDuration"
+                android:layout_alignParentLeft="true"
+                android:layout_toLeftOf="@id/imgvInPlaylist"
                 android:max="100" />
 
         </RelativeLayout>
-- 
cgit v1.2.3


From ec156b4016b6323e817db0312a2f55d510262c71 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 22 May 2015 16:21:21 -0400
Subject: now display the download bar under the other windows

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

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

diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index bf0d54b7e..18b7eaf07 100644
--- a/app/src/main/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
@@ -43,7 +43,7 @@
         <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_alignParentLeft="true"
             android:layout_alignParentTop="true"
@@ -55,10 +55,10 @@
             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"
             tools:background="@android:color/holo_red_light" >
 
             <TextView
@@ -67,6 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:layout_marginBottom="0dp"
                 tools:text="00:42:23"
                 tools:background="@android:color/holo_blue_dark" />
 
@@ -76,6 +77,7 @@
                 android:layout_height="@dimen/enc_icons_size"
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="8dp"
+                android:layout_marginBottom="0dp"
                 android:contentDescription="@string/in_queue_label"
                 android:src="?attr/stat_playlist"
                 tools:src="@drawable/ic_list_grey600_24dp"
@@ -88,6 +90,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_toLeftOf="@id/imgvInPlaylist"
+                android:layout_marginBottom="0dp"
                 android:ellipsize="end"
                 tools:text="Jan 23"
                 tools:background="@android:color/holo_green_dark" />
@@ -95,12 +98,10 @@
             <ProgressBar
                 android:id="@+id/pbar_download_progress"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@id/imgvInPlaylist"
+                android:layout_below="@id/txtvDuration"
+                android:layout_marginTop="-2dp"
                 android:max="100" />
 
         </RelativeLayout>
-- 
cgit v1.2.3


From d8b6943f5dccd3a7fe3f6e884ca77a34b92981b7 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 22 May 2015 16:57:43 -0400
Subject: removed unneeded layout margins

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

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

diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index 18b7eaf07..96842c052 100644
--- a/app/src/main/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
@@ -67,7 +67,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:layout_marginBottom="0dp"
                 tools:text="00:42:23"
                 tools:background="@android:color/holo_blue_dark" />
 
@@ -77,7 +76,6 @@
                 android:layout_height="@dimen/enc_icons_size"
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="8dp"
-                android:layout_marginBottom="0dp"
                 android:contentDescription="@string/in_queue_label"
                 android:src="?attr/stat_playlist"
                 tools:src="@drawable/ic_list_grey600_24dp"
@@ -90,7 +88,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_toLeftOf="@id/imgvInPlaylist"
-                android:layout_marginBottom="0dp"
                 android:ellipsize="end"
                 tools:text="Jan 23"
                 tools:background="@android:color/holo_green_dark" />
-- 
cgit v1.2.3


From f28853b00dec8875c967ef89ecef9602049a67e7 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Fri, 22 May 2015 17:13:31 -0400
Subject: renamed download progress bar to just progress

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

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

diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml
index 96842c052..ff1318fc8 100644
--- a/app/src/main/res/layout/new_episodes_listitem.xml
+++ b/app/src/main/res/layout/new_episodes_listitem.xml
@@ -93,7 +93,7 @@
                 tools:background="@android:color/holo_green_dark" />
 
             <ProgressBar
-                android:id="@+id/pbar_download_progress"
+                android:id="@+id/pbar_progress"
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-- 
cgit v1.2.3


From 7add1854c835c66601498adbdb385a2ac07edca6 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Wed, 27 May 2015 19:34:40 -0400
Subject: put the LinearView in a ScrollView. fixes AntennaPod/AntennaPod#841

---
 app/src/main/res/layout/opml_import.xml | 164 ++++++++++++++++----------------
 1 file changed, 84 insertions(+), 80 deletions(-)

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

diff --git a/app/src/main/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml
index 5ece4f09f..2a67e7ee1 100644
--- a/app/src/main/res/layout/opml_import.xml
+++ b/app/src/main/res/layout/opml_import.xml
@@ -1,92 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+    <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="wrap_content"
-        style="@style/AntennaPod.TextView.Heading"
-        android:text="@string/txtvfeedurl_label"/>
+        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/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" />
+        <TextView
+            android:id="@+id/txtvHeadingExplanation1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/txtvfeedurl_label"/>
 
-    <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" />
+        <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" />
 
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_margin="16dp"
-        android:background="?android:attr/listDivider"/>
+        <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" />
 
-    <TextView
-        android:id="@+id/txtvHeadingExplanation2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/AntennaPod.TextView.Heading"
-        android:text="@string/txtvfeedurl_label"/>
+        <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/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" />
+        <TextView
+            android:id="@+id/txtvHeadingExplanation2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/txtvfeedurl_label"/>
 
-    <Button
-        android:id="@+id/butChooseFileFromExternal"
-        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_external_application" />
+        <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" />
 
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_margin="16dp"
-        android:background="?android:attr/listDivider"/>
+        <Button
+            android:id="@+id/butChooseFileFromExternal"
+            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_external_application" />
 
-    <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"/>
+        <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/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" />
+        <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
+    </LinearLayout>
+</ScrollView>
-- 
cgit v1.2.3


From ef518f3ec0a489d843da4af053767d9f59fa827f Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 28 May 2015 22:42:08 +0200
Subject: Handle failed refresh correctly, fix for nav drawer layout

---
 app/src/main/res/layout/nav_feedlistitem.xml | 41 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

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

diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 238beff88..b9958257c 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -5,6 +5,7 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/listitem_iconwithtext_height"
+                android:paddingRight="@dimen/listitem_threeline_verticalpadding"
                 tools:background="@android:color/darker_gray">
 
     <ImageView
@@ -23,31 +24,14 @@
         tools:src="@drawable/ic_stat_antenna_default"
         tools:background="@android:color/holo_green_dark"/>
 
-    <TextView
-        android:id="@+id/txtvTitle"
-        android:lines="1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:layout_centerVertical="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_navdrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginRight="@dimen/listitem_icon_rightpadding"
-        android:layout_toRightOf="@id/imgvCover"
-        tools:text="Navigation feed item title"
-        tools:background="@android:color/holo_green_dark"/>
-
     <TextView
         android:id="@+id/txtvCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/list_vertical_padding"
         android:lines="1"
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="@dimen/text_size_navdrawer"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         tools:text="23"
@@ -58,13 +42,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toLeftOf="@id/txtvCount"
+        android:layout_marginLeft="@dimen/list_vertical_padding"
+        android:layout_alignWithParentIfMissing="true"
         android:lines="1"
         android:text="{fa-exclamation-circle}"
         android:textColor="@color/download_failed_red"
         android:textSize="@dimen/text_size_navdrawer"
-        android:layout_marginLeft="8dp"
         android:layout_centerVertical="true"
         tools:text="!"
         tools:background="@android:color/holo_green_dark"/>
 
+    <TextView
+        android:id="@+id/txtvTitle"
+        android:lines="1"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:layout_centerVertical="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="@dimen/text_size_navdrawer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
+        android:layout_toRightOf="@id/imgvCover"
+        android:layout_toLeftOf="@id/itxtvFailure"
+        android:layout_alignWithParentIfMissing="true"
+        tools:text="Navigation feed item title"
+        tools:background="@android:color/holo_green_dark"/>
+
+
 </RelativeLayout>
-- 
cgit v1.2.3