camera-app

Merge lp:~fboucault/camera-app/camera-app-multi_selection into lp:camera-app

camera-app-multi_selection
Merge into trunk

Proposed by Florian Boucault on 2014-12-02

Status:	Merged
Approved by:	Bill Filler on 2014-12-03
Approved revision:	429
Merged at revision:	434
Proposed branch:	lp:~fboucault/camera-app/camera-app-multi_selection
Merge into:	lp:camera-app
Diff against target:	244 lines (+76/-72) 3 files modified GalleryView.qml (+7/-68) GalleryViewHeader.qml (+2/-2) PhotogridView.qml (+67/-2)
To merge this branch:	bzr merge lp:~fboucault/camera-app/camera-app-multi_selection
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-12-02	Approve on 2014-12-03
PS Jenkins bot	continuous-integration	2014-12-02	Needs Fixing on 2014-12-03
Florian Boucault			Pending
Review via email: mp+243385@code.launchpad.net

This proposal supersedes a proposal from 2014-10-31.

Commit message

Add support to multi selection on grid view when triggered by the user

Description of the change

Add support to multi selection on grid view when triggered by the user

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-31: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/301/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-04: Posted in a previous version of this proposal

Merge has conflicts

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-04: Posted in a previous version of this proposal

Share and delete dialogs seem to be copy/paste code from elsewhere?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-05: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/304/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-12: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/305/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-17: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/306/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-17: Posted in a previous version of this proposal

singleSelectionOnly needs to be set to false when activating multi selection by long pressing a photo.

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-17: Posted in a previous version of this proposal

What was the point of not having the entire thumbnail area being selectable, ie. tapping anywhere in a photo thumbnail while in multi select mode to add/remove the photo from the selection? I can't remember.

Revision history for this message

Arthur Mello (artmello) wrote on 2014-11-17: Posted in a previous version of this proposal

> What was the point of not having the entire thumbnail area being selectable,
> ie. tapping anywhere in a photo thumbnail while in multi select mode to
> add/remove the photo from the selection? I can't remember.

We discussed during the sprint that having the option to view the full photo and not only the thumbnail during a multi selection would be a good feature. But we didn't have a final word if the small check square would be the best way to set a photo as selected.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-18: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/311/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-18: Posted in a previous version of this proposal

Looks good now, thanks.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-24: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/316/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-11-24: Posted in a previous version of this proposal

I found a few problems with this MR in testing:

1) Long pressing an image causes the Share/Delete menu to be briefly shown then hidden
2) Select two images, then tap on a third one to view it. When you return to selection mode the previous selections are no longer selected as they should be. Then you can only single select from that point.
3) There should be a "select all" toggle button on the toolbar that toggles select all/select none. See address-book-app. This should perform the same way.
4) I found it's too easy to accidentally tap the photo to open it when I was trying to check the selection button. Maybe leave the visual size of the selection box the same but make a bigger touch area around such that we can increase the hit size without having to make the box bigger visually.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-24: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/317/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-26: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/320/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Arthur Mello (artmello) wrote on 2014-11-26: Posted in a previous version of this proposal

All the issues commented by Bill seems to be fixed based on the tests I did on the device. Related with the issue #4 I increased the MouseArea for toggling photo selection to be the full top right quarter of the thumbnail (but did not increased the selection icon itself). Please, let me know if that fix the problem.

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-26: Posted in a previous version of this proposal

It looks like it's working fine now. Code is as expected.

review: Approve

Revision history for this message

Bill Filler (bfiller) wrote on 2014-12-01: Posted in a previous version of this proposal

works well, but found one small issue. The share action should be disabled if multiple pictures selected as sharing is currently only supported for a single picture in the clients that support it (messaging-app and facebook)

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-02:

FAILED: Continuous integration, rev:427
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~fboucault/camera-app/camera-app-multi_selection/+merge/243385/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/327/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-12-02:

Found another issue:
- have at least 3 pictures in photo roll
- enter selection mode
- select the first two pictures
- click on the third picture which opens it fully
- now perform an action on using the toolbar, either Share or Delete

Expected result:
the current picture which is open should be shared or deleted

Actual result:
the selections from selection view are operated on (shared or deleted)

review: Needs Fixing

