From 983b71dc4bdb10fb08f8f4d15cfabb7cf5e9ba83 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 31 Oct 2021 10:04:28 +0100
Subject: [PATCH] Some small public room and presence icon theme fixes

Change-Id: I188fc5943755dc10db55701415d03b84c34e5ffe
---
 vector/src/main/res/drawable/toolbar_background_circle.xml | 7 +++++++
 vector/src/main/res/layout/fragment_room_detail.xml        | 5 +++--
 .../src/main/res/layout/view_stub_room_profile_header.xml  | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/res/drawable/toolbar_background_circle.xml

diff --git a/vector/src/main/res/drawable/toolbar_background_circle.xml b/vector/src/main/res/drawable/toolbar_background_circle.xml
new file mode 100644
index 0000000000..48f6839604
--- /dev/null
+++ b/vector/src/main/res/drawable/toolbar_background_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="96dp" />
+    <solid android:color="?vctr_toolbar_background" />
+
+</shape>
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index 4804c84b0d..4d70beb033 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -57,7 +57,7 @@
                     android:id="@+id/roomToolbarPresenceImageView"
                     android:layout_width="12dp"
                     android:layout_height="12dp"
-                    android:background="@drawable/background_circle"
+                    android:background="@drawable/toolbar_background_circle"
                     android:padding="2dp"
                     android:visibility="gone"
                     app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
@@ -72,11 +72,12 @@
                     android:id="@+id/roomToolbarPublicImageView"
                     android:layout_width="13dp"
                     android:layout_height="13dp"
-                    android:background="@drawable/background_circle"
+                    android:background="@drawable/toolbar_background_circle"
                     android:contentDescription="@string/a11y_public_room"
                     android:padding="1dp"
                     android:src="@drawable/ic_public_room"
                     android:visibility="gone"
+                    app:tint="?vctr_content_secondary"
                     app:layout_constraintCircle="@+id/roomToolbarAvatarImageView"
                     app:layout_constraintCircleAngle="135"
                     app:layout_constraintCircleRadius="20dp"
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index b6fc16e606..f4b291e51d 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -44,6 +44,7 @@
         android:padding="2dp"
         android:src="@drawable/ic_public_room"
         android:visibility="gone"
+        app:tint="?vctr_content_secondary"
         app:layout_constraintCircle="@+id/roomProfileAvatarView"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="64dp"