git.iko.soy/unity8
on xenial help sign in
Add support for custom bottom-edge messages for the five apps we support; put each tutorial object under a loader, since they'll be around much longer now
c443ec7Michael Terry
qml/Tutorial/TutorialBottom.qml+12−9
compare with xenial
unifiedsplit
@@ -43,14 +43,6 @@ TutorialPage {
43 // code used in several of the core apps and only bring this component
43 // code used in several of the core apps and only bring this component
44 // up if we are in those core apps.
44 // up if we are in those core apps.
45
45
46− function canShowForApp(appId) {
47− return appId === "address-book-app" ||
48− appId === "com.ubuntu.calculator_calculator" ||
49− appId === "com.ubuntu.clock_clock" ||
50− appId === "dialer-app" ||
51− appId === "messaging-app";
52− }
53−
54 readonly property real mainStageWidth: stage.width - sideStageWidth
46 readonly property real mainStageWidth: stage.width - sideStageWidth
55 readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
47 readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
56 stage.sideStageWidth : 0
48 stage.sideStageWidth : 0
@@ -81,7 +73,18 @@ TutorialPage {
81 }
73 }
82
74
83 label {
75 label {
84− text: i18n.tr("Swipe from the bottom edge to manage the app")
76+ text: !application ? "" :
77+ application.appId === "address-book-app" ?
78+ i18n.tr("Swipe up to add a contact") :
79+ application.appId === "com.ubuntu.calculator_calculator" ?
80+ i18n.tr("Swipe up for favorite calculations") :
81+ application.appId === "com.ubuntu.clock_clock" ?
82+ i18n.tr("Swipe up to manage alarms") :
83+ application.appId === "dialer-app" ?
84+ i18n.tr("Swipe up for recent calls") :
85+ application.appId === "messaging-app" ?
86+ i18n.tr("Swipe up to create a message") :
87+ i18n.tr("Swipe up to manage the app") // shouldn't be used
85 anchors.bottom: arrow.top
88 anchors.bottom: arrow.top
86 anchors.bottomMargin: units.gu(3)
89 anchors.bottomMargin: units.gu(3)
87 anchors.left: root.left
90 anchors.left: root.left
qml/Tutorial/TutorialContent.qml+166−103
@@ -30,13 +30,13 @@ Item {
30 property bool keyboardVisible
30 property bool keyboardVisible
31 property var lastInputTimestamp
31 property var lastInputTimestamp
32
32
33− readonly property bool launcherEnabled: !running || tutorialLeft.shown
33+ readonly property bool launcherEnabled: !running || tutorialLeftLoader.shown
34− readonly property bool spreadEnabled: !running || tutorialRight.shown
34+ readonly property bool spreadEnabled: !running || tutorialRightLoader.shown
35− readonly property bool panelEnabled: !running || tutorialTop.shown
35+ readonly property bool panelEnabled: !running || tutorialTopLoader.shown
36− readonly property bool running: tutorialLeft.shown
36+ readonly property bool running: tutorialLeftLoader.shown
37− || tutorialTop.shown
37+ || tutorialTopLoader.shown
38− || tutorialRight.shown
38+ || tutorialRightLoader.shown
39− || tutorialBottom.shown
39+ || tutorialBottomLoader.shown
40
40
41 signal finished()
41 signal finished()
42
42
@@ -59,123 +59,186 @@ Item {
59 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
59 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
60 : null
60 : null
61
61
62+ function haveShown(tutorialId) {
63+ return AccountsService.demoEdgesCompleted.indexOf(tutorialId) != -1;
64+ }
65+
62− property bool endPointsFinished: tutorialRight.skipped && tutorialBottom.skipped
66+ property bool endPointsFinished: tutorialRightLoader.skipped &&
67+ tutorialBottomLoader.skipped
63 onEndPointsFinishedChanged: if (endPointsFinished) root.finish()
68 onEndPointsFinishedChanged: if (endPointsFinished) root.finish()
64 }
69 }
65
70
66− TutorialLeft {
71+ Loader {
67− id: tutorialLeft
72+ id: tutorialLeftLoader
68− objectName: "tutorialLeft"
73+ objectName: "tutorialLeftLoader"
69 anchors.fill: parent
74 anchors.fill: parent
70− launcher: root.launcher
71− hides: [launcher, panel.indicators]
72− paused: root.paused
73−
74− readonly property bool skipped: !d.mobileScenario ||
75− AccountsService.demoEdgesCompleted.indexOf("left") != -1
76− isReady: !skipped && !paused && !keyboardVisible
77−
78− // Use an idle timer here, because when constructed, all our isReady variables will be false.
79− // Qml needs a moment to copy their values from Tutorial.qml. So we idle it and recheck.
80− Timer {
81− id: tutorialLeftTimer
82− interval: 0
83− onTriggered: if (tutorialLeft.isReady && !tutorialLeft.shown) tutorialLeft.show()
84− }
85
75
76+ readonly property bool skipped: !d.mobileScenario || d.haveShown("left")
77+ readonly property bool shown: item && item.shown
78+ active: !skipped || (item && item.visible)
86− onSkippedChanged: if (skipped && shown) hide()
79+ onSkippedChanged: if (skipped && shown) item.hide()
80+
81+ sourceComponent: TutorialLeft {
82+ id: tutorialLeft
83+ objectName: "tutorialLeft"
84+ anchors.fill: parent
85+ launcher: root.launcher
86+ hides: [launcher, panel.indicators]
87+ paused: root.paused
88+
89+ isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible
90+
91+ // Use an idle timer here, because when constructed, all our isReady variables will be false.
92+ // Qml needs a moment to copy their values from Tutorial.qml. So we idle it and recheck.
93+ Timer {
94+ id: tutorialLeftTimer
95+ interval: 0
96+ onTriggered: if (tutorialLeft.isReady && !tutorialLeft.shown) tutorialLeft.show()
97+ }
98+
87− onIsReadyChanged: if (isReady && !shown) tutorialLeftTimer.start()
99+ onIsReadyChanged: if (isReady && !shown) tutorialLeftTimer.start()
88− onFinished: AccountsService.markDemoEdgeCompleted("left")
100+ onFinished: AccountsService.markDemoEdgeCompleted("left")
101+ }
89 }
102 }
90
103
91− TutorialTop {
104+ Loader {
92− id: tutorialTop
105+ id: tutorialTopLoader
93− objectName: "tutorialTop"
106+ objectName: "tutorialTopLoader"
94 anchors.fill: parent
107 anchors.fill: parent
95− panel: root.panel
96− hides: [launcher, panel.indicators]
97− paused: root.paused
98
108
99− readonly property bool skipped: !d.mobileScenario ||
109+ readonly property bool skipped: !d.mobileScenario || d.haveShown("top")
100− AccountsService.demoEdgesCompleted.indexOf("top") != -1
110+ readonly property bool shown: item && item.shown
111+ active: !skipped || (item && item.visible)
112+ onSkippedChanged: if (skipped && shown) item.hide()
113+
114+ sourceComponent: TutorialTop {
115+ id: tutorialTop
116+ objectName: "tutorialTop"
117+ anchors.fill: parent
118+ panel: root.panel
119+ hides: [launcher, panel.indicators]
120+ paused: root.paused
121+
122+ isReady: tutorialLeftLoader.skipped && !tutorialTopLoader.skipped &&
101− isReady: tutorialLeft.skipped && !skipped && !paused && !keyboardVisible &&
123+ !paused && !keyboardVisible &&
102− !tutorialBottom.shown && !tutorialBottom.mightShow
124+ !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
103−
125+
104− // We fire 30s after left edge tutorial, with at least 3s of inactivity
126+ // We fire 30s after left edge tutorial, with at least 3s of inactivity
127+
128+ InactivityTimer {
129+ id: tutorialTopInactivityTimer
130+ lastInputTimestamp: root.lastInputTimestamp
131+ page: parent
132+ }
105
133
106− InactivityTimer {
134+ Timer {
135+ id: tutorialTopTimer
136+ objectName: "tutorialTopTimer"
137+ interval: 27000
107− id: tutorialTopInactivityTimer
138+ onTriggered: tutorialTopInactivityTimer.start()
108− lastInputTimestamp: root.lastInputTimestamp
109− page: parent
110− }
139+ }
111
140
112− Timer {
141+ onIsReadyChanged: if (isReady && !shown) tutorialTopTimer.start()
113− id: tutorialTopTimer
142+ onFinished: AccountsService.markDemoEdgeCompleted("top")
114− objectName: "tutorialTopTimer"
115− interval: 27000
116− onTriggered: tutorialTopInactivityTimer.start()
117 }
143 }
118−
119− onSkippedChanged: if (skipped && shown) hide()
120− onIsReadyChanged: if (isReady && !shown) tutorialTopTimer.start()
121− onFinished: AccountsService.markDemoEdgeCompleted("top")
122 }
144 }
123
145
124− TutorialRight {
146+ Loader {
125− id: tutorialRight
147+ id: tutorialRightLoader
126− objectName: "tutorialRight"
148+ objectName: "tutorialRightLoader"
127 anchors.fill: parent
149 anchors.fill: parent
128− stage: root.stage
129− usageScenario: root.usageScenario
130− hides: [launcher, panel.indicators]
131− paused: root.paused
132−
133− readonly property bool skipped: AccountsService.demoEdgesCompleted.indexOf("right") != -1
134− isReady: tutorialTop.skipped && !skipped && !paused && !keyboardVisible &&
135− !tutorialBottom.shown && !tutorialBottom.mightShow &&
136− ApplicationManager.count >= 3
137−
138− InactivityTimer {
139− id: tutorialRightInactivityTimer
140− objectName: "tutorialRightInactivityTimer"
141− lastInputTimestamp: root.lastInputTimestamp
142− page: parent
143− }
144
150
151+ readonly property bool skipped: d.haveShown("right")
152+ readonly property bool shown: item && item.shown
153+ active: !skipped || (item && item.visible)
154+ onSkippedChanged: if (skipped && shown) item.hide()
155+
156+ sourceComponent: TutorialRight {
157+ id: tutorialRight
158+ objectName: "tutorialRight"
159+ anchors.fill: parent
160+ stage: root.stage
161+ usageScenario: root.usageScenario
162+ hides: [launcher, panel.indicators]
163+ paused: root.paused
164+
165+ isReady: tutorialTopLoader.skipped && !tutorialRightLoader.skipped &&
166+ !paused && !keyboardVisible &&
167+ !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow &&
168+ ApplicationManager.count >= 3
169+
170+ InactivityTimer {
171+ id: tutorialRightInactivityTimer
172+ objectName: "tutorialRightInactivityTimer"
173+ lastInputTimestamp: root.lastInputTimestamp
174+ page: parent
175+ }
176+
145− Connections {
177+ Connections {
146− target: d
178+ target: d
147− onFocusedAppChanged: {
179+ onFocusedAppChanged: {
148− if (tutorialRight.isReady && !tutorialRight.shown && d.focusedApp
180+ if (tutorialRight.isReady && !tutorialRight.shown && d.focusedApp
149− && d.focusedApp.state === ApplicationInfoInterface.Starting) {
181+ && d.focusedApp.state === ApplicationInfoInterface.Starting) {
150− tutorialRight.show();
182+ tutorialRight.show();
183+ }
151 }
184 }
152 }
185 }
153− }
154
186
155− onSkippedChanged: if (skipped && shown) hide()
156− onIsReadyChanged: if (isReady && !shown) tutorialRightInactivityTimer.start()
187+ onIsReadyChanged: if (isReady && !shown) tutorialRightInactivityTimer.start()
157− onFinished: AccountsService.markDemoEdgeCompleted("right")
188+ onFinished: AccountsService.markDemoEdgeCompleted("right")
189+ }
158 }
190 }
159
191
160− TutorialBottom {
192+ Loader {
161− id: tutorialBottom
193+ id: tutorialBottomLoader
162− objectName: "tutorialBottom"
194+ objectName: "tutorialBottomLoader"
163 anchors.fill: parent
195 anchors.fill: parent
196+
197+ // See TutorialBottom.qml for an explanation of why we only support
198+ // certain apps.
199+ readonly property var supportedApps: ["address-book-app",
200+ "com.ubuntu.calculator_calculator",
201+ "com.ubuntu.clock_clock",
202+ "dialer-app",
203+ "messaging-app"]
204+ readonly property bool skipped: {
205+ if (!d.mobileScenario) {
206+ return true;
207+ }
208+ for (var i = 0; i < supportedApps.length; i++) {
209+ if (!d.haveShown("bottom-" + supportedApps[i])) {
210+ return false;
211+ }
212+ }
213+ return true;
214+ }
215+ readonly property bool shown: item && item.shown
216+ readonly property bool haveShownFocusedApp: d.focusedApp &&
217+ d.haveShown("bottom-" + d.focusedApp.appId)
218+ readonly property bool mightShow: !skipped && d.focusedApp &&
219+ supportedApps.indexOf(d.focusedApp.appId) !== -1 &&
220+ !haveShownFocusedApp
221+ active: !skipped || (item && item.visible)
222+ onHaveShownFocusedAppChanged: if (haveShownFocusedApp && shown) hide()
223+ onSkippedChanged: if (skipped && shown) item.hide()
224+
225+ sourceComponent: TutorialBottom {
226+ id: tutorialBottom
227+ objectName: "tutorialBottom"
228+ anchors.fill: parent
164− hides: [launcher, panel.indicators]
229+ hides: [launcher, panel.indicators]
165− paused: root.paused
230+ paused: root.paused
166− usageScenario: root.usageScenario
231+ usageScenario: root.usageScenario
167− stage: root.stage
232+ stage: root.stage
168− application: d.focusedApp
233+ application: d.focusedApp
169−
234+
170− readonly property bool skipped: !d.mobileScenario ||
171− AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
172− readonly property bool mightShow: !skipped && d.focusedApp && canShowForApp(d.focusedApp.appId)
173− isReady: !skipped && !paused && !keyboardVisible &&
235+ isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
174− !tutorialTop.shown && !tutorialRight.shown &&
236+ !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
237+ tutorialBottomLoader.mightShow &&
175− mightShow && d.focusedApp.state === ApplicationInfoInterface.Running
238+ d.focusedApp.state === ApplicationInfoInterface.Running
176−
239+
177− onSkippedChanged: if (skipped && shown) hide()
178− onIsReadyChanged: if (isReady && !shown) show()
240+ onIsReadyChanged: if (isReady && !shown) show()
179− onFinished: AccountsService.markDemoEdgeCompleted("bottom")
241+ onFinished: AccountsService.markDemoEdgeCompleted("bottom-" + d.focusedApp.appId)
242+ }
180 }
243 }
181}
244}
qml/Tutorial/TutorialPage.qml+1
@@ -110,6 +110,7 @@ Showable {
110
110
111 Label {
111 Label {
112 id: label
112 id: label
113+ objectName: "tutorialLabel"
113 fontSize: "large"
114 fontSize: "large"
114 font.weight: Font.Light
115 font.weight: Font.Light
115 color: "#333333"
116 color: "#333333"
tests/qmltests/Tutorial/tst_Tutorial.qml+36−25
@@ -304,39 +304,39 @@ Rectangle {
304 }
304 }
305
305
306 function openTutorialTop() {
306 function openTutorialTop() {
307− var tutorialLeft = findChild(shell, "tutorialLeft");
307+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
308 var tutorialTop = findChild(shell, "tutorialTop");
308 var tutorialTop = findChild(shell, "tutorialTop");
309 var tutorialTopTimer = findInvisibleChild(tutorialTop, "tutorialTopTimer");
309 var tutorialTopTimer = findInvisibleChild(tutorialTop, "tutorialTopTimer");
310
310
311 tutorialTopTimer.interval = 1;
311 tutorialTopTimer.interval = 1;
312 AccountsService.demoEdgesCompleted = ["left"];
312 AccountsService.demoEdgesCompleted = ["left"];
313
313
314− tryCompare(tutorialLeft, "visible", false);
314+ tryCompare(tutorialLeftLoader, "active", false);
315 tryCompare(tutorialTop, "shown", true);
315 tryCompare(tutorialTop, "shown", true);
316 tryCompare(tutorialTop, "opacity", 1);
316 tryCompare(tutorialTop, "opacity", 1);
317 }
317 }
318
318
319 function openTutorialRight() {
319 function openTutorialRight() {
320− var tutorialLeft = findChild(shell, "tutorialLeft");
320+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
321 var tutorialRight = findChild(shell, "tutorialRight");
321 var tutorialRight = findChild(shell, "tutorialRight");
322
322
323 AccountsService.demoEdgesCompleted = ["left", "top"];
323 AccountsService.demoEdgesCompleted = ["left", "top"];
324 ApplicationManager.startApplication("gallery-app");
324 ApplicationManager.startApplication("gallery-app");
325 ApplicationManager.startApplication("facebook-webapp");
325 ApplicationManager.startApplication("facebook-webapp");
326
326
327− tryCompare(tutorialLeft, "visible", false);
327+ tryCompare(tutorialLeftLoader, "active", false);
328 tryCompare(tutorialRight, "shown", true);
328 tryCompare(tutorialRight, "shown", true);
329 tryCompare(tutorialRight, "opacity", 1);
329 tryCompare(tutorialRight, "opacity", 1);
330 }
330 }
331
331
332 function openTutorialBottom() {
332 function openTutorialBottom() {
333− var tutorialLeft = findChild(shell, "tutorialLeft");
333+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
334 var tutorialBottom = findChild(shell, "tutorialBottom");
334 var tutorialBottom = findChild(shell, "tutorialBottom");
335
335
336 AccountsService.demoEdgesCompleted = ["left", "top", "right"];
336 AccountsService.demoEdgesCompleted = ["left", "top", "right"];
337 ApplicationManager.startApplication("dialer-app");
337 ApplicationManager.startApplication("dialer-app");
338
338
339− tryCompare(tutorialLeft, "visible", false);
339+ tryCompare(tutorialLeftLoader, "active", false);
340 tryCompare(tutorialBottom, "shown", true);
340 tryCompare(tutorialBottom, "shown", true);
341 tryCompare(tutorialBottom, "opacity", 1);
341 tryCompare(tutorialBottom, "opacity", 1);
342 }
342 }
@@ -480,10 +480,10 @@ Rectangle {
480 function test_tutorialTopAutoSkipped() {
480 function test_tutorialTopAutoSkipped() {
481 // Test that we skip the tutorial if user uses top edge themselves
481 // Test that we skip the tutorial if user uses top edge themselves
482
482
483− var tutorialLeft = findChild(shell, "tutorialLeft");
483+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
484 var tutorialTop = findChild(shell, "tutorialTop");
484 var tutorialTop = findChild(shell, "tutorialTop");
485 AccountsService.demoEdgesCompleted = ["left"];
485 AccountsService.demoEdgesCompleted = ["left"];
486− tryCompare(tutorialLeft, "visible", false);
486+ tryCompare(tutorialLeftLoader, "active", false);
487 verify(!tutorialTop.shown);
487 verify(!tutorialTop.shown);
488
488
489 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
489 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
@@ -559,9 +559,9 @@ Rectangle {
559 function test_tutorialRightAutoSkipped() {
559 function test_tutorialRightAutoSkipped() {
560 // Test that we skip the tutorial if user uses right edge themselves
560 // Test that we skip the tutorial if user uses right edge themselves
561
561
562− var tutorialLeft = findChild(shell, "tutorialLeft");
562+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
563 AccountsService.demoEdgesCompleted = ["left"];
563 AccountsService.demoEdgesCompleted = ["left"];
564− tryCompare(tutorialLeft, "visible", false);
564+ tryCompare(tutorialLeftLoader, "active", false);
565
565
566 touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
566 touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
567 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
567 tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
@@ -570,6 +570,7 @@ Rectangle {
570 function test_tutorialBottomEdges() {
570 function test_tutorialBottomEdges() {
571 var tutorial = findChild(shell, "tutorial");
571 var tutorial = findChild(shell, "tutorial");
572 var tutorialBottom = findChild(tutorial, "tutorialBottom");
572 var tutorialBottom = findChild(tutorial, "tutorialBottom");
573+ var tutorialLabel = findChild(tutorialBottom, "tutorialLabel");
573 var launcher = findChild(shell, "launcher");
574 var launcher = findChild(shell, "launcher");
574 var stage = findChild(shell, "stage");
575 var stage = findChild(shell, "stage");
575 var panel = findChild(shell, "panel");
576 var panel = findChild(shell, "panel");
@@ -584,6 +585,7 @@ Rectangle {
584 verify(!launcher.available);
585 verify(!launcher.available);
585 verify(!stage.spreadEnabled);
586 verify(!stage.spreadEnabled);
586 verify(!panel.indicators.available);
587 verify(!panel.indicators.available);
588+ compare(tutorialLabel.text, "Swipe up for recent calls");
587 }
589 }
588
590
589 function test_tutorialBottomFinish() {
591 function test_tutorialBottomFinish() {
@@ -594,15 +596,24 @@ Rectangle {
594 touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
596 touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
595
597
596 tryCompare(tutorialBottom, "shown", false);
598 tryCompare(tutorialBottom, "shown", false);
597− tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "right", "bottom"]);
599+ tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "right", "bottom-dialer-app"]);
600+
601+ // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.
598− tryCompare(AccountsService, "demoEdges", false);
602+ verify(AccountsService.demoEdges);
603+ AccountsService.demoEdgesCompleted = ["left", "top", "right",
604+ "bottom-address-book-app",
605+ "bottom-com.ubuntu.calculator_calculator",
606+ "bottom-com.ubuntu.clock_clock",
607+ "bottom-dialer-app",
608+ "bottom-messaging-app"];
609+ verify(!AccountsService.demoEdges);
599 }
610 }
600
611
601 function test_tutorialBottomAppearsBeforeRight() {
612 function test_tutorialBottomAppearsBeforeRight() {
602 // Confirm that if bottom edge and right edge would appear on the
613 // Confirm that if bottom edge and right edge would appear on the
603 // the same app open, bottom edge appears first. (this is a lightly
614 // the same app open, bottom edge appears first. (this is a lightly
604 // edited version of openTutorialRight)
615 // edited version of openTutorialRight)
605− var tutorialLeft = findChild(shell, "tutorialLeft");
616+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
606 var tutorialRight = findChild(shell, "tutorialRight");
617 var tutorialRight = findChild(shell, "tutorialRight");
607 var tutorialBottom = findChild(shell, "tutorialBottom");
618 var tutorialBottom = findChild(shell, "tutorialBottom");
608
619
@@ -610,10 +621,10 @@ Rectangle {
610 ApplicationManager.startApplication("gallery-app");
621 ApplicationManager.startApplication("gallery-app");
611 ApplicationManager.startApplication("dialer-app");
622 ApplicationManager.startApplication("dialer-app");
612
623
613− tryCompare(tutorialLeft, "visible", false);
624+ tryCompare(tutorialLeftLoader, "active", false);
614− tryCompare(tutorialRight, "visible", false);
615 tryCompare(tutorialBottom, "shown", true);
625 tryCompare(tutorialBottom, "shown", true);
616 tryCompare(tutorialBottom, "opacity", 1);
626 tryCompare(tutorialBottom, "opacity", 1);
627+ tryCompare(tutorialRight, "visible", false);
617 }
628 }
618
629
619 function test_tutorialBottomOnlyCoversSideStageOnTablet() {
630 function test_tutorialBottomOnlyCoversSideStageOnTablet() {
@@ -712,20 +723,20 @@ Rectangle {
712 function test_desktopOnlyShowsTutorialRight() {
723 function test_desktopOnlyShowsTutorialRight() {
713 loadShell("desktop");
724 loadShell("desktop");
714
725
715− var tutorialLeft = findChild(shell, "tutorialLeft");
726+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
716− var tutorialTop = findChild(shell, "tutorialTop");
727+ var tutorialTopLoader = findChild(shell, "tutorialTopLoader");
717− var tutorialRight = findChild(shell, "tutorialRight");
728+ var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
718− var tutorialBottom = findChild(shell, "tutorialBottom");
729+ var tutorialBottomLoader = findChild(shell, "tutorialBottomLoader");
719− verify(tutorialLeft.skipped);
730+ verify(!tutorialLeftLoader.active);
720− verify(tutorialTop.skipped);
731+ verify(!tutorialTopLoader.active);
721− verify(!tutorialRight.skipped);
732+ verify(tutorialRightLoader.active);
722− verify(tutorialBottom.skipped);
733+ verify(!tutorialBottomLoader.active);
723 compare(AccountsService.demoEdgesCompleted, []);
734 compare(AccountsService.demoEdgesCompleted, []);
724
735
725 ApplicationManager.startApplication("dialer-app");
736 ApplicationManager.startApplication("dialer-app");
726 ApplicationManager.startApplication("camera-app");
737 ApplicationManager.startApplication("camera-app");
727− tryCompare(tutorialRight, "isReady", true);
738+ tryCompare(tutorialRightLoader.item, "isReady", true);
728− tryCompare(tutorialRight, "shown", true);
739+ tryCompare(tutorialRightLoader, "shown", true);
729 }
740 }
730
741
731 function test_oskDoesNotHideTutorial() {
742 function test_oskDoesNotHideTutorial() {