From 1981a0f79afa452296f9a8c2f0a9ce9a37ea4926 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Sat, 6 Jul 2019 17:53:51 -0400
Subject: [PATCH] Colored names for typingMembersBar

---
 src/qml/EventHandlers/rooms.js |  9 ++++-----
 src/qml/Theme.qml              | 33 +++++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/qml/EventHandlers/rooms.js b/src/qml/EventHandlers/rooms.js
index 0351a355..feb229b9 100644
--- a/src/qml/EventHandlers/rooms.js
+++ b/src/qml/EventHandlers/rooms.js
@@ -1,4 +1,4 @@
-//Qt.include("../utils.js")
+Qt.include("../utils.js")
 
 
 function typingTextFor(members, our_user_id) {
@@ -6,10 +6,9 @@ function typingTextFor(members, our_user_id) {
 
     for (var i = 0; i < members.length; i++) {
         if (members[i] != our_user_id) {
-            names.push(users.getUser(members[i]).displayName)
-            //names.push(coloredNameHtml(
-                //users.getUser(members[i]).displayName, members[i]
-            //))
+            names.push(coloredNameHtml(
+                users.getUser(members[i]).displayName, members[i]
+            ))
         }
     }
 
diff --git a/src/qml/Theme.qml b/src/qml/Theme.qml
index 046030e2..baa6e459 100644
--- a/src/qml/Theme.qml
+++ b/src/qml/Theme.qml
@@ -25,7 +25,8 @@ QtObject {
 
     readonly property QtObject colors: QtObject {
         property color background0: Qt.hsla(0, 0, 0.9, 0.5)
-        property color background1: Qt.hsla(0, 0, 0.9, 0.7)
+        property color background1: Qt.hsla(0, 0, 0.9, 0.6)
+        property color background2: Qt.hsla(0, 0, 0.9, 0.7)
         property color foreground: "black"
         property color foregroundDim: Qt.hsla(0, 0, 0.2, 1)
         property color foregroundError: Qt.hsla(0.95, 0.64, 0.32, 1)
@@ -34,37 +35,37 @@ QtObject {
 
     readonly property QtObject controls: QtObject {
         readonly property QtObject button: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject textField: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject textArea: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
     }
 
     readonly property QtObject sidePane: QtObject {
-        property color background: colors.background1
+        property color background: colors.background2
 
         readonly property QtObject settingsButton: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject filterRooms: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
     }
 
     readonly property QtObject chat: QtObject {
         readonly property QtObject selectViewBar: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject roomHeader: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject roomEventList: QtObject {
@@ -73,35 +74,35 @@ QtObject {
 
         readonly property QtObject message: QtObject {
             property color ownBackground: Qt.hsla(0.07, 0.4, 0.82, 0.7)
-            property color background: colors.background1
+            property color background: colors.background2
             property color body: colors.foreground
             property color date: colors.foregroundDim
         }
 
         readonly property QtObject daybreak: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
             property color foreground: colors.foreground
             property int radius: theme.radius
         }
 
         readonly property QtObject inviteBanner: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject leftBanner: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject unknownDevices: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
 
         readonly property QtObject typingMembers: QtObject {
-            property color background: colors.background0
+            property color background: colors.background1
         }
 
         readonly property QtObject sendBox: QtObject {
-            property color background: colors.background1
+            property color background: colors.background2
         }
     }