diff options
author | Andrew Dolgov <[email protected]> | 2014-10-31 14:11:47 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-10-31 14:11:47 +0300 |
commit | acdcf759a028d36d1af09639619410e392baf14c (patch) | |
tree | ebdc430fd7a4b904030811d7205653c895909823 /org.fox.ttrss/src/main/res | |
parent | 8a15540c6134adf6fa6f0244f432adbf9abc1acf (diff) |
implement drawer navigation for headlines activity instead of old hideable sidebar
Diffstat (limited to 'org.fox.ttrss/src/main/res')
8 files changed, 31 insertions, 32 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml index 4809a230..02be7e49 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml @@ -12,27 +12,25 @@ android:visibility="gone" > </FrameLayout> - <LinearLayout - android:id="@+id/fragment_container" + <android.support.v4.widget.DrawerLayout + android:id="@+id/headlines_drawer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="match_parent"> <FrameLayout - android:id="@+id/headlines_fragment" + android:id="@+id/article_fragment" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.3" - android:background="?headlinesBackgroundSolid" > + android:layout_height="match_parent" + android:background="?articleBackground"> </FrameLayout> <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="0.7" - android:background="?articleBackground" > + android:id="@+id/headlines_fragment" + android:layout_height="match_parent" + android:layout_width="300dp" + android:layout_gravity="start" + android:background="?headlinesBackgroundSolid"> </FrameLayout> - </LinearLayout> + </android.support.v4.widget.DrawerLayout> </LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml index f49214cd..09dfb852 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml @@ -4,28 +4,25 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <LinearLayout - android:id="@+id/fragment_container" + <android.support.v4.widget.DrawerLayout + android:id="@+id/headlines_drawer" android:layout_width="match_parent" - android:layout_height="match_parent" - android:baselineAligned="false" - android:orientation="horizontal" > + android:layout_height="match_parent"> <FrameLayout - android:id="@+id/headlines_fragment" - android:layout_width="0dp" + android:id="@+id/article_fragment" + android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="0" - android:background="?feedlistBackground" > + android:background="?articleBackground"> </FrameLayout> <FrameLayout - android:id="@+id/article_fragment" - android:layout_width="0dp" + android:id="@+id/headlines_fragment" android:layout_height="match_parent" - android:layout_weight="1" - android:background="?articleBackground" > + android:layout_width="240dp" + android:layout_gravity="start" + android:background="?headlinesBackgroundSolid"> </FrameLayout> - </LinearLayout> + </android.support.v4.widget.DrawerLayout> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 5163550a..99b27501 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -125,6 +125,7 @@ android:layout_height="wrap_content"> <LinearLayout + android:id="@+id/headline_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml index 23756682..1762e0bd 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml @@ -126,6 +126,7 @@ android:layout_height="wrap_content"> <LinearLayout + android:id="@+id/headline_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml index e84badd7..22a6318e 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml @@ -127,6 +127,7 @@ android:layout_height="wrap_content"> <LinearLayout + android:id="@+id/headline_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index 5f505bd4..f032438b 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -126,6 +126,7 @@ android:layout_height="wrap_content"> <LinearLayout + android:id="@+id/headline_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index 15391862..ee4a925d 100644 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -64,10 +64,10 @@ app:showAsAction="" android:title="@string/headlines_view_mode"/> - <item + <!-- <item android:id="@+id/headlines_toggle_sidebar" app:showAsAction="" - android:title="@string/toggle_sidebar"/> + android:title="@string/toggle_sidebar"/> --> <!-- <item diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml index 5f20f869..0325b553 100644 --- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml @@ -33,10 +33,10 @@ app:showAsAction="" android:title="@string/headlines_view_mode"/> - <item + <!-- <item android:id="@+id/headlines_toggle_sidebar" app:showAsAction="" - android:title="@string/toggle_sidebar"/> + android:title="@string/toggle_sidebar"/> --> </group> <!-- <group android:id="@+id/menu_group_headlines_selection" > |