From 680c9db075ffb2afafed936dc23a5562db0a7b63 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Mon, 30 Mar 2015 12:18:16 +0200
Subject: "Add feed" facelift, OPML import with better explanations and usage
 of external apps

---
 app/src/main/res/layout/addfeed.xml     | 180 ++++++++++++++++----------------
 app/src/main/res/layout/opml_import.xml |  80 ++++++++++++--
 2 files changed, 160 insertions(+), 100 deletions(-)

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

diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index a740d88cf..b7babbafa 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -1,107 +1,107 @@
 <?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">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="vertical">
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical">
+        android:paddingTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical">
 
-        <RelativeLayout
+        <TextView
+            android:id="@+id/txtvFeedurl"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/txtvfeedurl_label"/>
 
-            <TextView
-                android:id="@+id/txtvFeedurl"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_margin="16dp"
-                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"/>
 
-            <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/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"/>
 
-            <Button
-                android:id="@+id/butConfirm"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/etxtFeedurl"
-                android:layout_margin="8dp"
-                android:text="@string/confirm_label"/>
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="16dp"
+            android:background="?android:attr/listDivider"/>
 
-            <TextView
-                android:id="@+id/txtvPodcastDirectories"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butConfirm"
-                android:layout_margin="8dp"
-                style="@style/AntennaPod.TextView.Heading"
-                android:text="@string/podcastdirectories_label"/>
+        <TextView
+            android:id="@+id/txtvPodcastDirectories"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/divider1"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/podcastdirectories_label"/>
 
-            <TextView
-                android:id="@+id/txtvPodcastDirectoriesDescr"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/podcastdirectories_descr"
-                android:textSize="@dimen/text_size_medium"
-                android:layout_below="@id/txtvPodcastDirectories"
-                android:layout_margin="8dp"/>
+        <TextView
+            android:id="@+id/txtvPodcastDirectoriesDescr"
+            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"/>
 
-            <Button
-                android:id="@+id/butBrowseGpoddernet"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txtvPodcastDirectoriesDescr"
-                android:layout_margin="8dp"
-                android:text="@string/browse_gpoddernet_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"/>
 
-            <Button
-                android:id="@+id/butSearchItunes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butBrowseGpoddernet"
-                android:layout_margin="8dp"
-                android:text="@string/search_itunes_label"/>
+        <Button
+            android:id="@+id/butSearchItunes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/search_itunes_label"/>
 
-            <TextView
-                android:id="@+id/txtvOpmlImport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/butSearchItunes"
-                android:layout_margin="8dp"
-                style="@style/AntennaPod.TextView.Heading"
-                android:text="@string/opml_import_label"/>
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="16dp"
+            android:background="?android:attr/listDivider"/>
+
+        <TextView
+            android:id="@+id/txtvOpmlImport"
+            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_below="@id/txtvOpmlImport"
-                android:layout_margin="8dp"
-                android:textSize="@dimen/text_size_medium"
-                android:text="@string/opml_import_txtv_button_lable"/>
+        <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"/>
+
+        <Button
+            android:id="@+id/butOpmlImport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/opml_import_label"/>
 
-            <Button
-                android:id="@+id/butOpmlImport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/txtvOpmlImportExpl"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/opml_import_label"/>
-        </RelativeLayout>
-    </ScrollView>
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml
index 3e45a0400..5ece4f09f 100644
--- a/app/src/main/res/layout/opml_import.xml
+++ b/app/src/main/res/layout/opml_import.xml
@@ -1,32 +1,92 @@
 <?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="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"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/opml_import_explanation"
+        style="@style/AntennaPod.TextView.Heading"
+        android:text="@string/txtvfeedurl_label"/>
+
+    <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" />
 
+    <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" />
+
+    <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/txtvPath"
+        android:id="@+id/txtvHeadingExplanation2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        tools:text="Path"
+        style="@style/AntennaPod.TextView.Heading"
+        android:text="@string/txtvfeedurl_label"/>
+
+    <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" />
 
     <Button
-        android:id="@+id/butStartImport"
-        android:layout_width="wrap_content"
+        android:id="@+id/butChooseFileFromExternal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="8dp"
-        android:text="@string/start_import_label" />
+        android:layout_marginTop="8dp"
+        android:text="@string/choose_file_from_external_application" />
+
+    <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/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
-- 
cgit v1.2.3