Merge branch 'develop' into develop

10 files changed, 123 insertions, 99 deletions

diff --git a/app/src/main/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml
index 06c2cce14..ba4249268 100644
--- a/app/src/main/res/layout-v14/time_dialog.xml
+++ b/app/src/main/res/layout-v14/time_dialog.xml
@@ -33,26 +33,34 @@
     </LinearLayout>
 
     <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/timer_about_to_expire_label"
+            android:textSize="16sp" />
+
+        <CheckBox
+            android:id="@+id/cbShakeToReset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/shake_to_reset_label" />
+
+        <CheckBox
+            android:id="@+id/cbVibrate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/timer_vibration_label" />
+
+        <CheckBox
+            android:id="@+id/chAutoEnable"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="16sp"
-                android:text="@string/timer_about_to_expire_label"/>
-
-            <CheckBox android:id="@+id/cbShakeToReset"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/shake_to_reset_label"/>
-
-            <CheckBox android:id="@+id/cbVibrate"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/timer_vibration_label"/>
+            android:text="@string/auto_enable_label" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index dff24c650..33951e060 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -7,18 +7,18 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="8dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="8dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:paddingBottom="8dp"
-        android:orientation="vertical">
+        android:paddingTop="8dp">
 
         <TextView
             android:id="@+id/txtvPodcastDirectories"
+            style="@style/AntennaPod.TextView.Heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/AntennaPod.TextView.Heading"
             android:text="@string/podcastdirectories_label"/>
 
         <TextView
@@ -26,83 +26,73 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/podcastdirectories_descr"
-            android:textSize="@dimen/text_size_medium"
-            android:layout_marginTop="4dp"/>
+            android:textSize="@dimen/text_size_medium"/>
 
         <Button
             android:id="@+id/butSearchItunes"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="4dp"
             android:text="@string/search_itunes_label"/>
 
         <Button
+            android:id="@+id/butSearchFyyd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/search_fyyd_label"/>
+
+        <Button
             android:id="@+id/butBrowseGpoddernet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:text="@string/browse_gpoddernet_label"/>
 
-        <View
-            android:id="@+id/divider1"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_margin="16dp"
-            android:background="?android:attr/listDivider"/>
+        <View style="@style/Divider"/>
 
         <TextView
             android:id="@+id/txtvFeedurl"
+            style="@style/AntennaPod.TextView.Heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/divider1"
-            style="@style/AntennaPod.TextView.Heading"
             android:text="@string/txtvfeedurl_label"/>
 
         <EditText
             android:id="@+id/etxtFeedurl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:hint="@string/etxtFeedurlHint"
-            android:inputType="textUri"
+            android:cursorVisible="true"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:cursorVisible="true"/>
+            android:hint="@string/etxtFeedurlHint"
+            android:inputType="textUri"/>
 
         <Button
             android:id="@+id/butConfirm"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:text="@string/confirm_label"/>
 
-        <View
-            android:id="@+id/divider2"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_margin="16dp"
-            android:background="?android:attr/listDivider"/>
+        <View style="@style/Divider"/>
 
         <TextView
             android:id="@+id/txtvOpmlImport"
+            style="@style/AntennaPod.TextView.Heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/AntennaPod.TextView.Heading"
             android:text="@string/opml_import_label"/>
 
         <TextView
             android:id="@+id/txtvOpmlImportExpl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/text_size_medium"
-            android:text="@string/opml_import_txtv_button_lable"/>
+            android:text="@string/opml_import_txtv_button_lable"
+            android:textSize="@dimen/text_size_medium"/>
 
         <Button
             android:id="@+id/butOpmlImport"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="4dp"
             android:text="@string/opml_import_label"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 9fcf9d9fc..7e72bb39b 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version='1.0' encoding='utf-8'?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_layout"
     android:layout_width="@dimen/drawer_width"
@@ -23,8 +21,6 @@
             android:id="@+id/imgvCover"
             android:layout_width="@dimen/thumbnail_length_navlist"
             android:layout_height="@dimen/thumbnail_length_navlist"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
             android:layout_marginTop="4dp"
@@ -34,8 +30,8 @@
             android:padding="8dp"
             android:scaleType="centerCrop"
             android:src="?attr/ic_settings"
-            tools:src="@android:drawable/sym_def_app_icon"
-            tools:background="@android:color/holo_orange_dark" />
+            tools:background="@android:color/holo_orange_dark"
+            tools:src="@android:drawable/sym_def_app_icon"></ImageView>
 
         <TextView
             android:layout_width="wrap_content"
@@ -47,16 +43,15 @@
             android:text="@string/settings_label"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/text_size_navdrawer"
-            tools:background="@android:color/holo_green_light"/>
-
+            tools:background="@android:color/holo_green_light" />
     </LinearLayout>
 
     <View
         android:id="@+id/divider"
         android:layout_width="@dimen/drawer_width"
         android:layout_height="1dp"
-        android:layout_centerVertical="true"
         android:layout_above="@id/nav_settings"
+        android:layout_centerVertical="true"
         android:background="?android:attr/listDivider"
         tools:background="@android:color/holo_red_dark" />
 
@@ -64,7 +59,6 @@
         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"
@@ -74,7 +68,6 @@
         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" />
-
+        tools:background="@android:color/holo_purple"
+        tools:listitem="@layout/nav_listitem"></ListView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml
index 19b9943e4..8f0539dfa 100644
--- a/app/src/main/res/layout/subscription_item.xml
+++ b/app/src/main/res/layout/subscription_item.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     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"
     android:orientation="horizontal">
