Merge branch 'dev/develop'

Librum-Reader · Sep 18, 2023 · ba62c3d · ba62c3d
2 parents ff009db + 5709f8d
commit ba62c3d
Show file tree

Hide file tree

Showing 108 changed files with 5,285 additions and 3,042 deletions.
diff --git a/app_info.json b/app_info.json
@@ -1,5 +1,5 @@
 {
-    "currentVersion": "0.7.0",
+    "currentVersion": "0.8.0",
     "applicationName": "Librum",
     "companyName": "Librum-Reader",
     "website": "https://librumreader.com",

diff --git a/com.librumreader.librum.metainfo.xml b/com.librumreader.librum.metainfo.xml
@@ -22,6 +22,8 @@
   <launchable type="desktop-id">librum.desktop</launchable>
 
   <releases>
+    <release version="0.8.0" date="2023-09-18">
+    </release>
     <release version="0.7.0" date="2023-09-04">
     </release>
     <release version="0.6.3" date="2023-08-20">

diff --git a/resources/data/default_appearance_settings.json b/resources/data/default_appearance_settings.json
@@ -9,5 +9,12 @@
     "DefaultZoom": "150",
     "SmoothScrolling": "false",
     "LoopAfterLastPage": "false",
-    "CursorMode": "Hidden after delay"
+    "CursorMode": "Hidden after delay",
+    "DefaultHighlightColorName": "HighlightColorA",
+    "HighlightColorA": "#F9D36B",
+    "HighlightColorB": "#7CC767",
+    "HighlightColorC": "#9877d1",
+    "HighlightColorD": "#F95C87",
+    "HighlightColorE": "#69AFF2",
+    "HighlightOpacity": "200"
 }
diff --git a/resources/data/default_shortcuts.json b/resources/data/default_shortcuts.json
@@ -17,5 +17,7 @@
     "CreateBookmarkHere": "Alt+3",
     "ToggleSpeaking": "F5",
     "ReloadApplication": "Ctrl+R",
-    "AddBook": "Ctrl+N"
+    "AddBook": "Ctrl+N",
+    "CreateHighlight": "H",
+    "RemoveHighlight": "Backspace"
 }
diff --git a/src/adapters/CMakeLists.txt b/src/adapters/CMakeLists.txt
@@ -4,32 +4,38 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 add_library(adapters
                 SHARED
                     interfaces/controllers/i_authentication_controller.hpp
-                    interfaces/controllers/i_book_controller.hpp
+                    interfaces/controllers/i_library_controller.hpp
                     interfaces/controllers/i_user_controller.hpp
                     interfaces/controllers/i_settings_controller.hpp
                     interfaces/persistance/i_user_storage_access.hpp
-                    interfaces/persistance/i_book_storage_access.hpp
+                    interfaces/persistance/i_library_storage_access.hpp
                     interfaces/persistance/i_authentication_access.hpp
+                    interfaces/controllers/i_book_controller.hpp
+                    interfaces/controllers/i_page_controller.hpp
                     interfaces/persistance/i_app_info_access.hpp
                     interfaces/controllers/i_app_info_controller.hpp
 
                     controllers/authentication_controller.cpp
                     controllers/authentication_controller.hpp
-                    controllers/book_controller.cpp
-                    controllers/book_controller.hpp
+                    controllers/library_controller.cpp
+                    controllers/library_controller.hpp
                     controllers/user_controller.cpp
                     controllers/user_controller.hpp
                     controllers/settings_controller.cpp
                     controllers/settings_controller.hpp
                     controllers/app_info_controller.cpp
                     controllers/app_info_controller.hpp
+                    controllers/book_controller.cpp
+                    controllers/book_controller.hpp
+                    controllers/page_controller.cpp
+                    controllers/page_controller.hpp
 
                     gateways/user_storage_gateway.cpp
                     gateways/user_storage_gateway.hpp
                     gateways/authentication_gateway.cpp
                     gateways/authentication_gateway.hpp
-                    gateways/book_storage_gateway.cpp
-                    gateways/book_storage_gateway.hpp
+                    gateways/library_storage_gateway.cpp
+                    gateways/library_storage_gateway.hpp
                     gateways/app_info_gateway.cpp
                     gateways/app_info_gateway.hpp
 
@@ -49,6 +55,8 @@ add_library(adapters
                     DTOs/register_dto.hpp
                     DTOs/book_dto.hpp
                     DTOs/tag_dto.hpp
+                    DTOs/highlight_dto.hpp
+                    DTOs/rectf_dto.hpp
 )
 
 target_compile_definitions(adapters PRIVATE ADAPTERS_LIBRARY)
@@ -79,6 +87,7 @@ target_link_libraries(adapters
                 PRIVATE
                     domain
                     application
+                    ${MUPDF_OUTPUT}
                     rapidfuzz::rapidfuzz
                     Qt6::Core
                     Qt6::Quick

diff --git a/src/adapters/DTOs/highlight_dto.hpp b/src/adapters/DTOs/highlight_dto.hpp
@@ -0,0 +1,19 @@
+#pragma once
+#include <QList>
+#include <QRectF>
+#include <QString>
+#include "adapters_export.hpp"
+#include "rectf_dto.hpp"
+
+namespace adapters::dtos
+{
+
+struct ADAPTERS_EXPORT HighlightDto
+{
+    QString uuid;
+    int pageNumber;
+    QString color;
+    QList<RectFDto> rects;
+};
+
+}  // namespace adapters::dtos
diff --git a/src/adapters/DTOs/rectf_dto.hpp b/src/adapters/DTOs/rectf_dto.hpp
@@ -0,0 +1,15 @@
+#pragma once
+#include <QString>
+#include <QRect>
+#include "adapters_export.hpp"
+
+namespace adapters::dtos
+{
+
+struct ADAPTERS_EXPORT RectFDto
+{
+    QString uuid;
+    QRectF rect;
+};
+
+}  // namespace adapters::dtos
diff --git a/src/adapters/DTOs/register_dto.hpp b/src/adapters/DTOs/register_dto.hpp
@@ -13,4 +13,4 @@ struct ADAPTERS_EXPORT RegisterDto
     QString password;
 };
 
-}  // namespace adapters::dtos
+}  // namespace adapters::dtos