diff --git a/src/activities/letter-in-word/ActivityInfo.qml b/src/activities/letter-in-word/ActivityInfo.qml index 22f2c890d..1320437b9 100644 --- a/src/activities/letter-in-word/ActivityInfo.qml +++ b/src/activities/letter-in-word/ActivityInfo.qml @@ -1,34 +1,34 @@ /* GCompris - ActivityInfo.qml * * Copyright (C) 2015 Your Name * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import GCompris 1.0 ActivityInfo { name: "letter-in-word/LetterInWord.qml" difficulty: 1 icon: "letter-in-word/letter-in-word.svg" author: "Akshat Tandon <akshat.tandon@research.iiit.ac.ins>" demo: true - title: "Letter in which Word " - description: "" + title: qsTr("Letter in which Word ") + description: qsTr("A letter is written and/or spoken. Some words are displayed, the children must find the word or the words in which this letter appears.") //intro: "put here in comment the text for the intro voice" - goal: "" - prerequisite: "" + goal: qsTr("Select all the words which contain the spoken letter.") + prerequisite: qsTr("spellings,letter recognition") manual: "" credit: "" - section: "fun" + section: "reading" } diff --git a/src/activities/letter-in-word/CMakeLists.txt b/src/activities/letter-in-word/CMakeLists.txt index 1c9ab32c5..e6aa7da19 100644 --- a/src/activities/letter-in-word/CMakeLists.txt +++ b/src/activities/letter-in-word/CMakeLists.txt @@ -1 +1 @@ -GCOMPRIS_ADD_RCC(activities/letter-in-word *.qml *.svg *.js resource/* resource/images/*) +GCOMPRIS_ADD_RCC(activities/letter-in-word *.qml *.svg *.js resource/* resource/images/* resource/levels/*) diff --git a/src/activities/letter-in-word/Card.qml b/src/activities/letter-in-word/Card.qml index dcb2c3712..5489c88ea 100644 --- a/src/activities/letter-in-word/Card.qml +++ b/src/activities/letter-in-word/Card.qml @@ -1,166 +1,167 @@ /* GCompris - Card.qml * * Copyright (C) 2016 Akshat Tandon * * Authors: * Akshat Tandon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.1 import GCompris 1.0 import QtGraphicalEffects 1.0 import "../../core" import "letter-in-word.js" as Activity Item { id: cardItem - Image{ id: wordPic - anchors.bottom: cardImage.top - sourceSize.width: cardItem.width - sourceSize.height: cardItem.width*1.11 + sourceSize.width: cardItem.width -6 + sourceSize.height: cardItem.width -5 fillMode: Image.PreserveAspectFit source: imgurl z:-5 - } - Image { - id: cardImage - sourceSize.width: cardItem.width - fillMode: Image.PreserveAspectFit - source: Activity.url + "cloud.svg" - z: (state == 'scaled') ? 1 : -1 + Image { + id: cardImage + anchors.top:parent.bottom + anchors.topMargin: -30 * ApplicationInfo.ratio + sourceSize.width: cardItem.width - 10 + fillMode: Image.PreserveAspectFit + source: Activity.url + "images/cloud.svg" + z: (state == 'scaled') ? 1 : -1 - GCText { - id: text - anchors.horizontalCenter:parent.horizontalCenter + GCText { + id: text + anchors.horizontalCenter:parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenter: parent.verticalCenter - z: 11 - - text: spelling - font.pointSize: NaN // need to clear font.pointSize explicitly - font.pixelSize: parent.width * 0.30 - font.bold: true - style: Text.Outline - styleColor: "#2a2a2a" - color: "white" - } + z: 11 - DropShadow { - anchors.fill: text - cached: false - horizontalOffset: 1 - verticalOffset: 1 - radius: 3 - samples: 16 - color: "#422a2a2a" - source: text - } + text: spelling + font.pointSize: NaN // need to clear font.pointSize explicitly + font.pixelSize: spelling.length > 5 ? parent.width * 0.23 : parent.width * 0.30 + font.bold: true + style: Text.Outline + styleColor: "#2a2a2a" + color: "white" + } + DropShadow { + anchors.fill: text + cached: false + horizontalOffset: 1 + verticalOffset: 1 + radius: 3 + samples: 16 + color: "#422a2a2a" + source: text + } - ParticleSystemStarLoader { - id: particle - clip: false - } - states: State { - name: "scaled"; when: mouseArea.containsMouse - PropertyChanges { - target: cardItem - scale: /*carriageImage.scale * */ 1.2 - z: 2} - } + ParticleSystemStarLoader { + id: particle + clip: false + } - transitions: Transition { - NumberAnimation { properties: "scale"; easing.type: Easing.OutCubic } - } + states: State { + name: "scaled"; when: mouseArea.containsMouse + PropertyChanges { + target: cardItem + scale: /*carriageImage.scale * */ 1.2 + z: 2} + } - SequentialAnimation { - id: successAnimation - running: selected - loops: Animation.Infinite - NumberAnimation { - target: cardImage - easing.type: Easing.InOutQuad - property: "rotation" - to: 20; duration: 500 + transitions: Transition { + NumberAnimation { properties: "scale"; easing.type: Easing.OutCubic } } - NumberAnimation { - target: cardImage - easing.type: Easing.InOutQuad - property: "rotation"; to: -20 - duration: 500 } - } + SequentialAnimation { + id: successAnimation + running: selected + loops: Animation.Infinite + NumberAnimation { + target: cardImage + easing.type: Easing.InOutQuad + property: "rotation" + to: 20; duration: 500 + } + NumberAnimation { + target: cardImage + easing.type: Easing.InOutQuad + property: "rotation"; to: -20 + duration: 500 } - SequentialAnimation { - id: failureAnimation - NumberAnimation { - target: colorCardImage - property: "opacity" - to: 1; duration: 400 + } + + SequentialAnimation { + id: failureAnimation + NumberAnimation { + target: colorCardImage + property: "opacity" + to: 1; duration: 400 + } + NumberAnimation { + target: colorCardImage + property: "opacity" + to: 0; duration: 200 + } } NumberAnimation { - target: colorCardImage - property: "opacity" - to: 0; duration: 200 + id: rotationStop + running: !selected + target: cardImage + property: "rotation" + to: 0 + duration: 500 + easing.type: Easing.InOutQuad } - } - NumberAnimation { - id: rotationStop - running: !selected - target: cardImage - property: "rotation" - to: 0 - duration: 500 - easing.type: Easing.InOutQuad - } - MouseArea { - id: mouseArea - anchors.fill: parent - hoverEnabled: ApplicationInfo.isMobile ? false : true + MouseArea { + id: mouseArea + anchors.fill: parent + hoverEnabled: ApplicationInfo.isMobile ? false : true - onClicked: { + onClicked: { - if (Activity.checkWord(index)) { + if (Activity.checkWord(index)) { - successAnimation.restart(); - particle.burst(30) + successAnimation.restart(); + particle.burst(30) - } else { - failureAnimation.restart() + } else { + failureAnimation.restart() + } } } } + Colorize { + id: colorCardImage + z: 5 + anchors.fill: cardImage + source: cardImage + hue: 0.0 + saturation: 1 + opacity: 0 + } } - Colorize { - id: colorCardImage - z: 5 - anchors.fill: cardImage - source: cardImage - hue: 0.0 - saturation: 1 - opacity: 0 - } + } diff --git a/src/activities/letter-in-word/LetterInWord.qml b/src/activities/letter-in-word/LetterInWord.qml index 547fb45ed..a25ae3daf 100644 --- a/src/activities/letter-in-word/LetterInWord.qml +++ b/src/activities/letter-in-word/LetterInWord.qml @@ -1,280 +1,281 @@ /* GCompris - LetterInWord.qml * * Copyright (C) 2014 Holger Kaelberer * 2016 Akshat Tandon * * Authors: * Holger Kaelberer (Click on Letter - Qt Quick port) * Akshat Tandon (Modifications to Click on Letter code * to make Letter in which word activity) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.1 import QtGraphicalEffects 1.0 import GCompris 1.0 import "../../core" import "letter-in-word.js" as Activity import "qrc:/gcompris/src/core/core.js" as Core ActivityBase { id: activity focus: true onStart: focus = true pageComponent: Image { id: background - source: Activity.url + "background.svg" + source: Activity.url + "images/background.svg" sourceSize.width: parent.width fillMode: Image.PreserveAspectCrop focus: true // system locale by default property string locale: "system" signal start signal stop signal voiceError Component.onCompleted: { dialogActivityConfig.getInitialConfiguration() activity.start.connect(start) activity.stop.connect(stop) } QtObject { id: items property Item main: activity.main property alias bar: bar property alias wordsModel: wordsModel property GCAudio audioVoices: activity.audioVoices property alias parser: parser property alias animateX: animateX property alias repeatItem: repeatItem property alias score: score property alias bonus: bonus property alias locale: background.locale property string question } onVoiceError: { repeatItem.visible = false } onStart: { activity.audioVoices.error.connect(voiceError) Activity.start(items); } onStop: Activity.stop() DialogActivityConfig { id: dialogActivityConfig currentActivity: activity content: Component { Item { property alias localeBox: localeBox height: column.height property alias availableLangs: langs.languages LanguageList { id: langs } Column { id: column spacing: 10 width: parent.width Flow { spacing: 5 width: dialogActivityConfig.width GCComboBox { id: localeBox model: langs.languages background: dialogActivityConfig label: qsTr("Select your locale") } } } } } onClose: home() onLoadData: { if(dataToSave && dataToSave["locale"]) { background.locale = dataToSave["locale"]; } } onSaveData: { var oldLocale = background.locale; var newLocale = dialogActivityConfig.configItem.availableLangs[dialogActivityConfig.loader.item.localeBox.currentIndex].locale; // Remove .UTF-8 if(newLocale.indexOf('.') != -1) { newLocale = newLocale.substring(0, newLocale.indexOf('.')) } dataToSave = {"locale": newLocale } background.locale = newLocale; // Restart the activity with new information if(oldLocale !== newLocale) { background.stop(); background.start(); } } function setDefaultValues() { var localeUtf8 = background.locale; if(background.locale != "system") { localeUtf8 += ".UTF-8"; } for(var i = 0 ; i < dialogActivityConfig.configItem.availableLangs.length ; i ++) { if(dialogActivityConfig.configItem.availableLangs[i].locale === localeUtf8) { dialogActivityConfig.loader.item.localeBox.currentIndex = i; break; } } } } DialogHelp { id: dialogHelpLeftRight onClose: home() } Bar { id: bar content: BarEnumContent { value: help | home | level | config } onHelpClicked: { displayDialog(dialogHelpLeftRight) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: home() onConfigClicked: { dialogActivityConfig.active = true dialogActivityConfig.setDefaultValues() displayDialog(dialogActivityConfig) } } Score { id: score anchors.top: parent.top anchors.topMargin: 10 * ApplicationInfo.ratio anchors.left: parent.left anchors.leftMargin: 10 * ApplicationInfo.ratio anchors.bottom: undefined anchors.right: undefined } Bonus { id: bonus Component.onCompleted: win.connect(Activity.nextSubLevel) } BarButton { id: repeatItem source: "qrc:/gcompris/src/core/resource/bar_repeat.svg"; sourceSize.width: 80 * ApplicationInfo.ratio anchors { top: parent.top right: parent.right margins: 10 } onClicked: Activity.playLetter(Activity.currentLetter); } Item { id: planeText width: plane.width height: plane.height x: - width anchors.top: parent.top anchors.topMargin: 5 * ApplicationInfo.ratio Image { id: plane anchors.centerIn: planeText anchors.top: parent.top - source: Activity.url + "plane.svg" + source: Activity.url + "images/plane.svg" sourceSize.height: 90 * ApplicationInfo.ratio } GCText { id: questionItem anchors.right: planeText.right anchors.rightMargin: plane.width / 2 anchors.verticalCenter: planeText.verticalCenter fontSize: hugeSize font.weight: Font.DemiBold color: "#2a2a2a" text: items.question } PropertyAnimation { id: animateX target: planeText properties: "x" from: - planeText.width to: background.width duration: 11000 easing.type: Easing.OutInCirc } } ListModel { id: wordsModel } property int itemWidth: Math.min(parent.width / 7.5, parent.height / 5) property int itemHeight: itemWidth * 1.11 GridView { id: wordsView anchors.bottom: bar.top anchors.left: parent.left anchors.right: parent.right anchors.top: planeText.bottom + anchors.topMargin: 10 * ApplicationInfo.ratio anchors.leftMargin: 5 * ApplicationInfo.ratio anchors.rightMargin: 5 * ApplicationInfo.ratio - //anchors.bottomMargin: 5 * ApplicationInfo.ratio + anchors.bottomMargin: 5 * ApplicationInfo.ratio cellWidth: itemWidth cellHeight: itemHeight clip: false interactive: false - verticalLayoutDirection: GridView.BottomToTop + //verticalLayoutDirection: GridView.BottomToTop layoutDirection: Qt.LeftToRight model: wordsModel delegate: Card{ width: background.itemWidth } } JsonParser { id: parser onError: console.error("Click_on_letter: Error parsing JSON: " + msg); } } } diff --git a/src/activities/letter-in-word/letter-in-word.js b/src/activities/letter-in-word/letter-in-word.js index 0408b9d6d..7e5823485 100644 --- a/src/activities/letter-in-word/letter-in-word.js +++ b/src/activities/letter-in-word/letter-in-word.js @@ -1,220 +1,220 @@ /* GCompris - letter-in-word.js * * Copyright (C) 2014 Holger Kaelberer * 2016 Akshat Tandon * * Authors: * Holger Kaelberer (Qt Quick port) * Akshat Tandon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ .pragma library .import QtQuick 2.0 as Quick .import GCompris 1.0 as GCompris //for ApplicationInfo .import "qrc:/gcompris/src/core/core.js" as Core var url = "qrc:/gcompris/src/activities/letter-in-word/resource/" -var defaultLevelsFile = ":/gcompris/src/activities/letter-in-word/resource/levels-en.json"; +var defaultLevelsFile = ":/gcompris/src/activities/letter-in-word/resource/levels/levels-en.json"; var maxLettersPerLine = 6; var levels; var currentLevel; var maxLevel; var currentSubLevel; var currentLetter; var maxSubLevel; var level; var questions; var words; var items; function start(_items) { Core.checkForVoices(_items.main); items = _items; // register the voices for the locale var locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale) GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(locale)) loadLevels(); currentLevel = 0; currentSubLevel = 0; maxLevel = levels.length; initLevel(); } function validateLevels(levels) { var i; for (i = 0; i < levels.length; i++) { if (undefined === levels[i].questions || typeof levels[i].questions != "string" || levels[i].questions.length < 1 || typeof levels[i].words != "object" || levels[i].words.length < 1) return false; } if (i < 1) return false; return true; } function loadLevels() { var ret; - var filename = GCompris.ApplicationInfo.getLocaleFilePath(url + "levels-$LOCALE.json"); + var filename = GCompris.ApplicationInfo.getLocaleFilePath(url + "levels/levels-$LOCALE.json"); levels = items.parser.parseFromUrl(filename); if (levels == null) { console.warn("Click_on_letter: Invalid levels file " + filename); // fallback to default Latin (levels-en.json) file: levels = items.parser.parseFromUrl(defaultLevelsFile); if (levels == null) { console.error("Click_on_letter: Invalid default levels file " + defaultLevelsFile + ". Can't continue!"); // any way to error-exit here? return; } } } function stop() { items.animateX.stop() } function shuffleString(s) { var a = s.split(""); var n = a.length; for(var i = n-1; i>0; i--) { var j = Math.floor(Math.random() * (i + 1)); var tmp = a[i]; a[i] = a[j]; a[j] = tmp; } return a.join(""); } function initLevel() { items.bar.level = currentLevel + 1; if (currentSubLevel == 0) { level = levels[currentLevel]; maxSubLevel = level.questions.length; items.score.numberOfSubLevels = maxSubLevel; items.score.currentSubLevel = "1"; questions = shuffleString(level.questions); items.wordsModel.clear(); words = level.words.split(",") for (var i = 0; i < words.length; i++) { words[i] = words[i].trim() items.wordsModel.append({ "spelling": words[i], "imgurl": url + "images/" + words[i] + ".svg", "selected": false }); } } else { items.score.currentSubLevel = currentSubLevel + 1; } for(var i = 0; i < words.length; i++){ items.wordsModel.setProperty(i, "selected", false); } var locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale); currentLetter = questions.split("")[currentSubLevel]; items.question = currentLetter items.animateX.restart() if (GCompris.ApplicationSettings.isAudioVoicesEnabled && GCompris.DownloadManager.haveLocalResource( GCompris.DownloadManager.getVoicesResourceForLocale(locale))) { items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/misc/click_on_letter.$CA")); items.audioVoices.silence(100) playLetter(currentLetter) items.repeatItem.visible = true } else { // no sound -> show question items.repeatItem.visible = false } } function playLetter(letter) { var locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale) items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/alphabet/" + Core.getSoundFilenamForChar(letter))) } function nextLevel() { items.audioVoices.clearQueue() if(maxLevel <= ++currentLevel ) { currentLevel = 0 } currentSubLevel = 0; initLevel(); } function previousLevel() { items.audioVoices.clearQueue() if(--currentLevel < 0) { currentLevel = maxLevel - 1 } currentSubLevel = 0; initLevel(); } function nextSubLevel() { if( ++currentSubLevel >= maxSubLevel) { currentSubLevel = 0 nextLevel() } initLevel(); } function checkAnswer() { var checkFlag = false; var modelEntry; for(var i = 0; i < words.length; i++){ modelEntry = items.wordsModel.get(i); for(var j = 0; j < modelEntry.spelling.length; j++){ if(currentLetter == modelEntry.spelling.charAt(j) && modelEntry.selected == false){ checkFlag = true; break; } } } if(checkFlag == false){ items.bonus.good("flower"); } } function checkWord(index) { var modelEntry = items.wordsModel.get(index); for(var i = 0; i < modelEntry.spelling.length; i++){ if(currentLetter == modelEntry.spelling.charAt(i)){ items.wordsModel.setProperty(index, "selected", true); checkAnswer(); return true; } } return false; } diff --git a/src/activities/letter-in-word/resource/background.svg b/src/activities/letter-in-word/resource/images/background.svg similarity index 100% rename from src/activities/letter-in-word/resource/background.svg rename to src/activities/letter-in-word/resource/images/background.svg diff --git a/src/activities/letter-in-word/resource/images/balloons.svg b/src/activities/letter-in-word/resource/images/balloons.svg new file mode 100644 index 000000000..7b3e02cc6 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/balloons.svg @@ -0,0 +1,179 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/bug.svg b/src/activities/letter-in-word/resource/images/bug.svg new file mode 100644 index 000000000..fca2747f5 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/bug.svg @@ -0,0 +1,216 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/calculator.svg b/src/activities/letter-in-word/resource/images/calculator.svg new file mode 100644 index 000000000..a6999e140 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/calculator.svg @@ -0,0 +1,280 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/clock.svg b/src/activities/letter-in-word/resource/images/clock.svg new file mode 100644 index 000000000..e57e1235e --- /dev/null +++ b/src/activities/letter-in-word/resource/images/clock.svg @@ -0,0 +1,155 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/cloud.svg b/src/activities/letter-in-word/resource/images/cloud.svg similarity index 100% rename from src/activities/letter-in-word/resource/cloud.svg rename to src/activities/letter-in-word/resource/images/cloud.svg diff --git a/src/activities/letter-in-word/resource/images/domino.svg b/src/activities/letter-in-word/resource/images/domino.svg new file mode 100644 index 000000000..8fe076a5e --- /dev/null +++ b/src/activities/letter-in-word/resource/images/domino.svg @@ -0,0 +1,117 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/girl.svg b/src/activities/letter-in-word/resource/images/girl.svg new file mode 100644 index 000000000..e8ea5ccde --- /dev/null +++ b/src/activities/letter-in-word/resource/images/girl.svg @@ -0,0 +1,513 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/hand.svg b/src/activities/letter-in-word/resource/images/hand.svg new file mode 100644 index 000000000..b2734a701 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/hand.svg @@ -0,0 +1,90 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/hat.svg b/src/activities/letter-in-word/resource/images/hat.svg new file mode 100644 index 000000000..fe77ecd4a --- /dev/null +++ b/src/activities/letter-in-word/resource/images/hat.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/keyboard.svg b/src/activities/letter-in-word/resource/images/keyboard.svg new file mode 100644 index 000000000..ff1e4dbb6 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/keyboard.svg @@ -0,0 +1,721 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + tango input keyboard + 2010-03-27T10:17:43 + "Keyboard" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/34561/tango-input-keyboard-by-warszawianka + + + warszawianka + + + + + device + externalsource + hardware + icon + input + keyboard + tango + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/maze.svg b/src/activities/letter-in-word/resource/images/maze.svg new file mode 100644 index 000000000..b3dd8b1d1 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/maze.svg @@ -0,0 +1,146 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/money.svg b/src/activities/letter-in-word/resource/images/money.svg new file mode 100644 index 000000000..03afa3668 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/money.svg @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/plane.svg b/src/activities/letter-in-word/resource/images/plane.svg similarity index 100% rename from src/activities/letter-in-word/resource/plane.svg rename to src/activities/letter-in-word/resource/images/plane.svg diff --git a/src/activities/letter-in-word/resource/images/rainbow.svg b/src/activities/letter-in-word/resource/images/rainbow.svg new file mode 100644 index 000000000..4c171137b --- /dev/null +++ b/src/activities/letter-in-word/resource/images/rainbow.svg @@ -0,0 +1,123 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/images/xylophone.svg b/src/activities/letter-in-word/resource/images/xylophone.svg new file mode 100644 index 000000000..efca83949 --- /dev/null +++ b/src/activities/letter-in-word/resource/images/xylophone.svg @@ -0,0 +1,266 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/letter-in-word/resource/levels-en.json b/src/activities/letter-in-word/resource/levels-en.json deleted file mode 100644 index b6705462e..000000000 --- a/src/activities/letter-in-word/resource/levels-en.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "level": 1, - "words": "car,bulb,fish", - "questions":"afbu" - }, - { - "level": 2, - "words": "cow,dog,fire,pig", - "questions":"pfcdio" - }, - { - "level": 3, - "words": "dice,banana,earth,orange,cat", - "questions":"aoedchg" - } -] - diff --git a/src/activities/letter-in-word/resource/levels-ca.json b/src/activities/letter-in-word/resource/levels/levels-ca.json similarity index 100% rename from src/activities/letter-in-word/resource/levels-ca.json rename to src/activities/letter-in-word/resource/levels/levels-ca.json diff --git a/src/activities/letter-in-word/resource/levels/levels-en.json b/src/activities/letter-in-word/resource/levels/levels-en.json new file mode 100644 index 000000000..5bfa90ff3 --- /dev/null +++ b/src/activities/letter-in-word/resource/levels/levels-en.json @@ -0,0 +1,23 @@ +[ + { + "level": 1, + "words": "car,cat,dog,cow,pig,duck,hat,owl", + "questions":"cadhouw" + }, + { + "level": 2, + "words": "chicken,sheep,fire,fish,duck,pear,dice,apple,bulb,clock", + "questions":"csfudpiahe" + }, + { + "level": 3, + "words": "bug,sheep,earth,orange,cat,pineapple,banana,apple,football,hand,dice", + "questions":"abcdefgiopshlt" + }, + { + "level": 4, + "words": "balloons,rainbow,keyboard,football,horse,rooster,lemon,cherries,money,bulb,domino,girl,dice", + "questions":"brkfhlcmdgiey" + } +] + diff --git a/src/activities/letter-in-word/resource/levels-es.json b/src/activities/letter-in-word/resource/levels/levels-es.json similarity index 100% rename from src/activities/letter-in-word/resource/levels-es.json rename to src/activities/letter-in-word/resource/levels/levels-es.json diff --git a/src/activities/letter-in-word/resource/levels-fr.json b/src/activities/letter-in-word/resource/levels/levels-fr.json similarity index 100% rename from src/activities/letter-in-word/resource/levels-fr.json rename to src/activities/letter-in-word/resource/levels/levels-fr.json diff --git a/src/activities/letter-in-word/resource/levels-lt.json b/src/activities/letter-in-word/resource/levels/levels-lt.json similarity index 100% rename from src/activities/letter-in-word/resource/levels-lt.json rename to src/activities/letter-in-word/resource/levels/levels-lt.json diff --git a/src/activities/letter-in-word/resource/target.svg b/src/activities/letter-in-word/resource/target.svg deleted file mode 100644 index 17b87a073..000000000 --- a/src/activities/letter-in-word/resource/target.svg +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - -