Merge pull request #842 from TomHennen/fix_841

Let Opml import scroll on smaller screens
This commit is contained in:
Tom Hennen 2015-05-27 19:39:30 -04:00
commit 12f9d29daa
1 changed files with 84 additions and 80 deletions

View File

@ -1,92 +1,96 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools" android:layout_height="match_parent">
android:layout_width="match_parent" <LinearLayout
android:layout_height="match_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
style="@style/AntennaPod.TextView.Heading" android:orientation="vertical"
android:text="@string/txtvfeedurl_label"/> android:paddingTop="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
tools:background="@android:color/darker_gray">
<TextView <TextView
android:id="@+id/txtvExplanation1" android:id="@+id/txtvHeadingExplanation1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/opml_import_explanation_1" style="@style/AntennaPod.TextView.Heading"
android:textSize="@dimen/text_size_medium" android:text="@string/txtvfeedurl_label"/>
android:layout_marginTop="4dp"
tools:background="@android:color/holo_green_dark" />
<Button <TextView
android:id="@+id/butChooseFileFromFilesystem" android:id="@+id/txtvExplanation1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:text="@string/opml_import_explanation_1"
android:layout_marginTop="8dp" android:textSize="@dimen/text_size_medium"
android:text="@string/choose_file_from_filesystem" /> android:layout_marginTop="4dp"
tools:background="@android:color/holo_green_dark" />
<View <Button
android:id="@+id/divider1" android:id="@+id/butChooseFileFromFilesystem"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_gravity="center_horizontal"
android:background="?android:attr/listDivider"/> android:layout_marginTop="8dp"
android:text="@string/choose_file_from_filesystem" />
<TextView <View
android:id="@+id/txtvHeadingExplanation2" android:id="@+id/divider1"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
style="@style/AntennaPod.TextView.Heading" android:layout_margin="16dp"
android:text="@string/txtvfeedurl_label"/> android:background="?android:attr/listDivider"/>
<TextView <TextView
android:id="@+id/txtvExplanation2" android:id="@+id/txtvHeadingExplanation2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/opml_import_explanation_2" style="@style/AntennaPod.TextView.Heading"
android:textSize="@dimen/text_size_medium" android:text="@string/txtvfeedurl_label"/>
android:layout_marginTop="4dp"
tools:background="@android:color/holo_green_dark" />
<Button <TextView
android:id="@+id/butChooseFileFromExternal" android:id="@+id/txtvExplanation2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:text="@string/opml_import_explanation_2"
android:layout_marginTop="8dp" android:textSize="@dimen/text_size_medium"
android:text="@string/choose_file_from_external_application" /> android:layout_marginTop="4dp"
tools:background="@android:color/holo_green_dark" />
<View <Button
android:id="@+id/divider2" android:id="@+id/butChooseFileFromExternal"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_gravity="center_horizontal"
android:background="?android:attr/listDivider"/> android:layout_marginTop="8dp"
android:text="@string/choose_file_from_external_application" />
<TextView <View
android:id="@+id/txtvHeadingExplanation3" android:id="@+id/divider2"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
style="@style/AntennaPod.TextView.Heading" android:layout_margin="16dp"
android:text="@string/txtvfeedurl_label"/> android:background="?android:attr/listDivider"/>
<TextView <TextView
android:id="@+id/txtvExplanation3" android:id="@+id/txtvHeadingExplanation3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/opml_import_explanation_3" style="@style/AntennaPod.TextView.Heading"
android:textSize="@dimen/text_size_medium" android:text="@string/txtvfeedurl_label"/>
android:layout_marginTop="4dp"
tools:background="@android:color/holo_green_dark" />
</LinearLayout> <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>
</ScrollView>