diff options
author | cyBerta <cyberta@riseup.net> | 2018-02-27 20:48:13 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-02-27 20:48:13 +0100 |
commit | 69d7e4bc6d77e40407a404606b55630c35a4050b (patch) | |
tree | ae032982d0f5354f46927d3fb0f78bc331af5dfb /app/src/main/res/layout/drawer_main.xml | |
parent | e9c52ffc7965c96841f6ae573b19a0a0e9fc7b71 (diff) | |
parent | 96bc3f8d14cab11e43fbe6b11dfb6dbf46e5919b (diff) |
Merge branch 'origin_0.9.8'0.9.8
Diffstat (limited to 'app/src/main/res/layout/drawer_main.xml')
-rw-r--r-- | app/src/main/res/layout/drawer_main.xml | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 26267bbb..54614f3f 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -1,13 +1,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:background="@color/colorBackground" - tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment" - android:clickable="true" - android:focusable="true"> + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="@color/colorBackground" + tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment" + android:clickable="true" + android:focusable="true"> <FrameLayout android:layout_width="match_parent" @@ -28,7 +28,6 @@ android:layout_height="wrap_content" app:srcCompat="@drawable/mask" /> </FrameLayout> - <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -37,14 +36,33 @@ <ListView android:id="@+id/accountList" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:isScrollContainer="false" + /> - <ListView - android:id="@+id/settingsList" + <View + android:id="@+id/divider" + android:layout_below="@id/accountList" + android:layout_width="match_parent" + android:layout_height="1px" + android:background="@android:color/darker_gray" + /> + + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_alignParentBottom="true" /> + android:layout_alignTop="@id/divider" + android:layout_alignParentBottom="true" + > + <ListView + android:id="@+id/settingsList" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + /> + </FrameLayout> + + </RelativeLayout> |