diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_main.xml | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 28c23503..de06efc7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -33,7 +33,7 @@ the container. --> <fragment android:id="@+id/navigation_drawer" - android:name="se.leap.bitmaskclient.NavigationDrawerFragment" + android:name="se.leap.bitmaskclient.drawer.NavigationDrawerFragment" android:layout_width="@dimen/navigation_drawer_width" android:layout_height="match_parent" android:layout_gravity="start" diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index a2bda8b6..20d826b3 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/colorBackground" - tools:context="se.leap.bitmaskclient.NavigationDrawerFragment"> + tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"> <FrameLayout android:layout_width="match_parent" @@ -32,21 +32,23 @@ </FrameLayout> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:orientation="vertical"> <ListView android:id="@+id/accountList" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="wrap_content" /> - <FrameLayout - android:id="@+id/appActionFrame" + <ListView + android:id="@+id/settingsList" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_alignParentBottom="true" /> - </LinearLayout> + </RelativeLayout> </LinearLayout>
\ No newline at end of file |