#493 Switch from ListView to NavigationView + move server selection logic into drawer

1 files changed, 36 insertions, 16 deletions

diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 00441b73..fe0a9f2d 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -3,34 +3,54 @@
 	android:layout_width="match_parent"
 	android:layout_height="178dp"
 	android:orientation="vertical"
-	android:weightSum="1">
+	android:weightSum="1"
+	android:background="?attr/selectableItemBackground">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="56dp"
-		android:orientation="vertical"
+		android:orientation="horizontal"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true">
 
-		<TextView
-			android:id="@+id/header_server_name"
+		<LinearLayout
+			android:orientation="vertical"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:textColor="?android:textColorPrimary"
-			android:textSize="14sp"
-			android:textStyle="bold"/>
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:id="@+id/header_server_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="16dp"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="14sp"
+				android:textStyle="bold"/>
+
+			<TextView
+				android:id="@+id/header_user_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="16dp"
+				android:layout_marginTop="5dp"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="14sp"
+				android:textStyle="normal"/>
+		</LinearLayout>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_weight="1"/>
 
-		<TextView
-			android:id="@+id/header_user_name"
+		<ImageView
+			android:id="@+id/header_select_image"
+			android:src="?attr/select_server"
+			android:layout_gravity="center_vertical"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:layout_marginTop="5dp"
-			android:textColor="?android:textColorSecondary"
-			android:textSize="14sp"
-			android:textStyle="normal"/>
+			android:paddingRight="20dp"/>
 	</LinearLayout>
 
 	<de.hdodenhof.circleimageview.CircleImageView