Made books save and load Zoom and Y Offset

src/adapters/DTOs/book_dto.hpp

@@ -33,6 +33,8 @@ struct ADAPTERS_EXPORT BookDto
     Q_PROPERTY(QString lastOpened MEMBER lastOpened)
     Q_PROPERTY(QString coverPath MEMBER coverPath)
     Q_PROPERTY(bool downloaded MEMBER downloaded)
+    Q_PROPERTY(float zoom MEMBER zoom)
+    Q_PROPERTY(float yOffset MEMBER yOffset)
 
 public:
     QString uuid;
@@ -53,6 +55,8 @@ struct ADAPTERS_EXPORT BookDto
     QString lastOpened;
     QString coverPath;
     bool downloaded;
+    float zoom;
+    float yOffset;
     QList<TagDto> tags;
 };
 

src/adapters/controllers/library_controller.cpp

@@ -206,6 +206,12 @@ int LibraryController::updateBook(const QString& uuid,
         case MetaProperty::LastModified:
             updatedBook.setLastOpened(QDateTime::fromString(value.toString()));
             break;
+        case MetaProperty::Zoom:
+            updatedBook.setZoom(static_cast<float>(value.toDouble()));
+            break;
+        case MetaProperty::YOffset:
+            updatedBook.setYOffset(static_cast<float>(value.toDouble()));
+            break;
         case MetaProperty::Invalid:
             return static_cast<int>(BookOperationStatus::PropertyDoesNotExist);
             break;
@@ -358,6 +364,8 @@ void LibraryController::addBookMetaDataToDto(const Book& book, BookDto& bookDto)
     bookDto.bookReadingProgress = book.getBookReadingProgress();
     bookDto.coverPath = pathWithScheme;
     bookDto.downloaded = book.isDownloaded();
+    bookDto.zoom = book.getZoom();
+    bookDto.yOffset = book.getYOffset();
 
     bookDto.addedToLibrary = book.getAddedToLibrary().toLocalTime().toString(
         Book::dateTimeStringFormat);

src/adapters/interfaces/controllers/i_library_controller.hpp

@@ -46,6 +46,8 @@ class ADAPTERS_EXPORT ILibraryController : public QObject
         CurrentPage,
         AddedToLibrary,
         LastModified,
+        Zoom,
+        YOffset,
         Invalid
     };
     Q_ENUM(MetaProperty);

src/application/services/book_service.cpp

@@ -215,12 +215,14 @@ void BookService::setCurrentPage(int newCurrentPage)
 
 float BookService::getZoom() const
 {
-    return m_zoom;
+    auto book = getBook();
+    return book->getZoom();
 }
 
 void BookService::setZoom(float newZoom)
 {
-    m_zoom = newZoom;
+    auto book = getBook();
+    book->setZoom(newZoom);
 }
 
 QString BookService::getColorTheme()

src/application/services/book_service.hpp

@@ -61,7 +61,6 @@ class BookService : public IBookService
     ILibraryService* m_libraryService;
     std::unique_ptr<mupdf::FzDocument> m_fzDocument = nullptr;
     std::unique_ptr<core::utils::BookSearcher> m_bookSearcher = nullptr;
-    float m_zoom = 1;
     QUuid m_uuid;
 
     std::unique_ptr<core::TOCModel> m_TOCModel;

src/domain/entities/book.cpp

@@ -364,6 +364,26 @@ void Book::setColorTheme(const QString& newColorTheme)
     m_metaData.colorTheme = newColorTheme;
 }
 
