From da2988c4356d2756e86037b1c7e859f49583c109 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 8 Sep 2021 17:04:31 +0200
Subject: Load theme from file (~/.config/quickmedia/themes/<theme-name>.json
 and /usr/share/quickmedia/themes/<theme-name>.json)

---
 src/plugins/Matrix.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins/Matrix.cpp')

diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 6d8148d..3f42437 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -630,20 +630,20 @@ namespace QuickMedia {
                 if(!room_desc.empty())
                     room_desc += '\n';
                 room_desc += "** " + std::to_string(unread_notification_count) + " unread mention(s) **"; // TODO: Better notification?
-                room->body_item->set_description_color(get_current_theme().attention_alert_text_color);
+                room->body_item->set_description_color(get_theme().attention_alert_text_color);
             } else {
-                room->body_item->set_description_color(get_current_theme().faded_text_color);
+                room->body_item->set_description_color(get_theme().faded_text_color);
             }
             room->body_item->set_description(std::move(room_desc));
             if(set_room_as_unread)
-                room->body_item->set_title_color(get_current_theme().attention_alert_text_color);
+                room->body_item->set_title_color(get_theme().attention_alert_text_color);
             room->last_message_read = false;
 
             rooms_page->move_room_to_top(room);
             room_tags_page->move_room_to_top(room);
         } else if(last_new_message) {
             room->body_item->set_description(extract_first_line_remove_newline_elipses(matrix->message_get_author_displayname(last_new_message.get()), AUTHOR_MAX_LENGTH) + ": " + message_to_room_description_text(last_new_message.get()));
-            room->body_item->set_description_color(get_current_theme().faded_text_color);
+            room->body_item->set_description_color(get_theme().faded_text_color);
 
             rooms_page->move_room_to_top(room);
             room_tags_page->move_room_to_top(room);
@@ -904,7 +904,7 @@ namespace QuickMedia {
         body_item->set_author(extract_first_line_remove_newline_elipses(display_name, AUTHOR_MAX_LENGTH));
         body_item->set_author_color(user_id_to_color(user_info.user_id));
         body_item->set_description(user_info.user_id);
-        body_item->set_description_color(get_current_theme().faded_text_color);
+        body_item->set_description_color(get_theme().faded_text_color);
         if(user_info.avatar_url)
             body_item->thumbnail_url = user_info.avatar_url.value();
         body_item->thumbnail_mask_type = ThumbnailMaskType::CIRCLE;
@@ -1035,8 +1035,8 @@ namespace QuickMedia {
         body_item->url = notification.event_id;
 
         if(!notification.read) {
-            body_item->set_author_color(get_current_theme().attention_alert_text_color);
-            body_item->set_description_color(get_current_theme().attention_alert_text_color);
+            body_item->set_author_color(get_theme().attention_alert_text_color);
+            body_item->set_description_color(get_theme().attention_alert_text_color);
         }
 
         body_item->thumbnail_mask_type = ThumbnailMaskType::CIRCLE;
@@ -1128,8 +1128,8 @@ namespace QuickMedia {
                 NotificationsExtraData *extra_data = static_cast<NotificationsExtraData*>(room_notification.second->extra.get());
                 if(!extra_data->read) {
                     extra_data->read = true;
-                    room_notification.second->set_author_color(get_current_theme().text_color);
-                    room_notification.second->set_description_color(get_current_theme().text_color);
+                    room_notification.second->set_author_color(get_theme().text_color);
+                    room_notification.second->set_description_color(get_theme().text_color);
                 }
             }
         }
@@ -4410,7 +4410,7 @@ namespace QuickMedia {
             auto body_item = BodyItem::create("");
             body_item->url.assign(user_id_json.GetString(), user_id_json.GetStringLength());
             body_item->set_description(body_item->url);
-            body_item->set_description_color(get_current_theme().faded_text_color);
+            body_item->set_description_color(get_theme().faded_text_color);
             if(display_name_json.IsString())
                 body_item->set_author(std::string(display_name_json.GetString(), display_name_json.GetStringLength()));
             else
-- 
cgit v1.2.3