lp:~fboucault/camera-app/camera-app-multi_selection updated on 2014-12-03

428. By Florian Boucault on 2014-12-03: When in slideshow view and selection mode, make sure that actions correspond to the presently shown photo instead of to the current selection.
429. By Florian Boucault on 2014-12-03: Fixed binding loop

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/333/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-12-03:

happroved

review: Approve

lp:~fboucault/camera-app/camera-app-multi_selection updated on 2014-12-05

430. By Florian Boucault on 2014-12-05: Merged from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Florian Boucault

Ubuntu Phablet Team

deaunapaul

 === modified file 'GalleryView.qml'
 --- GalleryView.qml	2014-12-02 12:00:05 +0000
 +++ GalleryView.qml	2014-12-05 18:44:25 +0000
@@ -16,7 +16,6 @@
  import QtQuick 2.2
  import Ubuntu.Components 1.1
--import Ubuntu.Components.Popups 1.0
  import Ubuntu.Content 0.1
  import CameraApp 0.1
  import "MimeTypeMapper.js" as MimeTypeMapper
@@ -36,26 +35,6 @@
          singleSelectionOnly: main.transfer.selectionType === ContentTransfer.Single
+     }
--    property list<Action> userSelectionActions: [
--        Action {
--            text: i18n.tr("Share")
--            iconName: "share"
--            enabled: model.selectedFiles.length <= 1
--            onTriggered: {
--                if (model.selectedFiles.length > 0)
--                    PopupUtils.open(sharePopoverComponent)
--            }
--        },
--        Action {
--            text: i18n.tr("Delete")
--            iconName: "delete"
--            onTriggered: {
--                if (model.selectedFiles.length > 0)
--                    PopupUtils.open(deleteDialogComponent);
--            }
--        }
--    ]
--
      property bool gridMode: false
      property bool showLastPhotoTakenPending: false
@@ -97,32 +76,34 @@
              id: photogridView
              anchors.fill: parent
              headerHeight: header.height
++            userSelectionMode: galleryView.userSelectionMode
              model: galleryView.model
              visible: opacity != 0.0
              inView: galleryView.inView
--            inSelectionMode: main.contentExportMode || userSelectionMode
++            inSelectionMode: main.contentExportMode || galleryView.userSelectionMode
              onPhotoClicked: {
                  slideshowView.showPhotoAtIndex(index);
                  galleryView.gridMode = false;
+             }
              onPhotoPressAndHold: {
--                if (!userSelectionMode) {
--                    userSelectionMode = true;
++                if (!galleryView.userSelectionMode) {
++                    galleryView.userSelectionMode = true;
                      model.singleSelectionOnly = false;
                      model.toggleSelected(index);
+                 }
+             }
              onPhotoSelectionAreaClicked: {
--                if (main.contentExportMode || userSelectionMode)
++                if (main.contentExportMode || galleryView.userSelectionMode)
                      model.toggleSelected(index);
+             }
++            onExitUserSelectionMode: galleryView.exitUserSelectionMode()
+         }
          // FIXME: it would be better to use the standard header from the toolkit
          GalleryViewHeader {
              id: header
--            actions: userSelectionMode ? userSelectionActions : currentView.actions
++            actions: currentView.actions
              gridMode: galleryView.gridMode || main.contentExportMode
              validationVisible: main.contentExportMode && model.selectedFiles.length > 0
              userSelectionMode: galleryView.userSelectionMode
@@ -239,46 +220,4 @@
              UbuntuNumberAnimation { properties: "scale,opacity"; duration: UbuntuAnimation.SnapDuration }
+         }
+     ]
--
--    Component {
--        id: contentItemComp
--        ContentItem {}
--    }
--
--    Component {
--        id: sharePopoverComponent
--
--        SharePopover {
--            id: sharePopover
--
--            onContentPeerSelected: galleryView.exitUserSelectionMode();
--
--            transferContentType: MimeTypeMapper.mimeTypeToContentType(model.get(model.selectedFiles[0], "fileType"));
--            transferItems: model.selectedFiles.map(function(row) {
--                             return contentItemComp.createObject(parent, {"url": model.get(row, "filePath")});
--                           })
--        }
--    }
--
--    Component {
--        id: deleteDialogComponent
--
--        DeleteDialog {
--            id: deleteDialog
--
--            FileOperations {
--                id: fileOperations
--            }
--
--            onDeleteFiles: {
--                for (var i=model.selectedFiles.length-1; i>=0; i--) {
--                    var currentFilePath = model.get(model.selectedFiles[i], "filePath");
--                    model.toggleSelected(model.selectedFiles[i])
--                    fileOperations.remove(currentFilePath);
--                }
--
--                galleryView.exitUserSelectionMode();
--            }
--        }
--    }
+ }
 === modified file 'GalleryViewHeader.qml'
 --- GalleryViewHeader.qml	2014-12-02 12:00:05 +0000
 +++ GalleryViewHeader.qml	2014-12-05 18:44:25 +0000
