From 27a09dd8cb3a84a1608be28349acd7840428ce4b Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Mon, 31 Aug 2020 12:48:43 -0700
Subject: [PATCH] dark theme updates

---
 qml/main.qml                  |  6 +++---
 qml/opaque                    |  2 +-
 qml/widgets/MessageEditor.qml | 12 ++++++------
 qml/widgets/MyProfile.qml     |  3 +++
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/qml/main.qml b/qml/main.qml
index d14f9f85..319c4602 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -273,7 +273,7 @@ ApplicationWindow {
                 if (currentIndex == managementPane) {
                     toolbar.hideTitle()
                     toolbar.rightMenuVisible = false
-                    toolbar.color =  Theme.backgroundMainColor
+                    toolbar.color =  Theme.toolbarMainColor
                     toolbar.leftMenuVisible = true
                     toolbar.backVisible = false
                 } else {
@@ -283,9 +283,9 @@ ApplicationWindow {
                     if (currentIndex == profilePane && theStack.currentIndex == theStack.emptyPane) {
                         toolbar.hideTitle()
                         toolbar.rightMenuVisible = false
-                        toolbar.color =  Theme.backgroundMainColor
+                        toolbar.color =  Theme.toolbarMainColor
                     } else {
-                        toolbar.color = Theme.backgroundPaneColor
+                        toolbar.color = Theme.toolbarAltColor
                     }
                 }
             }
diff --git a/qml/opaque b/qml/opaque
index 60c6a8d9..ec21dcbf 160000
--- a/qml/opaque
+++ b/qml/opaque
@@ -1 +1 @@
-Subproject commit 60c6a8d9838df0a83b7e0faf06a4d6d01b4eb0a0
+Subproject commit ec21dcbf8e20f4f894ba0dc829ccf18f56e0d27a
diff --git a/qml/widgets/MessageEditor.qml b/qml/widgets/MessageEditor.qml
index 4e499f7a..1311fbd5 100644
--- a/qml/widgets/MessageEditor.qml
+++ b/qml/widgets/MessageEditor.qml
@@ -254,9 +254,9 @@ ColumnLayout {
                     height: 36 * gcd.themeScale
                     width: 48 * gcd.themeScale
 
-                    backgroundColor: enabled ? Theme.backgroundMainColor : Theme.backgroundPaneColor
-                    hilightBackgroundColor: Theme.backgroundPaneColor
-                    iconColor: Theme.dividerColor
+                    backgroundColor: enabled ? Theme.altButtonColor : Theme.altButtonDisabledColor
+                    hilightBackgroundColor: backgroundColor
+                    iconColor: enabled ? Theme.altButtonTextColor : Theme.altButtonDisabledTextColor
 
                     onClicked: emojiDrawer.visible ? emojiDrawer.slideclosed() : emojiDrawer.slideopen()
                 }
@@ -269,9 +269,9 @@ ColumnLayout {
                     height: 36 * gcd.themeScale
                     width: 48 * gcd.themeScale
 
-                    backgroundColor: enabled ? Theme.backgroundMainColor : Theme.backgroundPaneColor
-                    hilightBackgroundColor: Theme.backgroundPaneColor
-                    iconColor: Theme.dividerColor
+                    backgroundColor: enabled ? Theme.altButtonColor : Theme.altButtonDisabledColor
+                    hilightBackgroundColor: backgroundColor
+                    iconColor: enabled ? Theme.altButtonTextColor : Theme.altButtonDisabledTextColor
 
                     onClicked: {
                         gcd.popup("attachments not yet implemented, sorry")
diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml
index 04750c19..c39966b1 100644
--- a/qml/widgets/MyProfile.qml
+++ b/qml/widgets/MyProfile.qml
@@ -10,6 +10,7 @@ import QtQuick.Controls 1.4
 import "../opaque" as Opaque
 import "../opaque/styles"
 import "../opaque/theme"
+import "../opaque/fonts"
 
 Item {
     id: root
@@ -110,6 +111,8 @@ Item {
                     color: Theme.portraitOnlineTextColor
                     size: Theme.usernameSize * gcd.themeScale
                     weight: Font.Bold
+                    font.family: Fonts.applicationFontExtraBold.name
+                    font.styleName: "ExtraBold"
                     text: nick
                     extraPadding: addBtn.width + 30
                     container: nameRow