added simple drawer logic

examples/mvvmquick/SampleQuick/SampleView.qml

@@ -11,9 +11,11 @@ Page {
 	property SampleViewModel viewModel: null
 
 	header: ActionBar {
-		showMenuButton: false
+		showMenuButton: true
 		title: qsTr("Sample")
 
+		onMenuButtonClicked: QuickPresenter.toggleDrawer()
+
 		moreMenu: Menu {
 			MenuItem {
 				text: qsTr("Another Input")

src/imports/mvvmquick/DialogPresenter.qml

@@ -28,79 +28,71 @@ QtObject {
 	}
 
 	property var _popups: []
-	property Component _msgBoxComponent: Component {
+	property Component _msgBoxComponent: MsgBox {
-		MsgBox {
+		id: __msgBox
-			id: __msgBox
+
-
+		onClosed: {
-			onClosed: {
+			var index = _popups.indexOf(__msgBox);
-				var index = _popups.indexOf(__msgBox);
+			if(index > -1) {
-				if(index > -1) {
+				__msgBox.destroy();
-					__msgBox.destroy();
+				_dialogPresenter._popups.splice(index, 1);
-					_dialogPresenter._popups.splice(index, 1);
-				}
 			}
+		}
 
-			Component.onCompleted: {
+		Component.onCompleted: {
-				_popups.push(__msgBox)
+			_popups.push(__msgBox)
-				__msgBox.open()
+			__msgBox.open()
-			}
 		}
 	}
 
-	property Component _inputComponent: Component {
+	property Component _inputComponent: InputDialog {
-		InputDialog {
+		id: __input
-			id: __input
 
-			onClosed: {
+		onClosed: {
-				var index = _popups.indexOf(__input);
+			var index = _popups.indexOf(__input);
-				if(index > -1) {
+			if(index > -1) {
-					__input.destroy();
+				__input.destroy();
-					_dialogPresenter._popups.splice(index, 1);
+				_dialogPresenter._popups.splice(index, 1);
-				}
 			}
+		}
 
-			Component.onCompleted: {
+		Component.onCompleted: {
-				_popups.push(__input)
+			_popups.push(__input)
-				__input.open()
+			__input.open()
-			}
 		}
 	}
 
-	property Component _fileComponent: Component {
+	property Component _fileComponent: FileDialog {
-		FileDialog {
+		id: __file
-			id: __file
 
-			onClosed: {
+		onClosed: {
-				var index = _popups.indexOf(__file);
+			var index = _popups.indexOf(__file);
-				if(index > -1) {
+			if(index > -1) {
-					__file.destroy();
+				__file.destroy();
-					_dialogPresenter._popups.splice(index, 1);
+				_dialogPresenter._popups.splice(index, 1);
-				}
 			}
+		}
 
-			Component.onCompleted: {
+		Component.onCompleted: {
-				_popups.push(__file)
+			_popups.push(__file)
-				__file.open()
+			__file.open()
-			}
 		}
 	}
 
-	property Component _folderComponent: Component {
+	property Component _folderComponent: FolderDialog {
-		FolderDialog {
+		id: __folder
-			id: __folder
 
-			onClosed: {
+		onClosed: {
-				var index = _popups.indexOf(__folder);
+			var index = _popups.indexOf(__folder);
-				if(index > -1) {
+			if(index > -1) {
-					__folder.destroy();
+				__folder.destroy();
-					_dialogPresenter._popups.splice(index, 1);
+				_dialogPresenter._popups.splice(index, 1);
-				}
 			}
+		}
 
-			Component.onCompleted: {
+		Component.onCompleted: {
-				_popups.push(__folder)
+			_popups.push(__folder)
-				__folder.open()
+			__folder.open()
-			}
 		}
 	}
 

src/imports/mvvmquick/PresentingDrawer.qml

@@ -0,0 +1,39 @@
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+
+Drawer {
+	id: _presentingDrawer
+
+	width: Math.min(300, parent.width - 24);
+	height: parent.height - y
+
+	property Item _mainChild: null
+
+	function toggle() {
+		if(visible)
+			close();
+		else
+			open();
+	}
+
+	function presentDrawerContent(item) {
+		if(_mainChild)
+			_mainChild.destroy();
+		item.parent = _presentingDrawer; //TODO test
+		_mainChild = item;
+		return true;
+	}
+
+	function closeAction() {
+		if(_mainChild && typeof _mainChild.closeAction == "function") {
+			if(_mainChild.closeAction())
+				return true;
+		}
+
+		if(visible) {
+			close();
+			return true;
+		} else
+			return false;
+	}
+}

src/imports/mvvmquick/PresentingStackView.qml

@@ -8,10 +8,17 @@ StackView {
 	property int opDuration: 75
 
 	function presentItem(item) {
-		if(push(item))
+		if(item.presentAsRoot) { //TODO document
-			return true;
+			if(push(item))
-		else
+				return true;
-			return false;
+			else
+				return false;
+		} else {
+			if(replace(null, item))
+				return true;
+			else
+				return false;
+		}
 	}
 
 	function safePop(item, operation) {

src/imports/mvvmquick/QtMvvmApp.qml

@@ -8,6 +8,8 @@ ApplicationWindow {
 	width: 360
 	height: 520
 
+	readonly property alias drawer: _drawerLoader.item
+
 	PresenterProgress {
 		id: _rootProgress
 		z: _rootStack.empty ? 10 : -10
@@ -18,6 +20,15 @@ ApplicationWindow {
 		anchors.fill: parent
 	}
 
+	Loader {
+		id: _drawerLoader
+		active: false
+		asynchronous: false
+		sourceComponent: PresentingDrawer {
+			id: _rootDrawer
+		}
+	}
+
 	PopupPresenter {
 		id: _rootPopup
 		rootItem: _root.contentItem
@@ -29,6 +40,9 @@ ApplicationWindow {
 	}
 
 	function presentDrawerContent(item) {
+		if(!_drawerLoader.item)
+			_drawerLoader.active = true;
+		_drawerLoader.item.presentDrawerContent(item);
 		return false
 	}
 
@@ -44,11 +58,20 @@ ApplicationWindow {
 		return _rootDialogs.showDialog(config, result);
 	}
 
+	function toggleDrawer() {
+		if(_drawerLoader.item)
+			_drawerLoader.item.toggle();
+		else
+			console.warn("No drawer like view active. Cannot toggle drawer");
+	}
+
 	Component.onCompleted: QuickPresenter.qmlPresenter = _root
 
 	onClosing: {
 		var closed = false;
 
+		if(!closed && _drawerLoader.item)
+			closed = _drawerLoader.item.closeAction();
 		if(!closed)
 			closed = _rootDialogs.closeAction();
 		if(!closed)

src/imports/mvvmquick/mvvmquick.pro

@@ -25,7 +25,11 @@ QML_FILES += \
 	TintIcon.qml \
 	MsgBoxBase.qml \
 	MsgBox.qml \
-	InputDialog.qml
+	InputDialog.qml \
+	PresentingDrawer.qml
+
+RESOURCES += \
+	qtmvvmquick_plugin.qrc
 
 OTHER_FILES += qmldir
 
@@ -53,6 +57,3 @@ generate_qmltypes {
 	mfirst.depends += qmltypes
 	QMAKE_EXTRA_TARGETS += mfirst
 }
-
-RESOURCES += \
-	qtmvvmquick_plugin.qrc

src/imports/mvvmquick/plugins.qmltypes

@@ -70,6 +70,7 @@ Module {
             name: "inputViewFactoryChanged"
             Parameter { name: "inputViewFactory"; type: "InputViewFactory"; isPointer: true }
         }
+        Method { name: "toggleDrawer" }
         Method {
             name: "mimeTypeFilters"
             type: "QStringList"

src/imports/mvvmquick/qmldir

@@ -12,5 +12,6 @@ PresenterProgress 1.0 PresenterProgress.qml
 PresentingStackView 1.0 PresentingStackView.qml
 PopupPresenter 1.0 PopupPresenter.qml
 DialogPresenter 1.0 DialogPresenter.qml
+PresentingDrawer 1.0 PresentingDrawer.qml
 
 QtMvvmApp 1.0 QtMvvmApp.qml

src/imports/mvvmquick/qqmlquickpresenter.cpp

@@ -54,6 +54,16 @@ QStringList QQmlQuickPresenter::mimeTypeFilters(const QStringList &mimeTypes) co
 	return filters;
 }
 
+void QQmlQuickPresenter::toggleDrawer()
+{
+	if(!_qmlPresenter) {
+		qmlWarning(this).space() << "No QML-Presenter registered! Unable to toggle drawer";
+		return;
+	}
+
+	QMetaObject::invokeMethod(_qmlPresenter, "toggleDrawer");
+}
+
 void QQmlQuickPresenter::present(ViewModel *viewModel, const QVariantHash &params, const QUrl &viewUrl, QPointer<ViewModel> parent)
 {
 	auto component = _componentCache.object(viewUrl);

src/imports/mvvmquick/qqmlquickpresenter.h

@@ -40,6 +40,9 @@ public:
 
 	Q_INVOKABLE QStringList mimeTypeFilters(const QStringList &mimeTypes) const;
 
+public Q_SLOTS:
+	void toggleDrawer();
+
 Q_SIGNALS:
 	void qmlPresenterChanged(QObject* qmlPresenter);
 	void viewLoadingChanged(bool viewLoading);