+float Book::getZoom() const
+{
+    return m_metaData.zoom;
+}
+
+void Book::setZoom(float newZoom)
+{
+    m_metaData.zoom = newZoom;
+}
+
+float Book::getYOffset() const
+{
+    return m_metaData.yOffset;
+}
+
+void Book::setYOffset(float newYOffset)
+{
+    m_metaData.yOffset = newYOffset;
+}
+
 QString Book::getFileHash() const
 {
     return m_metaData.fileHash;
@@ -521,6 +541,10 @@ void Book::update(const Book& other)
         m_metaData.colorTheme = other.getColorTheme();
     if(m_metaData.fileHash != other.getFileHash())
         m_metaData.fileHash = other.getFileHash();
+    if(m_metaData.zoom != other.getZoom())
+        m_metaData.zoom = other.getZoom();
+    if(m_metaData.yOffset != other.getYOffset())
+        m_metaData.yOffset = other.getYOffset();
 
     if(!tagsAreTheSame(other.getTags()))
         m_tags = other.getTags();
@@ -633,6 +657,8 @@ QByteArray Book::toJson() const
         { "coverPath", getCoverPath() },
         { "colorTheme", getColorTheme() },
         { "fileHash", getFileHash() },
+        { "zoom", getZoom() },
+        { "yOffset", getYOffset() },
         { "existsOnlyOnClient", existsOnlyOnClient() },
         { "tags", serializeTags() },
         { "highlights", serializeHighlights() },
@@ -729,6 +755,8 @@ BookMetaData Book::getBookMetaDataFromJson(const QJsonObject& jsonBook)
         .coverPath = jsonBook["coverPath"].toString(),
         .colorTheme = jsonBook["colorTheme"].toString(),
         .fileHash = jsonBook["fileHash"].toString(),
+        .zoom = static_cast<float>(jsonBook["zoom"].toDouble()),
+        .yOffset = static_cast<float>(jsonBook["yOffset"].toDouble()),
     };
 
     // Specify that the dates are UTC, else Qt thinks its local time

src/domain/entities/book.hpp

@@ -83,6 +83,12 @@ class DOMAIN_EXPORT Book
     QString getColorTheme() const;
     void setColorTheme(const QString& newColorTheme);
 
+    float getZoom() const;
+    void setZoom(float newZoom);
+
+    float getYOffset() const;
+    void setYOffset(float newYOffset);
+
     QString getFileHash() const;
     void setFileHash(const QString& newFileHash);
 

src/domain/value_objects/book_meta_data.hpp

@@ -27,6 +27,8 @@ struct DOMAIN_EXPORT BookMetaData
     QString coverPath;
     QString colorTheme;
     QString fileHash;
+    float zoom = 1.0;
+    float yOffset = 0.0;
 
     bool operator==(const BookMetaData& rhs) const
     {
@@ -48,7 +50,8 @@ struct DOMAIN_EXPORT BookMetaData
                coverLastModified.toSecsSinceEpoch() ==
                    rhs.coverLastModified.toSecsSinceEpoch() &&
                hasCover == rhs.hasCover && coverPath == coverPath &&
-               colorTheme == rhs.colorTheme && fileHash == rhs.fileHash;
+               colorTheme == rhs.colorTheme && fileHash == rhs.fileHash &&
+               zoom == rhs.zoom && yOffset == rhs.yOffset;
     }
 };
 

src/presentation/readingPage/MDocumentView.qml

@@ -27,11 +27,11 @@ Pane {
                        }
 
     Component.onCompleted: {
-        BookController.zoom = SettingsController.appearanceSettings.DefaultZoom / 100
-    }
-
-    Component.onDestruction: {
-        BookController.zoom = 1
+        if (BookController.zoom === 0) {
+            zoom(SettingsController.appearanceSettings.DefaultZoom / 100)
+        } else {
+            zoom(BookController.zoom)
+        }
     }
 
     Connections {

src/presentation/readingPage/MReadingPage.qml

@@ -18,7 +18,7 @@ Page {
     }
 
     Component.onCompleted: root.forceActiveFocus()
-    Component.onDestruction: internal.saveCurrentPage()
+    Component.onDestruction: internal.saveCurrentBookState()
 
     // Save the current page every 5s automatically
     Timer {
@@ -27,7 +27,7 @@ Page {
         repeat: true
         running: true
 
-        onTriggered: internal.saveCurrentPage()
+        onTriggered: internal.saveCurrentBookState()
     }
 
     Shortcut {
@@ -363,13 +363,15 @@ Page {
             documentView.setPage(BookController.pageCount - 1)
         }
 
-        function saveCurrentPage() {
+        function saveCurrentBookState() {
             let currentPage = BookController.currentPage
             if (currentPage === internal.prevCurrentPage)
                 return
 
             var operationsMap = {}
             operationsMap[LibraryController.MetaProperty.CurrentPage] = currentPage
+            operationsMap[LibraryController.MetaProperty.Zoom] = BookController.zoom
+            operationsMap[LibraryController.MetaProperty.YOffset] = documentView.getYOffset()
             LibraryController.updateBook(Globals.selectedBook.uuid,
                                          operationsMap)
             internal.prevCurrentPage = currentPage