@@ -132,7 +132,7 @@
              right: parent.right
+         }
          width: units.gu(20)
--        height: childrenRect.height
++        height: actionsColumn.height
          clip: actionsColumn.y != 0
          visible: false
@@ -169,7 +169,7 @@
+             }
              Repeater {
--                model: actionsDrawer.actions
++                model: actionsDrawer.actions.length > 0 ? actionsDrawer.actions : 0
                  delegate: AbstractButton {
                      id: actionButton
                      objectName: "actionButton" + label.text
 === modified file 'PhotogridView.qml'
 --- PhotogridView.qml	2014-11-26 15:21:05 +0000
 +++ PhotogridView.qml	2014-12-05 18:44:25 +0000
@@ -15,9 +15,11 @@
   */
  import QtQuick 2.2
--import Ubuntu.Components 1.1
++import Ubuntu.Components 1.0
++import Ubuntu.Components.Popups 1.0
  import Ubuntu.Thumbnailer 0.1
  import Ubuntu.Content 0.1
++import CameraApp 0.1
  import "MimeTypeMapper.js" as MimeTypeMapper
  Item {
@@ -28,10 +30,31 @@
      signal photoClicked(int index)
      signal photoPressAndHold(int index)
      signal photoSelectionAreaClicked(int index)
++    signal exitUserSelectionMode
      property real headerHeight
      property bool inView
      property bool inSelectionMode
--    property list<Action> actions
++    property bool userSelectionMode: false
++    property var actions: userSelectionMode ? userSelectionActions : []
++    property list<Action> userSelectionActions: [
++        Action {
++            text: i18n.tr("Share")
++            iconName: "share"
++            enabled: model.selectedFiles.length <= 1
++            onTriggered: {
++                if (model.selectedFiles.length > 0)
++                    PopupUtils.open(sharePopoverComponent)
++            }
++        },
++        Action {
++            text: i18n.tr("Delete")
++            iconName: "delete"
++            onTriggered: {
++                if (model.selectedFiles.length > 0)
++                    PopupUtils.open(deleteDialogComponent);
++            }
++        }
++    ]
      function showPhotoAtIndex(index) {
          gridView.positionViewAtIndex(index, GridView.Center);
@@ -155,4 +178,46 @@
+             }
+         }
+     }
++
++    Component {
++        id: contentItemComp
++        ContentItem {}
++    }
++
++    Component {
++        id: sharePopoverComponent
++
++        SharePopover {
++            id: sharePopover
++
++            onContentPeerSelected: photogridView.exitUserSelectionMode();
++
++            transferContentType: MimeTypeMapper.mimeTypeToContentType(model.get(model.selectedFiles[0], "fileType"));
++            transferItems: model.selectedFiles.map(function(row) {
++                             return contentItemComp.createObject(parent, {"url": model.get(row, "filePath")});
++                           })
++        }
++    }
++
++    Component {
++        id: deleteDialogComponent
++
++        DeleteDialog {
++            id: deleteDialog
++
++            FileOperations {
++                id: fileOperations
++            }
++
++            onDeleteFiles: {
++                for (var i=model.selectedFiles.length-1; i>=0; i--) {
++                    var currentFilePath = model.get(model.selectedFiles[i], "filePath");
++                    model.toggleSelected(model.selectedFiles[i])
++                    fileOperations.remove(currentFilePath);
++                }
++
++                photogridView.exitUserSelectionMode();
++            }
++        }
++    }
+ }