Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/129632
Change subject: Navigation pull-out menu no longer occludes Search bar. ...................................................................... Navigation pull-out menu no longer occludes Search bar. Bug: 63812 Change-Id: I29fd1a730370967d66c69e281ae49d16818a52cf --- M wikipedia/res/layout/activity_main.xml M wikipedia/res/layout/fragment_navdrawer.xml 2 files changed, 27 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/32/129632/1 diff --git a/wikipedia/res/layout/activity_main.xml b/wikipedia/res/layout/activity_main.xml index 75b97f4..82d92ce 100644 --- a/wikipedia/res/layout/activity_main.xml +++ b/wikipedia/res/layout/activity_main.xml @@ -1,32 +1,32 @@ -<android.support.v4.widget.DrawerLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/drawer_layout" - android:layout_width="match_parent" - android:saveEnabled="false" - android:layout_height="match_parent"> - <!-- The main content view --> - <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:saveEnabled="false" + android:layout_height="match_parent"> + <!-- The main content view --> <FrameLayout android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent"> </FrameLayout> - <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/zero_crouton_container"> - <fragment - android:id="@+id/search_fragment" - android:name="org.wikipedia.search.SearchArticlesFragment" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_gravity="top" - /> - </LinearLayout> + <!-- The navigation drawer --> + <!-- Don't set marginTop here, it somehow also affects marginBottom. wtf?! --> + <fragment android:layout_width="wrap_content" android:layout_height="match_parent" + android:name="org.wikipedia.NavDrawerFragment" + android:layout_gravity="start" + tools:layout="@layout/fragment_navdrawer"/> - </FrameLayout> - <!-- The navigation drawer --> - <!-- Don't set marginTop here, it somehow also affects marginBottom. wtf?! --> - <fragment android:layout_width="wrap_content" android:layout_height="match_parent" - android:name="org.wikipedia.NavDrawerFragment" - android:layout_gravity="start" - /> - -</android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.DrawerLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/zero_crouton_container"> + <fragment + android:id="@+id/search_fragment" + android:name="org.wikipedia.search.SearchArticlesFragment" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_gravity="top" + tools:layout="@layout/fragment_search"/> + </LinearLayout> +</FrameLayout> \ No newline at end of file diff --git a/wikipedia/res/layout/fragment_navdrawer.xml b/wikipedia/res/layout/fragment_navdrawer.xml index bcdbc1e..d698485 100644 --- a/wikipedia/res/layout/fragment_navdrawer.xml +++ b/wikipedia/res/layout/fragment_navdrawer.xml @@ -5,9 +5,11 @@ android:layout_height="match_parent" android:fillViewport="true" android:background="#00af89"> + <!-- Match marginTop with height of Search Fragment --> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:layout_marginTop="48dp" android:id="@+id/nav_item_container" > <LinearLayout android:layout_width="match_parent" -- To view, visit https://gerrit.wikimedia.org/r/129632 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29fd1a730370967d66c69e281ae49d16818a52cf Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits