Merge branch 'move-to-top' of git://github.com/TomHennen/AntennaPod into TomHennen-move-to-top

2 files changed, 128 insertions, 22 deletions

diff --git a/res/layout-v14/addfeed.xml b/res/layout-v14/addfeed.xml
index 14d3a2a67..5760bea95 100644
--- a/res/layout-v14/addfeed.xml
+++ b/res/layout-v14/addfeed.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/footer"
         android:layout_width="fill_parent"
         android:layout_height="48dp"
-        android:layout_alignParentBottom="true" >
+        android:focusableInTouchMode="true"
+        android:layout_alignParentBottom="true">
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
             android:layout_alignParentTop="true"
-            android:background="?android:attr/dividerVertical" />
+            android:background="?android:attr/dividerVertical"/>
 
         <View
             android:id="@+id/horizontal_divider"
@@ -24,7 +25,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="4dp"
             android:layout_marginTop="4dp"
-            android:background="?android:attr/dividerVertical" />
+            android:background="?android:attr/dividerVertical"/>
 
         <Button
             android:id="@+id/butCancel"
@@ -35,7 +36,7 @@
             android:layout_alignParentTop="true"
             android:layout_toLeftOf="@id/horizontal_divider"
             android:background="?android:attr/selectableItemBackground"
-            android:text="@string/cancel_label" />
+            android:text="@string/cancel_label"/>
 
         <Button
             android:id="@+id/butConfirm"
@@ -46,7 +47,7 @@
             android:layout_alignParentTop="true"
             android:layout_toRightOf="@id/horizontal_divider"
             android:background="?android:attr/selectableItemBackground"
-            android:text="@string/confirm_label" />
+            android:text="@string/confirm_label"/>
     </RelativeLayout>
 
     <ScrollView
@@ -54,21 +55,22 @@
         android:layout_height="0dp"
         android:layout_above="@id/footer"
         android:layout_alignParentTop="true"
-        android:scrollbars="vertical" >
+        android:scrollbars="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content">
 
             <TextView
                 android:id="@+id/txtvFeedurl"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
-                android:layout_margin="8dp"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:text="@string/txtvfeedurl_label" />
+                android:layout_margin="16dp"
+                android:textSize="@dimen/text_size_large"
+                android:textColor="@color/bright_blue"
+                android:textStyle="italic"
+                android:text="@string/txtvfeedurl_label"/>
 
             <EditText
                 android:id="@+id/etxtFeedurl"
@@ -77,23 +79,35 @@
                 android:layout_below="@id/txtvFeedurl"
                 android:layout_margin="8dp"
                 android:hint="@string/feedurl_label"
-                android:inputType="textUri" />
+                android:inputType="textUri"/>
 
             <TextView
-                android:id="@+id/txtvBrowseMiroguide"
+                android:id="@+id/txtvPodcastDirectories"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/etxtFeedurl"
                 android:layout_margin="8dp"
-                android:text="@string/txtv_browse_miroguide_label" />
+                android:textSize="@dimen/text_size_large"
+                android:textColor="@color/bright_blue"
+                android:textStyle="italic"
+                android:text="@string/podcastdirectories_label"/>
+
+            <Button
+                android:id="@+id/butBrowseGpoddernet"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvPodcastDirectories"
+                android:layout_margin="8dp"
+                android:text="@string/gpodnet_main_label"/>
 
             <Button
                 android:id="@+id/butBrowseMiroguide"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/txtvBrowseMiroguide"
+                android:layout_below="@id/butBrowseGpoddernet"
                 android:layout_margin="8dp"
-                android:text="@string/browse_miroguide_label" />
+                android:text="@string/miro_guide_label"/>
+
 
             <TextView
                 android:id="@+id/txtvOpmlImport"
@@ -101,17 +115,28 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/butBrowseMiroguide"
                 android:layout_margin="8dp"
-                android:text="@string/opml_import_txtv_button_lable" />
+                android:textSize="@dimen/text_size_large"
+                android:textColor="@color/bright_blue"
+                android:textStyle="italic"
+                android:text="@string/opml_import_label"/>
+
+            <TextView
+                android:id="@+id/txtvOpmlImportExpl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvOpmlImport"
+                android:layout_margin="8dp"
+                android:text="@string/opml_import_txtv_button_lable"/>
 
             <Button
                 android:id="@+id/butOpmlImport"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/txtvOpmlImport"
+                android:layout_below="@id/txtvOpmlImportExpl"
                 android:layout_marginBottom="8dp"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
-                android:text="@string/opml_import_label" />
+                android:text="@string/opml_import_label"/>
         </RelativeLayout>
     </ScrollView>
 
diff --git a/res/layout-v14/authentication_dialog.xml b/res/layout-v14/authentication_dialog.xml
new file mode 100644
index 000000000..ed05dab1c
--- /dev/null
+++ b/res/layout-v14/authentication_dialog.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <EditText
+            android:id="@+id/etxtUsername"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_margin="16dp"
+            android:hint="@string/username_label"/>
+
+        <EditText
+            android:id="@+id/etxtPassword"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_margin="16dp"
+            android:inputType="textPassword"
+            android:hint="@string/password_label"/>
+
+        <CheckBox
+            android:id="@+id/chkSaveUsernamePassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:text="@string/save_username_password_label"/>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/footer"
+        android:layout_width="fill_parent"
+        android:layout_height="48dp" >
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_alignParentTop="true"
+            android:background="?android:attr/dividerVertical" />
+
+        <View
+            android:id="@+id/horizontal_divider"
+            android:layout_width="1dip"
+            android:layout_height="fill_parent"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:background="?android:attr/dividerVertical" />
+
+        <Button
+            android:id="@+id/butCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@id/horizontal_divider"
+            android:background="?android:attr/selectableItemBackground"
+            android:text="@string/cancel_label" />
+
+        <Button
+            android:id="@+id/butConfirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/horizontal_divider"
+            android:background="?android:attr/selectableItemBackground"
+            android:text="@string/confirm_label" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file