Merge lp:~artmello/gallery-app/gallery-app-improve_album_editor_load into lp:gallery-app

[Arthur Mello]

Load the AlbumEditor without the animation to improve the load time

Load the AlbumEditor without the animation to improve the load time

[Bill Filler (bfiller)]

approved

review: Approve

=== removed file 'rc/qml/AlbumEditor/AlbumEditorAnimated.qml'
--- rc/qml/AlbumEditor/AlbumEditorAnimated.qml	2014-10-13 09:26:44 +0000
+++ rc/qml/AlbumEditor/AlbumEditorAnimated.qml	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Gallery 1.0
-import Ubuntu.Components 0.1
-
-/*! @brief AlbumEditorAnimated opens the editor for the album
-  *
-  * The album editor enable to edit the title, sub-title and the cover image.
-  * Set the album and origin properties befor calling open()
-  * The first call of open() is slow, as the lazy loading is used for the album editor which is a
-  * big component.
-  */
-Item {
-    id: root
-
-    // True if the album editor is opened
-    property bool isOpen: false
-    /// The album to be shown in that editor
-    property Album album
-    /// Origin (rectangle) where this view is animated from when calling open()
-    /// And where it is animated to when this view is closed
-    property variant origin
-    /// The preview item that was used to open the view, or null, if it was opend another way
-    /// This item will be hidden when this view is opened. And shown again after closing this view
-    property Item previewItem: null
-    /// Is true if the opne or close animation is running
-    property bool animationRunning: loader_albumEditor.status === Loader.Ready ?
-                                        loader_albumEditor.item.albumEditorTransition.animationRunning ||
-                                        loader_albumEditor.item.albumEditor.animationRunning
-                                      : false
-
-    /// Opens the editor for the album with an animation
-    function open() {
-        loader_albumEditor.load()
-        loader_albumEditor.item.albumEditor.album = album
-        loader_albumEditor.item.albumEditorTransition.enterEditor(root.album, root.origin)
-        if (previewItem)
-            previewItem.visible = false
-        isOpen = true;
-    }
-
-    Component {
-        id: component_EditorItem
-        Item {
-            property alias albumEditorTransition: inner_albumEditorTransition
-            property alias albumEditor: inner_albumEditor
-
-            AlbumEditor {
-                id: inner_albumEditor
-                anchors.fill: parent
-                visible: false
-
-                onMediaSelectorHidden: {
-                    albumEditorCheckerboardHidden(newScrollPos);
-                }
-
-                onCloseRequested: {
-                    root.isOpen = false;
-                    if (album && album.newAlbum && album.containedCount == 0) {
-                        inner_albumEditor.model.destroyAlbum(album);
-                        album = null;
-                    }
-                    if (album) {
-                        inner_albumEditorTransition.exitEditor(album, root.origin);
-                    } else {
-                        inner_albumEditorTransition.exitEditor(null, null);
-                    }
-                }
-            }
-
-            AlbumEditorTransition {
-                id: inner_albumEditorTransition
-                anchors.fill: parent
-                backgroundGlass: inner_albumEditor.backgroundGlass
-                editor: inner_albumEditor
-                onEditorExited: {
-                    if (previewItem)
-                        previewItem.visible = true;
-                    loader_albumEditor.sourceComponent = undefined;
-                }
-            }
-        }
-    }
-    Loader {
-        id: loader_albumEditor
-        anchors.fill: parent
-
-        function load() {
-            if (sourceComponent == undefined) {
-                sourceComponent = component_EditorItem
-            }
-        }
-    }
-
-    MouseArea {
-        id: transitionClickBlocker
-        anchors.fill: parent
-        enabled: root.animationRunning
-    }
-}
 
