From d1cb15f821380e1c50511e1685b9fa4a566b9998 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Fri, 13 Dec 2019 06:33:40 +0300
Subject: [PATCH] res: align status_username by baseline

---
 app/src/main/res/layout/item_conversation.xml        | 6 ++++--
 app/src/main/res/layout/item_status.xml              | 4 ++--
 app/src/main/res/layout/item_status_detailed.xml     | 2 +-
 app/src/main/res/layout/item_status_notification.xml | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 55b0dd0d..146fb7d1 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -108,7 +108,8 @@
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toStartOf="@id/status_timestamp_info"
         app:layout_constraintStart_toEndOf="@id/status_display_name"
-        app:layout_constraintTop_toTopOf="@id/status_display_name"
+        app:layout_constraintBaseline_toBaselineOf="@id/status_display_name"
+        app:layout_constrainedHeight="true"
         tools:text="\@Entenhausen@birbsarecooooooooooool.site" />
 
     <TextView
@@ -119,7 +120,8 @@
         android:textColor="?android:textColorSecondary"
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_display_name"
+        app:layout_constraintBaseline_toBaselineOf="@id/status_display_name"
+        app:layout_constrainedHeight="true"
         tools:text="13:37" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 7027a49e..a3a02a69 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -86,7 +86,7 @@
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toStartOf="@id/status_timestamp_info"
         app:layout_constraintStart_toEndOf="@id/status_display_name"
-        app:layout_constraintTop_toTopOf="@id/status_display_name"
+		app:layout_constraintBaseline_toBaselineOf="@id/status_display_name"
         tools:text="\@Entenhausen@birbsarecooooooooooool.site" />
 
     <TextView
@@ -98,7 +98,7 @@
         android:textColor="?android:textColorSecondary"
         android:textSize="?attr/status_text_medium"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_display_name"
+		app:layout_constraintBaseline_toBaselineOf="@id/status_display_name"
         tools:text="13:37" />
 
     <androidx.emoji.widget.EmojiTextView
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 709289b8..3a536c87 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -581,4 +581,4 @@
         app:layout_constraintTop_toTopOf="@id/status_reply"
         app:srcCompat="@drawable/ic_more_horiz_24dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_status_notification.xml b/app/src/main/res/layout/item_status_notification.xml
index 94f40c45..0dc47d4f 100644
--- a/app/src/main/res/layout/item_status_notification.xml
+++ b/app/src/main/res/layout/item_status_notification.xml
@@ -53,6 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/status_timestamp_info"
             android:layout_toEndOf="@id/status_display_name"
+            android:layout_alignBaseline="@id/status_display_name"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="?android:textColorTertiary"