Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118670
Change subject: Design tweaks for nav drawer
......................................................................
Design tweaks for nav drawer
- Designers are experimenting with the color
- Search bar is hidden as well
Change-Id: Ic6ef5e3f814ee2d466bdbaddfbf8cc7767fee5fd
---
M wikipedia/res/layout/activity_main.xml
M wikipedia/res/layout/fragment_navdrawer.xml
2 files changed, 24 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/70/118670/1
diff --git a/wikipedia/res/layout/activity_main.xml
b/wikipedia/res/layout/activity_main.xml
index 1172107..4f0dfa2 100644
--- a/wikipedia/res/layout/activity_main.xml
+++ b/wikipedia/res/layout/activity_main.xml
@@ -1,30 +1,29 @@
-<FrameLayout
+<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android";
- 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 -->
+ 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">
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
</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"
+ <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"
/>
-
- </android.support.v4.widget.DrawerLayout>
- <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"
+ </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"
/>
-</FrameLayout>
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/wikipedia/res/layout/fragment_navdrawer.xml
b/wikipedia/res/layout/fragment_navdrawer.xml
index 64f9d9e..2ae7b97 100644
--- a/wikipedia/res/layout/fragment_navdrawer.xml
+++ b/wikipedia/res/layout/fragment_navdrawer.xml
@@ -4,12 +4,12 @@
android:layout_width="196dp"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="#111">
- <!-- Match marginTop with height of Search Fragment -->
+ android:background="#00af89">
<ListView android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:layout_marginTop="48dp"
+ android:dividerHeight="0dp"
+ android:divider="@null"
android:id="@+id/nav_list">
</ListView>
<org.wikipedia.styledviews.StyledTextView
--
To view, visit https://gerrit.wikimedia.org/r/118670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6ef5e3f814ee2d466bdbaddfbf8cc7767fee5fd
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
