From 229bfe8d22199e4e9885e07e80eda39836cf9c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 11 Dec 2018 15:54:26 +0100
Subject: [PATCH] Adjustment login layout to material design (#197)

---
 .../res/drawable/ic_login_person_24px.xml     |  9 ---
 .../main/res/layout/item_login_options.xml    | 63 +++++++++----------
 2 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_login_person_24px.xml

diff --git a/app/src/main/res/drawable/ic_login_person_24px.xml b/app/src/main/res/drawable/ic_login_person_24px.xml
deleted file mode 100644
index c300d6e0..00000000
--- a/app/src/main/res/drawable/ic_login_person_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm0 2c-2.7 0-8 1.3-8 4v2h16v-2c0-2.7-5.3-4-8-4z" />
-</vector>
diff --git a/app/src/main/res/layout/item_login_options.xml b/app/src/main/res/layout/item_login_options.xml
index 3ab0e7bd..c19d5a66 100644
--- a/app/src/main/res/layout/item_login_options.xml
+++ b/app/src/main/res/layout/item_login_options.xml
@@ -2,50 +2,43 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
+    android:layout_height="72dp"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackgroundBorderless"
-    android:paddingBottom="5dp"
-    android:paddingEnd="20dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="20dp"
-    android:paddingStart="10dp"
-    android:paddingTop="5dp">
+    android:padding="16dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/loginItemImage"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_centerVertical="true"
-        app:srcCompat="@drawable/ic_login_person_24px" />
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:tint="@android:color/black"
+        app:srcCompat="@drawable/ic_all_account_24dp" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/loginItemName"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
         android:layout_toEndOf="@id/loginItemImage"
-        android:layout_toRightOf="@id/loginItemImage">
+        android:layout_toRightOf="@id/loginItemImage"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/app_name"
+        android:textSize="16sp"
+        app:firstBaselineToTopHeight="16dp" />
 
-        <TextView
-            android:id="@+id/loginItemName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginBottom="5dp"
-            android:text="@string/app_name"
-            android:textSize="20sp" />
+    <TextView
+        android:id="@+id/loginItemSchool"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/loginItemImage"
+        android:layout_toRightOf="@id/loginItemImage"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/app_name"
+        android:textSize="12sp"
+        app:firstBaselineToTopHeight="36dp" />
 
-        <TextView
-            android:id="@+id/loginItemSchool"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/loginItemName"
-            android:maxLines="2"
-            android:text="@string/app_name"
-            android:textSize="13sp" />
-
-    </RelativeLayout>
 </RelativeLayout>