diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-v14/addfeed.xml | 143 | ||||
| -rw-r--r-- | res/layout/addfeed.xml | 36 |
2 files changed, 10 insertions, 169 deletions
diff --git a/res/layout-v14/addfeed.xml b/res/layout-v14/addfeed.xml deleted file mode 100644 index 5760bea95..000000000 --- a/res/layout-v14/addfeed.xml +++ /dev/null @@ -1,143 +0,0 @@ -<?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"> - - <RelativeLayout - android:id="@+id/footer" - android:layout_width="fill_parent" - android:layout_height="48dp" - 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"/> - - <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> - - <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="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" - 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/txtvPodcastDirectories" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/etxtFeedurl" - android:layout_margin="8dp" - 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/butBrowseGpoddernet" - android:layout_margin="8dp" - android:text="@string/miro_guide_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: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/txtvOpmlImportExpl" - 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 diff --git a/res/layout/addfeed.xml b/res/layout/addfeed.xml index bb72a2be1..bb0842c0f 100644 --- a/res/layout/addfeed.xml +++ b/res/layout/addfeed.xml @@ -4,33 +4,9 @@ android:layout_height="fill_parent" android:orientation="vertical"> - <LinearLayout - android:id="@+id/footer" - style="@android:style/ButtonBar" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="horizontal"> - - <Button - android:id="@+id/butConfirm" - android:layout_width="0px" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/confirm_label"/> - - <Button - android:id="@+id/butCancel" - android:layout_width="0px" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel_label"/> - </LinearLayout> - <ScrollView android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_above="@id/footer" + android:layout_height="match_parent" android:layout_alignParentTop="true" android:scrollbars="vertical"> @@ -58,11 +34,19 @@ android:hint="@string/feedurl_label" android:inputType="textUri"/> + <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"/> + <TextView android:id="@+id/txtvPodcastDirectories" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/etxtFeedurl" + android:layout_below="@id/butConfirm" android:layout_margin="8dp" android:textSize="@dimen/text_size_large" android:textColor="@color/bright_blue" |