diff options
Diffstat (limited to 'app/src/main/res/layout')
8 files changed, 149 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/activity_home_screen.xml b/app/src/main/res/layout/activity_home_screen.xml new file mode 100755 index 0000000..f6fcc0c --- /dev/null +++ b/app/src/main/res/layout/activity_home_screen.xml @@ -0,0 +1,24 @@ +<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout"
+ android:layout_width="match_parent" android:layout_height="match_parent"
+ tools:context="org.rssin.android.HomeScreenActivity">
+
+ <!-- As the main content view, the view below consumes the entire
+ space available using match_parent in both dimensions. -->
+ <FrameLayout android:id="@+id/container" android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <!-- android:layout_gravity="start" tells DrawerLayout to treat
+ this as a sliding drawer on the left side for left-to-right
+ languages and on the right side for right-to-left languages.
+ If you're not building against API 17 or higher, use
+ android:layout_gravity="left" instead. -->
+ <!-- The drawer is given a fixed width in dp and extends the full height of
+ the container. -->
+ <fragment android:id="@+id/navigation_drawer"
+ android:layout_width="@dimen/navigation_drawer_width" android:layout_height="match_parent"
+ android:layout_gravity="start" android:name="org.rssin.android.NavigationDrawerFragment"
+ tools:layout="@layout/fragment_navigation_drawer" />
+
+</android.support.v4.widget.DrawerLayout>
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/fragment_home_screen.xml b/app/src/main/res/layout/fragment_home_screen.xml new file mode 100755 index 0000000..a502805 --- /dev/null +++ b/app/src/main/res/layout/fragment_home_screen.xml @@ -0,0 +1,15 @@ +<RelativeLayout 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:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context="org.rssin.android.HomeScreenActivity$PlaceholderFragment">
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/unified_inbox_feeditems"
+ android:scrollbars="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml new file mode 100755 index 0000000..6b9ec1d --- /dev/null +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -0,0 +1,7 @@ +<ListView 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:choiceMode="singleChoice"
+ android:divider="@android:color/transparent" android:dividerHeight="0dp"
+ android:background="#cccc" tools:context="org.rssin.android.NavigationDrawerFragment" />
\ 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 diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml new file mode 100755 index 0000000..32a8837 --- /dev/null +++ b/app/src/main/res/layout/item_navigation_drawer.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/itemLayout"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:orientation="vertical"
+
+ android:layout_marginTop="0dp"
+ android:background="?android:attr/activatedBackgroundIndicator"
+ >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="55dp"
+ >
+
+ <TextView
+ android:id="@+id/item_navigation_drawer_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml new file mode 100755 index 0000000..856093c --- /dev/null +++ b/app/src/main/res/layout/separator_navigation_drawer.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/itemLayout"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_alignParentLeft="true"
+android:orientation="vertical"
+android:layout_marginTop="0dp"
+android:background="?android:attr/activatedBackgroundIndicator"
+ >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="35dp"
+ >
+
+ <TextView
+ android:id="@+id/separator_navigation_drawer_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="4dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ />
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginTop="1dp"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp"
+ android:background="#DADADC"
+
+ ></View>
+
+</LinearLayout>
\ No newline at end of file |