Fixed linking error & dictionary link color

Librum-Reader · Sep 26, 2023 · 9f92fd1 · 9f92fd1
1 parent 23ce361
commit 9f92fd1
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 14 deletions.
diff --git a/src/adapters/controllers/free_books_controller.hpp b/src/adapters/controllers/free_books_controller.hpp
@@ -1,12 +1,13 @@
 #pragma once
 #include "free_books_model.hpp"
 #include "i_free_books_controller.hpp"
+#include "adapters_export.hpp"
 #include "i_free_books_service.hpp"
 
 namespace adapters::controllers
 {
 
-class FreeBooksController : public IFreeBooksController
+class ADAPTERS_EXPORT FreeBooksController : public IFreeBooksController
 {
     Q_OBJECT
 

diff --git a/src/adapters/data_models/free_books_model/free_books_model.hpp b/src/adapters/data_models/free_books_model/free_books_model.hpp
@@ -4,11 +4,12 @@
 #include <QVariant>
 #include <vector>
 #include "free_book.hpp"
+#include "adapters_export.hpp"
 
 namespace adapters::data_models
 {
 
-class FreeBooksModel : public QAbstractListModel
+class ADAPTERS_EXPORT FreeBooksModel : public QAbstractListModel
 {
     Q_OBJECT
 

diff --git a/src/adapters/gateways/free_books_storage_gateway.hpp b/src/adapters/gateways/free_books_storage_gateway.hpp
@@ -1,13 +1,14 @@
 #pragma once
 #include <QJsonArray>
 #include <QJsonObject>
+#include "adapters_export.hpp"
 #include "i_free_books_storage_access.hpp"
 #include "i_free_books_storage_gateway.hpp"
 
 namespace adapters::gateways
 {
 
-class FreeBooksStorageGateway : public application::IFreeBooksStorageGateway
+class ADAPTERS_EXPORT FreeBooksStorageGateway : public application::IFreeBooksStorageGateway
 {
     Q_OBJECT
 

diff --git a/src/adapters/interfaces/controllers/i_free_books_controller.hpp b/src/adapters/interfaces/controllers/i_free_books_controller.hpp
@@ -1,11 +1,12 @@
 #pragma once
 #include <QObject>
+#include "adapters_export.hpp"
 #include "free_books_model.hpp"
 
 namespace adapters
 {
 
-class IFreeBooksController : public QObject
+class ADAPTERS_EXPORT IFreeBooksController : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(adapters::data_models::FreeBooksModel* freeBooksModel READ

diff --git a/src/adapters/interfaces/persistance/i_free_books_storage_access.hpp b/src/adapters/interfaces/persistance/i_free_books_storage_access.hpp
@@ -1,10 +1,11 @@
 #pragma once
 #include <QObject>
+#include "adapters_export.hpp"
 
 namespace adapters
 {
 
-class IFreeBooksStorageAccess : public QObject
+class ADAPTERS_EXPORT IFreeBooksStorageAccess : public QObject
 {
     Q_OBJECT
 

diff --git a/src/application/interfaces/gateways/i_free_books_storage_gateway.hpp b/src/application/interfaces/gateways/i_free_books_storage_gateway.hpp
@@ -2,11 +2,12 @@
 #include <QImage>
 #include <QObject>
 #include "free_book.hpp"
+#include "application_export.hpp"
 
 namespace application
 {
 
-class IFreeBooksStorageGateway : public QObject
+class APPLICATION_EXPORT IFreeBooksStorageGateway : public QObject
 {
     Q_OBJECT
 

diff --git a/src/application/interfaces/services/i_free_books_service.hpp b/src/application/interfaces/services/i_free_books_service.hpp
@@ -2,11 +2,12 @@
 #include <QObject>
 #include <vector>
 #include "free_book.hpp"
+#include "application_export.hpp"
 
 namespace application
 {
 
-class IFreeBooksService : public QObject
+class APPLICATION_EXPORT IFreeBooksService : public QObject
 {
     Q_OBJECT
 

diff --git a/src/application/services/free_books_service.hpp b/src/application/services/free_books_service.hpp
@@ -2,13 +2,14 @@
 #include <QDir>
 #include <vector>
 #include "free_book.hpp"
+#include "application_export.hpp"
 #include "i_free_books_service.hpp"
 #include "i_free_books_storage_gateway.hpp"
 
 namespace application::services
 {
 
-class FreeBooksService : public IFreeBooksService
+class APPLICATION_EXPORT FreeBooksService : public IFreeBooksService
 {
     Q_OBJECT
 

diff --git a/src/presentation/StyleSheet.qml b/src/presentation/StyleSheet.qml
@@ -24,6 +24,7 @@ Item
     property color colorTitle
     property color colorMatteTitle
     property color colorBannerText
+    property color colorLinkText
 
     // Subtitless
     property color colorSubtitle
@@ -108,6 +109,7 @@ Item
             PropertyChanges { target: styleSheet; colorTitle: "#32324D" }
             PropertyChanges { target: styleSheet; colorMatteTitle: "#545460" }
             PropertyChanges { target: styleSheet; colorBannerText: "#F6F6F9" }
+            PropertyChanges { target: styleSheet; colorLinkText: "#246CA0" }
 
             // Subtitless
             PropertyChanges { target: styleSheet; colorSubtitle: "#8A8AA0" }
@@ -185,6 +187,7 @@ Item
             PropertyChanges { target: styleSheet; colorTitle: "#CBCBCB" }
             PropertyChanges { target: styleSheet; colorMatteTitle: "#B6B6C8" }
             PropertyChanges { target: styleSheet; colorBannerText: "#FFFFFF" }
+            PropertyChanges { target: styleSheet; colorLinkText: "#52b6ff" }
 
             // Subtitless
             PropertyChanges { target: styleSheet; colorSubtitle: "#E5E5EF" }

diff --git a/src/presentation/readingPage/MDictionaryPopup.qml b/src/presentation/readingPage/MDictionaryPopup.qml
@@ -212,7 +212,7 @@ Popup {
                                 color: Style.colorText
                                 font.pointSize: 13
                                 font.weight: Font.DemiBold
-                                textFormat: Text.RichText
+                                textFormat: Text.StyledText
                             }
                         }
 
@@ -243,7 +243,8 @@ Popup {
                                             wrapMode: Text.WordWrap
                                             color: Style.colorText
                                             font.pointSize: 11
-                                            textFormat: Text.RichText
+                                            textFormat: Text.StyledText
+                                            linkColor: Style.colorLinkText
                                         }
 
                                         Label {
@@ -253,7 +254,8 @@ Popup {
                                             wrapMode: Text.WordWrap
                                             color: Style.colorText
                                             font.pointSize: 11
-                                            textFormat: Text.RichText
+                                            textFormat: Text.StyledText
+                                            linkColor: Style.colorLinkText
 
                                             MouseArea {
                                                 id: mouseArea
@@ -313,7 +315,8 @@ Popup {
                                             color: Style.colorLightText
                                             font.pointSize: 10
                                             font.weight: Font.Light
-                                            textFormat: Text.RichText
+                                            textFormat: Text.StyledText
+                                            linkColor: Style.colorLinkText
                                         }
                                     }
                                 }
@@ -356,7 +359,7 @@ Popup {
                         Layout.topMargin: 4
                         text: '<a href="update" style="color: ' + Style.colorBasePurple
                               + '; text-decoration: underline;">Search online</a>'
-                        textFormat: Text.RichText
+                        textFormat: Text.StyledText
                         onLinkActivated: link => Qt.openUrlExternally(link)
                         font.pointSize: 14
                         color: Style.colorText
@@ -387,7 +390,7 @@ Popup {
         horizontalAlignment: Text.AlignRight
         text: 'Source: <a href="https://wiktionary.org" style="text-decoration: none; color: '
               + Style.colorBasePurple + ';">Wiktionary</a>'
-        textFormat: Text.RichText
+        textFormat: Text.StyledText
         font.pointSize: 9
         color: Style.colorText