From 7cdef00c341e4ef80c5bc0699d4473ffccd5923f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= Date: Tue, 8 Jun 2021 10:25:36 +0800 Subject: [PATCH] add navigator demo & stack view --- doric-Qt/example/app/demo/DoricDemoBridge.cpp | 21 ++++++------ doric-Qt/example/app/main.qml | 32 ++++++++++++------- doric-Qt/example/app/qml.qrc | 1 + 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/doric-Qt/example/app/demo/DoricDemoBridge.cpp b/doric-Qt/example/app/demo/DoricDemoBridge.cpp index 354e0eb1..171b4df0 100644 --- a/doric-Qt/example/app/demo/DoricDemoBridge.cpp +++ b/doric-Qt/example/app/demo/DoricDemoBridge.cpp @@ -56,33 +56,36 @@ void DoricDemoBridge::navigate(QVariant route) { name = "ModularDemo.js"; break; case 12: - name = "NetworkDemo.js"; + name = "NavigatorDemo.js"; break; case 13: - name = "NotificationDemo.js"; + name = "NetworkDemo.js"; break; case 14: - name = "PopoverDemo.js"; + name = "NotificationDemo.js"; break; case 15: - name = "ScrollerDemo.js"; + name = "PopoverDemo.js"; break; case 16: - name = "SimpleDemo.js"; + name = "ScrollerDemo.js"; break; case 17: - name = "SliderDemo.js"; + name = "SimpleDemo.js"; break; case 18: - name = "Snake.js"; + name = "SliderDemo.js"; break; case 19: - name = "StorageDemo.js"; + name = "Snake.js"; break; case 20: - name = "SwitchDemo.js"; + name = "StorageDemo.js"; break; case 21: + name = "SwitchDemo.js"; + break; + case 22: name = "TextDemo.js"; break; } diff --git a/doric-Qt/example/app/main.qml b/doric-Qt/example/app/main.qml index 3b32066b..8ff88db4 100644 --- a/doric-Qt/example/app/main.qml +++ b/doric-Qt/example/app/main.qml @@ -5,9 +5,17 @@ ApplicationWindow { visible: true width: 600 height: 800 - title: qsTr("Scroll") + title: qsTr("Doric Demo") + + StackView { + id: stack + initialItem: entry + anchors.fill: parent + } ScrollView { + id: entry + anchors.fill: parent ScrollBar.horizontal.policy: ScrollBar.AlwaysOff @@ -15,7 +23,7 @@ ApplicationWindow { ListView { width: parent.width - model: 22 + model: 23 delegate: Rectangle { Column { anchors.centerIn: parent @@ -47,24 +55,26 @@ ApplicationWindow { case 11: return "ModularDemo.js" case 12: - return "NetworkDemo.js" + return "NavigatorDemo.js" case 13: - return "NotificationDemo.js" + return "NetworkDemo.js" case 14: - return "PopoverDemo.js" + return "NotificationDemo.js" case 15: - return "ScrollerDemo.js" + return "PopoverDemo.js" case 16: - return "SimpleDemo.js" + return "ScrollerDemo.js" case 17: - return "SliderDemo.js" + return "SimpleDemo.js" case 18: - return "Snake.js" + return "SliderDemo.js" case 19: - return "StorageDemo.js" + return "Snake.js" case 20: - return "SwitchDemo.js" + return "StorageDemo.js" case 21: + return "SwitchDemo.js" + case 22: return "TextDemo.js" } } diff --git a/doric-Qt/example/app/qml.qrc b/doric-Qt/example/app/qml.qrc index 2fbd2cbf..01427393 100644 --- a/doric-Qt/example/app/qml.qrc +++ b/doric-Qt/example/app/qml.qrc @@ -21,6 +21,7 @@ ../../../doric-demo/bundle/src/LayoutTestDemo.js ../../../doric-demo/bundle/src/ModalDemo.js ../../../doric-demo/bundle/src/ModularDemo.js + ../../../doric-demo/bundle/src/NavigatorDemo.js ../../../doric-demo/bundle/src/NetworkDemo.js ../../../doric-demo/bundle/src/NotificationDemo.js ../../../doric-demo/bundle/src/PopoverDemo.js