Merge pull request #2170 from mfietz/feature/fyyd

Integrate fyyd podcast search engine

1 files changed, 23 insertions, 33 deletions

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>