Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '666-transport-icons-overlap-navigation-items' into 'master'

Browse Source 
Make navigation drawer scrollable

![device-2016-11-22-095642](/uploads/bcd5f68d40816ed2e44c3194eb977695/device-2016-11-22-095642.png)![device-2016-11-22-095658](/uploads/da1807e981632936ba04db24dc7b8ae7/device-2016-11-22-095658.png)

Closes #666

See merge request !432
This commit is contained in:
akwizgran
2016-11-23 15:11:43 +00:00
parent 7d1ddb6d65 f10ac13350
commit 6ab8219394
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/res/layout/navigation_header.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="85dp"
android:contentDescription="@string/app_name" android:contentDescription="@string/app_name"
android:scaleType="fitStart" android:scaleType="fitStart"
android:src="@drawable/navigation_drawer_header" android:src="@drawable/navigation_drawer_header"

38
briar-android/res/layout/navigation_menu.xml
View File

@@ -1,28 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/menu_background" android:background="@color/menu_background"
android:fillViewport="true"
android:orientation="vertical"> android:orientation="vertical">
<android.support.design.widget.NavigationView <LinearLayout
android:id="@+id/navigation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="start" android:orientation="vertical">
app:headerLayout="@layout/navigation_header"
app:menu="@menu/navigation_drawer"> <android.support.design.widget.NavigationView
android:id="@+id/navigation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/menu_background"
app:elevation="0dp"
app:headerLayout="@layout/navigation_header"
app:menu="@menu/navigation_drawer"/>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<include <include
layout="@layout/transports_list" layout="@layout/transports_list"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"/>
tools:visibility="gone"/>
</android.support.design.widget.NavigationView> </LinearLayout>
</LinearLayout> </ScrollView>