diff options
Diffstat (limited to 'app/src/main/res/layout')
3 files changed, 35 insertions, 55 deletions
diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml index 6ee5331..f0a773c 100644 --- a/app/src/main/res/layout/activity_filter_settings.xml +++ b/app/src/main/res/layout/activity_filter_settings.xml @@ -4,10 +4,7 @@ tools:context="org.rssin.android.FilterSettingsActivity" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="0dp" - android:paddingRight="0dp" - android:paddingTop="0dp" - android:paddingBottom="0dp" + android:padding="0dp" android:orientation="vertical"> <LinearLayout @@ -16,23 +13,24 @@ android:orientation="horizontal"> <EditText - android:id="@+id/filter_settings_add_keyword" + android:id="@+id/filter_settings_add_feed" android:layout_width="0dip" android:layout_weight="1" android:layout_height="wrap_content" - android:maxLines="1"/> + android:maxLines="1" + android:inputType="textUri"/> <Button + android:id="@+id/filter_settings_add_feed_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/filter_settings_add_keyword" - android:onClick="addKeyword"/> + android:text="@string/filter_settings_add_feed"/> </LinearLayout> <ListView android:id="@+id/filter_settings_feeds_list" android:layout_width="match_parent" - android:layout_height="match_parent"></ListView> + android:layout_height="match_parent"/> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_filter_settings_feeds.xml b/app/src/main/res/layout/fragment_filter_settings_feeds.xml deleted file mode 100644 index 9c1e1f4..0000000 --- a/app/src/main/res/layout/fragment_filter_settings_feeds.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/filter_settings_add_feed" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:maxLines="1" - android:inputType="textUri"/> - - <Button - android:id="@+id/filter_settings_add_feed_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/filter_settings_add_feed"/> - - </LinearLayout> - - <ListView - android:id="@+id/filter_settings_feeds_list" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_settings_feed.xml b/app/src/main/res/layout/item_filter_settings_feed.xml index 4f027eb..e7e5196 100644 --- a/app/src/main/res/layout/item_filter_settings_feed.xml +++ b/app/src/main/res/layout/item_filter_settings_feed.xml @@ -1,20 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/filter_settings_feed_item" - android:orientation="vertical" + android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:padding="10dp"> + android:padding="@dimen/listview_item_padding"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> - <TextView android:id="@+id/filter_settings_feed_item_title" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:textSize="@dimen/font_size_large"/> + <TextView android:id="@+id/filter_settings_feed_item_title" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:textSize="@dimen/font_size_large"/> - <TextView android:id="@+id/filter_settings_feed_item_url" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:textSize="@dimen/font_size_normal"/> + <TextView android:id="@+id/filter_settings_feed_item_url" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:textSize="@dimen/font_size_normal"/> -</LinearLayout>
\ No newline at end of file + </LinearLayout> + + <CheckBox + android:id="@+id/filter_settings_feed_item_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:focusable="false" + android:clickable="false" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + +</RelativeLayout>
\ No newline at end of file |