@@ -10,31 +10,28 @@
         android:id="@+id/imgvCover"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_launcher" />
+        tools:src="@drawable/ic_launcher">
+    </de.danoeh.antennapod.view.SquareImageView>
 
     <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/txtvTitle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/light_gray"
         android:ellipsize="end"
         android:gravity="center"
-        android:background="@color/light_gray"
         tools:text="@string/app_name" />
 
     <jp.shts.android.library.TriangleLabelView
         android:id="@+id/triangleCountView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
+        android:layout_gravity="right|top"
         app:backgroundColor="@color/antennapod_blue"
         app:corner="rightTop"
         app:primaryText="Test"
         app:primaryTextColor="@color/white"
-        app:primaryTextSize="12sp"
-        android:layout_gravity="right|top"/>
-
+        app:primaryTextSize="12sp">
+    </jp.shts.android.library.TriangleLabelView>
 </FrameLayout>
diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index b270e82f7..0290ce708 100644
--- a/app/src/main/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
@@ -36,22 +36,30 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="16sp"
-                android:text="@string/timer_about_to_expire_label"/>
-
-            <CheckBox android:id="@+id/cbShakeToReset"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/shake_to_reset_label"/>
-
-            <CheckBox android:id="@+id/cbVibrate"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/timer_vibration_label"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/timer_about_to_expire_label"
+            android:textSize="16sp" />
+
+        <CheckBox
+            android:id="@+id/cbShakeToReset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/shake_to_reset_label" />
+
+        <CheckBox
+            android:id="@+id/cbVibrate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/timer_vibration_label" />
+
+        <CheckBox
+            android:id="@+id/chAutoEnable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/auto_enable_label" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml
index 3df88046d..c3f117386 100644
--- a/app/src/main/res/menu/episodes_apply_action_options.xml
+++ b/app/src/main/res/menu/episodes_apply_action_options.xml
@@ -46,6 +46,8 @@
                 android:title="@string/queued_label"/>
             <item android:id="@+id/check_not_queued"
                 android:title="@string/not_queued_label"/>
+            <item android:id="@+id/check_has_media"
+                android:title="@string/has_media"/>
         </menu>
     </item>
 
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index ed03c08d6..0646dc70f 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -66,6 +66,12 @@
     </item>
 
     <item
+        android:id="@+id/rename_item"
+        android:menuCategory="container"
+        android:title="@string/rename_feed_label"
+        custom:showAsAction="never" />
+
+    <item
         android:id="@+id/remove_item"
         android:icon="?attr/content_discard"
         android:menuCategory="container"
diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml
index 4bf067d25..4da40441f 100644
--- a/app/src/main/res/menu/nav_feed_context.xml
+++ b/app/src/main/res/menu/nav_feed_context.xml
@@ -12,6 +12,11 @@
         android:title="@string/mark_all_read_label" />
 
     <item
+        android:id="@+id/rename_item"
+        android:menuCategory="container"
+        android:title="@string/rename_feed_label" />
+
+    <item
         android:id="@+id/remove_item"
         android:menuCategory="container"
         android:title="@string/remove_feed_label" />
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
deleted file mode 100644
index 0a6a3c9fb..000000000
--- a/app/src/main/res/xml/automotive_app_desc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<automotiveApp>
-    <uses name="media"/>
-</automotiveApp>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2aa736cb2..0f1175ca3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -118,6 +118,12 @@
             android:summary="@string/pref_rewind_sum"
             android:title="@string/pref_rewind" />
         <de.danoeh.antennapod.preferences.SwitchCompatPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefHardwarePreviousButtonRestarts"
+            android:summary="@string/pref_hardwarePreviousButtonRestarts_sum"
+            android:title="@string/pref_hardwarePreviousButtonRestarts_title"/>
+        <de.danoeh.antennapod.preferences.SwitchCompatPreference
             android:defaultValue="true"
             android:enabled="true"
             android:key="prefFollowQueue"
@@ -162,6 +168,12 @@
 
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref">
+        <de.danoeh.antennapod.preferences.SwitchCompatPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="prefEnqueueDownloaded"
+            android:summary="@string/pref_enqueue_downloaded_summary"
+            android:title="@string/pref_enqueue_downloaded_title" />
         <Preference
             android:key="prefAutoUpdateIntervall"
             android:summary="@string/pref_autoUpdateIntervallOrTime_sum"
@@ -254,8 +266,12 @@
                 android:summary="@string/pref_gpodnet_setlogin_information_sum"/>
             <Preference
                 android:key="pref_gpodnet_sync"
-                android:title="@string/pref_gpodnet_sync_title"
-                android:summary="@string/pref_gpodnet_sync_sum"/>
+                android:title="@string/pref_gpodnet_sync_changes_title"
+                android:summary="@string/pref_gpodnet_sync_changes_sum"/>
+            <Preference
+                android:key="pref_gpodnet_force_full_sync"
+                android:title="@string/pref_gpodnet_full_sync_title"
+                android:summary="@string/pref_gpodnet_full_sync_sum"/>
             <Preference
                 android:key="pref_gpodnet_logout"
                 android:title="@string/pref_gpodnet_logout_title"/>
@@ -286,6 +302,9 @@
             android:key="prefOpmlExport"
             android:title="@string/opml_export_label"/>
         <Preference
+            android:key="prefHtmlExport"
+            android:title="@string/html_export_label"/>
+        <Preference
             android:key="statistics"
             android:title="@string/statistics_label"/>
     </PreferenceCategory>