Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiedermann IT-Dienstleistungen <info@niedermann.it>2018-09-06 21:22:15 +0300
committerNiedermann IT-Dienstleistungen <info@niedermann.it>2018-09-06 21:22:15 +0300
commit1eb85b78d19b672c0b77f3a4a704667f69806521 (patch)
tree3c55b582d129facfc2b04e493f5cfa49c251cc27
parent28bf7c09fb418bd188690d77a561ed16ca5abc4b (diff)
Partially revert #458 (to slim drawer header layout)
-rw-r--r--app/src/main/res/layout/drawer_layout.xml66
1 files changed, 27 insertions, 39 deletions
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index 7ef2c8f3..d249ac6a 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -27,56 +27,44 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="178dp"
- android:background="@color/primary"
- android:orientation="vertical"
- android:weightSum="1">
+ android:layout_height="wrap_content"
+ android:background="?attr/colorPrimary"
+ android:padding="10dp"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark"
+ android:orientation="horizontal"
+ android:gravity="bottom">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="24dp"
+ android:layout_gravity="center_vertical"
+ android:src="@mipmap/ic_launcher"
+ android:contentDescription="@string/app_name" />
- <LinearLayout
+ <android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
- android:layout_height="56dp"
- android:orientation="vertical"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true">
-
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="12dp"
+ android:paddingStart="12dp"
+ android:paddingTop="24dp"
+ android:orientation="vertical">
<TextView
- android:id="@+id/name"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="16dp"
- android:textColor="#ffffff"
android:text="@string/app_name"
- android:textSize="14sp"
- android:textStyle="bold"
-
- />
+ android:textAppearance="@style/TextAppearance.AppCompat.Title" />
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#ffffff"
- android:layout_marginLeft="16dp"
- android:layout_marginTop="5dp"
android:id="@+id/account"
- android:textSize="14sp"
- android:textStyle="normal"
-
- />
- </LinearLayout>
-
- <ImageView
- android:layout_width="70dp"
- android:layout_height="70dp"
- android:layout_marginLeft="16dp"
- android:layout_marginTop="38dp"
- android:src="@mipmap/ic_launcher_round"
- android:contentDescription="@string/app_name" />
- </RelativeLayout>
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </android.support.v7.widget.LinearLayoutCompat>
+ </LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/navigationList"