=== removed file 'rc/qml/AlbumEditor/AlbumEditorTransition.qml'
--- rc/qml/AlbumEditor/AlbumEditorTransition.qml	2014-05-20 09:34:10 +0000
+++ rc/qml/AlbumEditor/AlbumEditorTransition.qml	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Charles Lindsay <[e-mail]>
- */
-
-import QtQuick 2.0
-import "../AlbumViewer"
-import "../Utility"
-
-// Provides a smooth transition between the album overview and album editor.
-Item {
-    id: albumEditorTransition
-
-    /*!
-    */
-    signal editorEntered(variant album)
-    /*!
-    */
-    signal editorExited(variant album)
-
-    /*!
-    */
-    property alias album: thumbnail.album
-
-    /*!
-    */
-    property Rectangle backgroundGlass
-    /*!
-    */
-    property AlbumEditor editor
-
-    /*!
-    */
-    property int duration: 500
-
-    // Read-only
-    /*!
-    */
-    property bool animationRunning: enterFadeAnimation.running ||
-                                    exitFadeAnimation.running || enterExpandAnimation.running ||
-                                    exitExpandAnimation.running;
-
-    /*!
-    */
-    function enterEditor(album, thumbnailRect) {
-        albumEditorTransition.album = album || null;
-
-        if (thumbnailRect) {
-            thumbnail.x = thumbnailRect.x;
-            thumbnail.y = thumbnailRect.y;
-            thumbnail.width = thumbnailRect.width;
-            thumbnail.height = thumbnailRect.height;
-
-            overview.pushPage(editor);
-            enterExpandAnimation.restart();
-        } else {
-            overview.pushPage(editor);
-            enterFadeAnimation.restart();
-        }
-    }
-
-    /*!
-    */
-    function exitEditor(album, thumbnailRect) {
-        albumEditorTransition.album = album || null;
-
-        if (thumbnailRect) {
-            exitExpandAnimation.thumbnailRect = thumbnailRect;
-
-            thumbnail.x = editor.editorRect.x;
-            thumbnail.y = editor.editorRect.y;
-            thumbnail.width = editor.editorRect.width;
-            thumbnail.height = editor.editorRect.height;
-
-            overview.popPage();
-            exitExpandAnimation.restart();
-        } else {
-            overview.popPage();
-            exitFadeAnimation.restart();
-        }
-    }
-
-    // internal
-    /*!
-    */
-    function onExitFinished() {
-        editorExited(album);
-        album = null;
-    }
-
-    AlbumOpener {
-        id: thumbnail
-
-        isPreview: true
-        contentHasPreviewFrame: true
-
-        visible: false
-        load: visible
-    }
-
-    ParallelAnimation {
-        id: enterFadeAnimation
-
-        onRunningChanged: {
-            if (!running)
-                editorEntered(albumEditorTransition.album);
-        }
-
-        FadeInAnimation {
-            target: backgroundGlass
-            endOpacity: 0.75
-            duration: albumEditorTransition.duration
-        }
-
-        FadeInAnimation {
-            target: editor
-            duration: albumEditorTransition.duration
-        }
-    }
-
-    ParallelAnimation {
-        id: exitFadeAnimation
-
-        onRunningChanged: {
-            if (!running)
-                onExitFinished();
-        }
-
-        FadeOutAnimation {
-            target: backgroundGlass
-            startOpacity: 0.75
-            duration: albumEditorTransition.duration
-        }
-
-        FadeOutAnimation {
-            target: editor
-            duration: albumEditorTransition.duration
-        }
-    }
-
-    SequentialAnimation {
-        id: enterExpandAnimation
-
-        onRunningChanged: {
-            if (!running)
-                editorEntered(albumEditorTransition.album);
-        }
-
-        PropertyAction { target: thumbnail; property: "visible"; value: true; }
-        PropertyAction { target: editor; property: "showAlbumCover"; value: false; }
-
-        ParallelAnimation {
-            ExpandAnimation {
-                target: thumbnail
-                endX: editor.editorRect.x
-                endY: editor.editorRect.y
-                endWidth: editor.editorRect.width
-                endHeight: editor.editorRect.height
-                duration: albumEditorTransition.duration
-                easingType: Easing.OutQuad
-            }
-
-            NumberAnimation {
-                target: thumbnail
-                property: "openFraction"
-                from: (!album || album.closed ? 0 : 1)
-                to: 0
-                duration: albumEditorTransition.duration
-                easing.type: Easing.OutQuad
-            }
-
-            FadeInAnimation {
-                target: backgroundGlass
-                endOpacity: 0.75
-                duration: albumEditorTransition.duration
-            }
-        }
-
-        PropertyAction { target: thumbnail; property: "visible"; value: false; }
-        PropertyAction { target: editor; property: "showAlbumCover"; value: true; }
-    }
-
-    SequentialAnimation {
-        id: exitExpandAnimation
-
-        property variant thumbnailRect: {"x": 0, "y": 0, "width": 0, "height": 0}
-
-        onRunningChanged: {
-            if (!running)
-                onExitFinished();
-        }
-
-        PropertyAction { target: editor; property: "visible"; value: false; }
-        PropertyAction { target: thumbnail; property: "visible"; value: true; }
-
-        ParallelAnimation {
-            ExpandAnimation {
-                target: thumbnail
-                endX: exitExpandAnimation.thumbnailRect.x
-                endY: exitExpandAnimation.thumbnailRect.y
-                endWidth: exitExpandAnimation.thumbnailRect.width
-                endHeight: exitExpandAnimation.thumbnailRect.height
-                duration: albumEditorTransition.duration
-                easingType: Easing.OutQuad
-            }
-
-            NumberAnimation {
-                target: thumbnail
-                property: "openFraction"
-                from: 0
-                to: (!album || album.closed ? 0 : 1)
-                duration: albumEditorTransition.duration
-                easing.type: Easing.InQuad
-            }
-
-            FadeOutAnimation {
-                target: backgroundGlass
-                startOpacity: 0.75
-                duration: albumEditorTransition.duration
-            }
-        }
-
-        PropertyAction { target: thumbnail; property: "visible"; value: false; }
-    }
-}
 
=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2014-11-06 14:43:21 +0000
+++ rc/qml/AlbumsOverview.qml	2014-12-09 03:00:14 +0000
@@ -130,7 +130,6 @@
         onLongPressed: {
             albumMenu.album = album
             albumMenu.caller = content
-            albumEditor.previewItem = thisDelegate
             albumMenu.show()
         }
 
@@ -209,8 +208,7 @@
 
         onEditClicked: {
             albumEditor.album = album
-            albumEditor.origin = root.getRectOfAlbumPreview(album, albumEditor)
-            albumEditor.open()
+            overview.pushPage(albumEditor)
         }
 
         onDeleteClicked: {
@@ -242,9 +240,7 @@
                     albumCollectionModel.addOrphan(album);
 
                     albumEditor.album = album;
-                    albumEditor.origin = null;
-                    albumEditor.previewItem = null;
-                    albumEditor.open();
+                    overview.pushPage(albumEditor);
                 }
             }
             text: i18n.tr("Add") // text in toolbar
@@ -271,9 +267,13 @@
         onQuickCloseRequested: isAlbumOpened = false;
     }
 
-    AlbumEditorAnimated {
+    AlbumEditor {
         id: albumEditor
-        objectName: "albumEditorAnimated"
+        objectName: "albumEditor"
         anchors.fill: parent
+        visible: false 
+
+        onMediaSelectorHidden: albumEditorCheckerboardHidden(newScrollPos);
+        onCloseRequested: overview.popPage();
     }
 }