From c0421458751188a284975edaffffc90dc933c10f Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Wed, 3 Oct 2012 15:54:50 +0200
Subject: Moved Opml import button to AddfeedActivity, Opml export button to
 preferences

---
 res/layout-v14/addfeed.xml | 101 +++++++++++++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 35 deletions(-)

(limited to 'res/layout-v14/addfeed.xml')

diff --git a/res/layout-v14/addfeed.xml b/res/layout-v14/addfeed.xml
index fb96cd792..14d3a2a67 100644
--- a/res/layout-v14/addfeed.xml
+++ b/res/layout-v14/addfeed.xml
@@ -4,41 +4,6 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <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" />
-
-    <EditText
-        android:id="@+id/etxtFeedurl"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txtvFeedurl"
-        android:layout_margin="8dp"
-        android:hint="@string/feedurl_label"
-        android:inputType="textUri" />
-
-    <TextView
-        android:id="@+id/txtvBrowseMiroguide"
-        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" />
-
-    <Button
-        android:id="@+id/butBrowseMiroguide"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txtvBrowseMiroguide"
-        android:layout_margin="8dp"
-        android:text="@string/browse_miroguide_label" />
-
     <RelativeLayout
         android:id="@+id/footer"
         android:layout_width="fill_parent"
@@ -84,4 +49,70 @@
             android:text="@string/confirm_label" />
     </RelativeLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_above="@id/footer"
+        android:layout_alignParentTop="true"
+        android:scrollbars="vertical" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            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" />
+
+            <EditText
+                android:id="@+id/etxtFeedurl"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvFeedurl"
+                android:layout_margin="8dp"
+                android:hint="@string/feedurl_label"
+                android:inputType="textUri" />
+
+            <TextView
+                android:id="@+id/txtvBrowseMiroguide"
+                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" />
+
+            <Button
+                android:id="@+id/butBrowseMiroguide"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvBrowseMiroguide"
+                android:layout_margin="8dp"
+                android:text="@string/browse_miroguide_label" />
+
+            <TextView
+                android:id="@+id/txtvOpmlImport"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/butBrowseMiroguide"
+                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_marginBottom="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:text="@string/opml_import_label" />
+        </RelativeLayout>
+    </ScrollView>
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3