From 1e6e8b546d2dd5c46d01de51dd073cb7df1b473b Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Tue, 22 Mar 2022 12:37:13 +0000
Subject: [PATCH] fixing presence icon anchoring to the middle of the room icon
 - creates a secondary verification shield and aligns to the start of the room
 title when presence is present

---
 changelog.d/5489.bugfix                       |  1 +
 .../home/room/detail/TimelineFragment.kt      |  9 ++--
 .../res/layout/view_room_detail_toolbar.xml   | 46 ++++++++++++-------
 3 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 changelog.d/5489.bugfix

diff --git a/changelog.d/5489.bugfix b/changelog.d/5489.bugfix
new file mode 100644
index 0000000000..69ef0118a8
--- /dev/null
+++ b/changelog.d/5489.bugfix
@@ -0,0 +1 @@
+Fix presence indicator being aligned to the center of the room image
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index b66897d8d1..f462128c6b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1613,11 +1613,10 @@ class TimelineFragment @Inject constructor(
                 views.includeRoomToolbar.roomToolbarContentView.isClickable = roomSummary.membership == Membership.JOIN
                 views.includeRoomToolbar.roomToolbarTitleView.text = roomSummary.displayName
                 avatarRenderer.render(roomSummary.toMatrixItem(), views.includeRoomToolbar.roomToolbarAvatarImageView)
-                views.includeRoomToolbar.roomToolbarDecorationImageView.render(roomSummary.roomEncryptionTrustLevel)
-                views.includeRoomToolbar.roomToolbarPresenceImageView.render(
-                        roomSummary.isDirect && matrixConfiguration.presenceSyncEnabled,
-                        roomSummary.directUserPresence
-                )
+                val showPresence = roomSummary.isDirect && matrixConfiguration.presenceSyncEnabled
+                views.includeRoomToolbar.roomToolbarPresenceImageView.render(showPresence, roomSummary.directUserPresence)
+                val shieldView = if (showPresence) views.includeRoomToolbar.roomToolbarTitleShield else views.includeRoomToolbar.roomToolbarAvatarShield
+                shieldView.render(roomSummary.roomEncryptionTrustLevel)
                 views.includeRoomToolbar.roomToolbarPublicImageView.isVisible = roomSummary.isPublic && !roomSummary.isDirect
             }
         } else {
diff --git a/vector/src/main/res/layout/view_room_detail_toolbar.xml b/vector/src/main/res/layout/view_room_detail_toolbar.xml
index befd84ea34..d5c1914d41 100644
--- a/vector/src/main/res/layout/view_room_detail_toolbar.xml
+++ b/vector/src/main/res/layout/view_room_detail_toolbar.xml
@@ -19,15 +19,6 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@sample/room_round_avatars" />
 
-    <im.vector.app.core.ui.views.ShieldImageView
-        android:id="@+id/roomToolbarDecorationImageView"
-        android:layout_width="11dp"
-        android:layout_height="13dp"
-        app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
-        app:layout_constraintCircleAngle="120"
-        app:layout_constraintCircleRadius="18dp"
-        tools:ignore="MissingConstraints" />
-
     <im.vector.app.core.ui.views.PresenceStateImageView
         android:id="@+id/roomToolbarPresenceImageView"
         android:layout_width="11dp"
@@ -36,11 +27,9 @@
         android:padding="2dp"
         android:visibility="gone"
         app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
-        app:layout_constraintCircleAngle="0"
-        app:layout_constraintCircleRadius="0dp"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="20dp"
         tools:ignore="MissingConstraints"
-        tools:layout_constraintCircleAngle="60"
-        tools:layout_constraintCircleRadius="18dp"
         tools:src="@drawable/ic_presence_offline"
         tools:visibility="visible" />
 
@@ -59,27 +48,50 @@
         tools:ignore="MissingConstraints"
         tools:visibility="invisible" />
 
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/roomToolbarAvatarShield"
+        android:layout_width="11dp"
+        android:layout_height="13dp"
+        app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
+        app:layout_constraintCircleAngle="120"
+        app:layout_constraintCircleRadius="18dp"
+        android:visibility="gone"
+        tools:visibility="gone"
+        tools:ignore="MissingConstraints" />
+
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/imageGroupBarrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="end"
-        app:constraint_referenced_ids="roomToolbarDecorationImageView,roomToolbarAvatarImageView,roomToolbarPresenceImageView,roomToolbarPublicImageView" />
+        app:constraint_referenced_ids="roomToolbarAvatarImageView,roomToolbarAvatarShield,roomToolbarPresenceImageView,roomToolbarPublicImageView" />
+
+    <im.vector.app.core.ui.views.ShieldImageView
+        android:id="@+id/roomToolbarTitleShield"
+        android:layout_width="11dp"
+        android:layout_height="13dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginTop="2dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
+        app:layout_constraintEnd_toStartOf="@id/roomToolbarTitleView"
+        app:layout_constraintStart_toEndOf="@id/imageGroupBarrier"
+        app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView"
+        tools:ignore="MissingConstraints" />
 
     <TextView
         android:id="@+id/roomToolbarTitleView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="2dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Vector.Widget.ActionBarTitle"
         app:layout_constraintBottom_toBottomOf="@id/roomToolbarAvatarImageView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/imageGroupBarrier"
+        app:layout_constraintStart_toEndOf="@id/roomToolbarTitleShield"
         app:layout_constraintTop_toTopOf="@id/roomToolbarAvatarImageView"
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_goneMarginStart="7dp"