From da9f68208120a27b10f94e4e3474cf05c0092df9 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava.monich@jolla.com>
Date: Sat, 13 Nov 2021 21:09:07 +0200
Subject: [PATCH] [app] Tweaked book opening and closing animations

---
 app/qml/BooksBookView.qml    | 4 ++--
 app/qml/BooksMainPage.qml    | 7 ++++---
 app/qml/BooksStorageView.qml | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/qml/BooksBookView.qml b/app/qml/BooksBookView.qml
index bf6ccdd..b2e5934 100644
--- a/app/qml/BooksBookView.qml
+++ b/app/qml/BooksBookView.qml
@@ -63,7 +63,7 @@ Item {
         { pager: true,  page: true,  title: true,  tools: true  }
     ]
 
-    property alias viewInteractive: bookView.interactive
+    property bool viewInteractive: bookView.interactive && !loading
     property alias pullDownMenu: menu
     property alias loadingBackgroundOpacity: loadingBackground.opacity
     property bool isCurrentView
@@ -147,7 +147,7 @@ Item {
     PullDownMenu {
         id: menu
 
-        visible: isCurrentView && Settings.bookPullDownMenu
+        visible: isCurrentView && !loading && Settings.bookPullDownMenu
 
         property real backToLibrary
 
diff --git a/app/qml/BooksMainPage.qml b/app/qml/BooksMainPage.qml
index c9ae8b8..0884750 100644
--- a/app/qml/BooksMainPage.qml
+++ b/app/qml/BooksMainPage.qml
@@ -1,6 +1,6 @@
 /*
-  Copyright (C) 2015-2020 Jolla Ltd.
-  Copyright (C) 2015-2020 Slava Monich <slava.monich@jolla.com>
+  Copyright (C) 2015-2021 Jolla Ltd.
+  Copyright (C) 2015-2021 Slava Monich <slava.monich@jolla.com>
 
   You may use this file under the terms of BSD license as follows:
 
@@ -85,6 +85,7 @@ Page {
             width: page.width
             height: page.height
             y: Settings.currentBook ? flickable.contentY : 0
+            viewScale: 0.9 + 0.1 * opacity
             pageActive: page.pageActive
             isCurrentView: currentView === storageView
             opacity: Settings.currentBook ? ((y > fadeInThreshold) ? 1 : (y > 0) ? y/fadeInThreshold : 0) : 1
@@ -139,7 +140,7 @@ Page {
             property: "contentY"
             to: page.height
             duration: 150
-            easing.type: Easing.InQuad
+            easing.type: Easing.Linear
         }
         ScriptAction {
             script: {
diff --git a/app/qml/BooksStorageView.qml b/app/qml/BooksStorageView.qml
index a978337..2dae88f 100644
--- a/app/qml/BooksStorageView.qml
+++ b/app/qml/BooksStorageView.qml
@@ -39,6 +39,7 @@ Item {
     id: storageView
 
     property alias viewInteractive: storageList.interactive
+    property alias viewScale: storageList.scale
     property alias pullDownMenu: menu
     property alias isCurrentView: menu.visible
     property bool pageActive
@@ -189,7 +190,9 @@ Item {
     SilicaListView {
         id: storageList
 
-        anchors.fill: parent
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
         model: storageModel
         flickDeceleration: maximumFlickVelocity
         orientation: ListView.Horizontal
@@ -235,6 +238,7 @@ Item {
             device: model.device
             removableStorage: model.removable
             shelfIndex: model.index
+            view.clip: storageList.scale == 1
             onStartEditing: storageView.editMode = true
             onStopEditing: storageView.editMode = false
             onScrollLeft: storageList.scrollOnePageLeft()