Merge branch 'pr/896' into dev

llaske · Nov 12, 2020 · 38e4a22 · 38e4a22
2 parents 2e27c24 + 88c621d
commit 38e4a22
Show file tree

Hide file tree

Showing 13 changed files with 241 additions and 1 deletion.
diff --git a/activities/Calligra.activity/css/activity.css b/activities/Calligra.activity/css/activity.css
@@ -343,6 +343,16 @@ body {
 	background-image: url(../icons/restart.svg);
 	background-size: contain;
 }
+.player-next {
+	position: absolute;
+	top: 130px;
+	right: 17px;
+	width: 40px;
+	height: 40px;
+	padding: 5px;
+	background-image: url(../icons/pass-icon.svg);
+	background-size: contain;
+}
 
 .player-restart:disabled {
 	background-color: lightgray;

diff --git a/activities/Calligra.activity/icons/pass-icon.svg b/activities/Calligra.activity/icons/pass-icon.svg
diff --git a/activities/Calligra.activity/index.html b/activities/Calligra.activity/index.html
@@ -24,6 +24,7 @@
 <script>if (window.module) module = window.module;</script>
 <script src="lib/require.js"></script>
 <script type="text/javascript" src="../../cordova.js"></script>
+<script src="lib/confetti.browser.min.js"></script>
 </head>
 
 <body>

diff --git a/activities/Calligra.activity/js/activity.js b/activities/Calligra.activity/js/activity.js
@@ -138,7 +138,7 @@ var app = new Vue({
 					return;
 				}
 
-				// Dosplay item
+				// Display item
 				vm.$refs.toolbar.$refs.lines.isDisabled = false;
 				vm.$refs.toolbar.$refs.zoombutton.isDisabled = false;
 				vm.$refs.toolbar.$refs.insertimage.isDisabled = true;
@@ -147,6 +147,23 @@ var app = new Vue({
 				document.getElementById("canvas").style.backgroundColor = "#ffffff";
 			}
 		},
+		nextItem: function (item) {
+			// returns the next letter when Try Next button is clicked
+			var vm = this;
+			var index = -1;
+			for (var i = 0 ; i < vm.currentTemplate.images.length ; i++) {
+				if (vm.currentTemplate.images[i] == item) {
+					index = i;
+					break;
+				}
+			}
+			index++;
+			if (index === vm.currentTemplate.images.length) {
+				index = 0;
+			}
+			return vm.currentTemplate.images[index];
+
+		},
 
 		onZoom: function(item) {
 			var vm = this;
@@ -223,6 +240,7 @@ var app = new Vue({
 				options.zoombutton = vm.$refs.toolbar.$refs.zoombutton.$el;
 				options.backbutton = document.getElementById("back");
 				options.restartbutton = document.getElementById("player-restart");
+				options.nextbutton = document.getElementById("player-next-letter");
 				options.editoraddbutton = document.getElementById("editor-add");
 				options.editorremovebutton = document.getElementById("editor-remove");
 				options.editoraddpathbutton = document.getElementById("editor-addpath");

diff --git a/activities/Calligra.activity/js/player.js b/activities/Calligra.activity/js/player.js
@@ -8,6 +8,7 @@ var Player = {
 				<canvas id="letter"></canvas>
 			</div>
 			<button id="player-restart" class="player-restart"></button>
+			<button id="player-next-letter" class="player-next" v-on:click="nextItem()"></button>
 			<div id="cursor" class="player-cursor"></div>
 		</div>`,
 	props: ['item'],
@@ -197,6 +198,14 @@ var Player = {
 					if (vm.current.start >= vm.item.starts.length) {
 						vm.mode = 'end';
 						vm.setCursorVisibility(false);
+						setTimeout(function(){
+							confetti({
+								particleCount: 200,
+								spread: 70,
+								origin: { y: 0.6 }
+							  });
+						 }, 500);
+
 					} else {
 						var lines = [{x: vm.item.starts[vm.current.start].x, y:vm.item.starts[vm.current.start].y}];
 						vm.moveCursor({x: vm.zoom*lines[0].x, y: vm.zoom*lines[0].y});
@@ -333,6 +342,20 @@ var Player = {
 
 		goBack: function() {
 			app.displayTemplateView();
+		},
+		nextItem: function () {
+			// When Try Next button is clicked
+			var vm = this;
+			vm.item = app.nextItem(vm.item);
+			var imageObj = new Image();
+			imageObj.onload = function() {
+				vm.imageSize = imageObj.width;
+
+				vm.onLoad();
+				vm.startDemoMode();
+			};
+			imageObj.src = vm.item.image;
+
 		}
 	},
 

diff --git a/activities/Calligra.activity/js/tutorial.js b/activities/Calligra.activity/js/tutorial.js
@@ -34,6 +34,8 @@ var Tutorial = {
 				stringTutoBackButtonContent: '',
 				stringTutoRestartButtonTitle: '',
 				stringTutoRestartButtonContent: '',
+				stringTutoNextButtonTitle: '',
+				stringTutoNextButtonContent: '',
 				stringTutoEditorAddButtonTitle: '',
 				stringTutoEditorAddButtonContent: '',
 				stringTutoEditorRemoveButtonTitle: '',
@@ -154,6 +156,12 @@ var Tutorial = {
 						placement: "left",
 						title: this.l10n.stringTutoRestartButtonTitle,
 						content: this.l10n.stringTutoRestartButtonContent
+					},
+					{
+						element: options.nextbutton,
+						placement: "left",
+						title: this.l10n.stringTutoNextButtonTitle,
+						content: this.l10n.stringTutoNextButtonContent
 					}
 				]);
 			}

diff --git a/activities/Calligra.activity/lib/confetti.browser.min.js b/activities/Calligra.activity/lib/confetti.browser.min.js
diff --git a/activities/Calligra.activity/locale.ini b/activities/Calligra.activity/locale.ini
@@ -39,6 +39,8 @@ TutoBackButtonTitle=Back
 TutoBackButtonContent=Click here to go back to the list of items.
 TutoRestartButtonTitle=Restart
 TutoRestartButtonContent=Click here to restart the drawing.
+TutoNextButtonTitle=Next
+TutoNextButtonContent=Click here to attempt the next one.
 TutoEditorAddButtonTitle=Add start point
 TutoEditorAddButtonContent=Click here to add a start point. Each drawing could have as many start points that you want. It's generally a good way to show where the pen should be up. Once the point is add, use mouse or arrow keys to move it.
 TutoEditorRemoveButtonTitle=Remove start point
@@ -88,6 +90,8 @@ TutoBackButtonTitle=Back
 TutoBackButtonContent=Click here to go back to the list of items.
 TutoRestartButtonTitle=Restart
 TutoRestartButtonContent=Click here to restart the drawing.
+TutoNextButtonTitle=Next
+TutoNextButtonContent=Click here to attempt the next one.
 TutoEditorAddButtonTitle=Add start point
 TutoEditorAddButtonContent=Click here to add a start point. Each drawing could have as many start points that you want. It's generally a good way to show where the pen should be up. Once the point is add, use mouse or arrow keys to move it.
 TutoEditorRemoveButtonTitle=Remove start point
@@ -137,6 +141,8 @@ TutoBackButtonTitle=Back
 TutoBackButtonContent=Click here to go back to the list of items.
 TutoRestartButtonTitle=Restart
 TutoRestartButtonContent=Click here to restart the drawing.
+TutoNextButtonTitle=Next
+TutoNextButtonContent=Click here to attempt the next one.
 TutoEditorAddButtonTitle=Add start point
 TutoEditorAddButtonContent=Click here to add a start point. Each drawing could have as many start points that you want. It's generally a good way to show where the pen should be up. Once the point is add, use mouse or arrow keys to move it.
 TutoEditorRemoveButtonTitle=Remove start point
@@ -186,6 +192,8 @@ TutoBackButtonTitle=Retour
 TutoBackButtonContent=Cliquer ici pour retourner à la liste des éléments.
 TutoRestartButtonTitle=Redémarrer
 TutoRestartButtonContent=Cliquer ici pour redémarrer le dessin.
+TutoNextButtonTitle=Suivant
+TutoNextButtonContent=Cliquez ici pour passer à l'élément suivant.
 TutoEditorAddButtonTitle=Ajouter un point de départ
 TutoEditorAddButtonContent=Cliquer ici pour ajouter un point de départ. Chaque dessin peut avoir autant de points de départ que vous voulez. Cela permet généralement d'indiquer les endroits où le stylo doit être relevé. Une fois le point ajouté, utiliser la souris ou les touches flèches pour le déplacer.
 TutoEditorRemoveButtonTitle=Supprimer point de départ
@@ -235,6 +243,8 @@ TutoBackButtonTitle=Back
 TutoBackButtonContent=Click here to go back to the list of items.
 TutoRestartButtonTitle=Restart
 TutoRestartButtonContent=Click here to restart the drawing.
+TutoNextButtonTitle=Next
+TutoNextButtonContent=Click here to attempt the next one.
 TutoEditorAddButtonTitle=Add start point
 TutoEditorAddButtonContent=Click here to add a start point. Each drawing could have as many start points that you want. It's generally a good way to show where the pen should be up. Once the point is add, use mouse or arrow keys to move it.
 TutoEditorRemoveButtonTitle=Remove start point

diff --git a/activities/Calligra.activity/po/en.po b/activities/Calligra.activity/po/en.po
@@ -208,6 +208,16 @@ msgctxt "TutoRestartButtonContent"
 msgid "Click here to restart the drawing."
 msgstr "Click here to restart the drawing."
 
+#: TutoNextButtonTitle
+msgctxt "TutoNextButtonTitle"
+msgid "Next"
+msgstr "Next"
+
+#: TutoNextButtonContent
+msgctxt "TutoNextButtonContent"
+msgid "Click here to attempt the next one."
+msgstr "Click here to attempt the next one."
+
 #: TutoEditorAddButtonTitle
 msgctxt "TutoEditorAddButtonTitle"
 msgid "Add start point"

diff --git a/activities/Calligra.activity/po/es.po b/activities/Calligra.activity/po/es.po
@@ -208,6 +208,16 @@ msgctxt "TutoRestartButtonContent"
 msgid "Click here to restart the drawing."
 msgstr "Click here to restart the drawing."
 
+#: TutoNextButtonTitle
+msgctxt "TutoNextButtonTitle"
+msgid "Next"
+msgstr "Next"
+
+#: TutoNextButtonContent
+msgctxt "TutoNextButtonContent"
+msgid "Click here to attempt the next one."
+msgstr "Click here to attempt the next one."
+
 #: TutoEditorAddButtonTitle
 msgctxt "TutoEditorAddButtonTitle"
 msgid "Add start point"

diff --git a/activities/Calligra.activity/po/fr.po b/activities/Calligra.activity/po/fr.po
@@ -208,6 +208,16 @@ msgctxt "TutoRestartButtonContent"
 msgid "Click here to restart the drawing."
 msgstr "Cliquer ici pour redémarrer le dessin."
 
+#: TutoNextButtonTitle
+msgctxt "TutoNextButtonTitle"
+msgid "Next"
+msgstr "suivant"
+
+#: TutoNextButtonContent
+msgctxt "TutoNextButtonContent"
+msgid "Click here to attempt the next one."
+msgstr "Cliquez ici pour essayer le suivant."
+
 #: TutoEditorAddButtonTitle
 msgctxt "TutoEditorAddButtonTitle"
 msgid "Add start point"

diff --git a/activities/Calligra.activity/po/pt.po b/activities/Calligra.activity/po/pt.po
@@ -210,6 +210,16 @@ msgctxt "TutoRestartButtonContent"
 msgid "Click here to restart the drawing."
 msgstr "Click here to restart the drawing."
 
+#: TutoNextButtonTitle
+msgctxt "TutoNextButtonTitle"
+msgid "Next"
+msgstr "Next"
+
+#: TutoNextButtonContent
+msgctxt "TutoNextButtonContent"
+msgid "Click here to attempt the next one."
+msgstr "Click here to attempt the next one."
+
 #: TutoEditorAddButtonTitle
 msgctxt "TutoEditorAddButtonTitle"
 msgid "Add start point"

diff --git a/activities/Calligra.activity/po/template.pot b/activities/Calligra.activity/po/template.pot
@@ -208,6 +208,16 @@ msgctxt "TutoRestartButtonContent"
 msgid "Click here to restart the drawing."
 msgstr ""
 
+#: TutoNextButtonTitle
+msgctxt "TutoNextButtonTitle"
+msgid "Next"
+msgstr ""
+
+#: TutoNextButtonContent
+msgctxt "TutoNextButtonContent"
+msgid "Click here to attempt the next one."
+msgstr ""
+
 #: TutoEditorAddButtonTitle
 msgctxt "TutoEditorAddButtonTitle"
 msgid "Add start point"