From b453225941a90ab85c9123a2327e3282262850f3 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Mon, 12 Apr 2021 21:58:58 +0200
Subject: [PATCH] Student info and Teachers screens unification (#1279)

---
 app/src/main/res/layout/item_student_info.xml | 15 +++---
 app/src/main/res/layout/item_teacher.xml      | 53 +++++++++++--------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/item_student_info.xml b/app/src/main/res/layout/item_student_info.xml
index 203ce86b..ee4c5044 100644
--- a/app/src/main/res/layout/item_student_info.xml
+++ b/app/src/main/res/layout/item_student_info.xml
@@ -11,14 +11,14 @@
     <TextView
         android:id="@+id/student_info_item_title"
         android:layout_width="match_parent"
-        android:layout_height="28dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="13dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
         android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="16sp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -27,15 +27,16 @@
     <TextView
         android:id="@+id/student_info_item_subtitle"
         android:layout_width="match_parent"
-        android:layout_height="18dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
         android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/student_info_item_title"
         tools:text="@tools:sample/lorem/random" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
index a30eb560..9b94e684 100644
--- a/app/src/main/res/layout/item_teacher.xml
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -12,37 +12,44 @@
     tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
 
     <TextView
-        android:id="@+id/teacherItemName"
+        android:id="@+id/teacherItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="17sp"
-        tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/teacherItemShortName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="40dp"
-        android:layout_toEndOf="@+id/teacherItemName"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="17sp"
-        tools:text="[LI]" />
-
-    <TextView
-        android:id="@+id/teacherItemSubject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/teacherItemName"
-        android:layout_alignStart="@id/teacherItemName"
-        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
         tools:text="11:11-12:00" />
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_below="@+id/teacherItemSubject"
+        android:layout_marginStart="10dp">
+
+        <TextView
+            android:id="@+id/teacherItemName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="16sp"
+            tools:text="@tools:sample/full_names" />
+
+        <TextView
+            android:id="@+id/teacherItemShortName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="40dp"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="16sp"
+            tools:text="[LI]" />
+
+    </LinearLayout>
+
 </RelativeLayout>