diff --git a/src/activities/letter-in-word/Card.qml b/src/activities/letter-in-word/Card.qml index 1bad24236..edcb9c0e6 100644 --- a/src/activities/letter-in-word/Card.qml +++ b/src/activities/letter-in-word/Card.qml @@ -1,182 +1,183 @@ /* 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 //width: cardImage.width height: wordPic.height + cardImage.height - 30 * ApplicationInfo.ratio Image{ id: wordPic sourceSize.width: cardItem.width -6 sourceSize.height: cardItem.width -5 fillMode: Image.PreserveAspectFit source: imgurl z:5 //visible: index % 2 != 0 ? false : true } Image { id: cardImage anchors.top:wordPic.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 //visible: index % 2 != 0 ? false : true - Row{ + Row { anchors.verticalCenter: cardImage.verticalCenter - Repeater{ + anchors.horizontalCenter: cardImage.horizontalCenter + Repeater { model: components GCText { id: textbox z: 11 text: textdata font.pointSize: NaN // need to clear font.pointSize explicitly font.pixelSize: spelling.length > 5 ? (spelling.length > 7 ? cardImage.width * 0.19 : cardImage.width * 0.25): cardImage.width * 0.30 font.bold: true style: Text.Outline styleColor: "#2a2a2a" color: selected && textdata.length == 1 && textdata == Activity.currentLetter ? "green" : "white" } } } ParticleSystemStarLoader { id: particle clip: false } states: State { name: "scaled"; when: mouseArea.containsMouse PropertyChanges { target: cardItem scale: /*carriageImage.scale * */ 1.2 - z: 2} + z: 2 + } } transitions: Transition { NumberAnimation { properties: "scale"; easing.type: Easing.OutCubic } } 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 } - + duration: 500 + } } SequentialAnimation { id: failureAnimation NumberAnimation { target: colorCardImage property: "opacity" to: 1; duration: 400 } NumberAnimation { target: colorCardImage property: "opacity" to: 0; duration: 200 } } NumberAnimation { id: rotationStop running: !selected target: cardImage property: "rotation" to: 0 duration: 500 easing.type: Easing.InOutQuad } } Colorize { id: colorCardImage z: 5 anchors.fill: cardImage source: cardImage hue: 0.0 saturation: 1 opacity: 0 } MouseArea { id: mouseArea anchors.fill: parent hoverEnabled: ApplicationInfo.isMobile ? false : true onClicked: { if (Activity.checkWord(index)) { successAnimation.restart(); particle.burst(30) components.clear(); var tempword; var j = 0; - for(var i = 0; i < spelling.length; i++){ - if(spelling.charAt(i) == Activity.currentLetter){ - tempword = spelling.substring(j,i); - if(i!=j){ - + for(var i = 0; i < spelling.length; i++) { + if(spelling.charAt(i) == Activity.currentLetter) { + tempword = spelling.substring(j, i); + if(i != j) { components.append({"textdata": tempword}) } components.append({"textdata": Activity.currentLetter}); j = i + 1; } } - if(j < spelling.length){ + if(j < spelling.length) { tempword = spelling.substring(j, spelling.length); components.append({"textdata": tempword}) } } else { failureAnimation.restart() } } } } diff --git a/src/activities/letter-in-word/LetterInWord.qml b/src/activities/letter-in-word/LetterInWord.qml index ebcdbe45d..580d471ad 100644 --- a/src/activities/letter-in-word/LetterInWord.qml +++ b/src/activities/letter-in-word/LetterInWord.qml @@ -1,289 +1,287 @@ /* 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 + "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 } 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 interval: 1000 Component.onCompleted: { win.connect(Activity.nextSubLevel); loose.connect(Activity.incorrectSelection); } } 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); animateX.restart(); } } 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 + "images/plane.svg" sourceSize.height: 90 * ApplicationInfo.ratio } GCText { id: questionItem anchors.right: planeText.right anchors.rightMargin: 2 * plane.width / 3 anchors.verticalCenter: planeText.verticalCenter anchors.bottomMargin: 10 * ApplicationInfo.ratio fontSize: hugeSize font.weight: Font.DemiBold color: "#2a2a2a" text: items.question - } PropertyAnimation { id: animateX target: planeText properties: "x" from: - planeText.width //to:background.width/2 - planeText.width/2 to: bar.level <= 2 ? background.width/4 : background.width duration: bar.level <= 2 ? 5500: 11000 //easing.type: Easing.OutQuad easing.type: bar.level <= 2 ? Easing.OutQuad: 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: 10 * ApplicationInfo.ratio cellWidth: itemWidth + 43*ApplicationInfo.ratio cellHeight: itemHeight + 15*ApplicationInfo.ratio clip: false interactive: false //verticalLayoutDirection: GridView.BottomToTop layoutDirection: Qt.LeftToRight model: wordsModel - delegate: Card{ + 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 6cf4ea5a1..acb39777d 100644 --- a/src/activities/letter-in-word/letter-in-word.js +++ b/src/activities/letter-in-word/letter-in-word.js @@ -1,288 +1,276 @@ /* GCompris - letter-in-word.js * * Copyright (C) 2014 Holger Kaelberer * 2016 Akshat Tandon * * Authors: * Holger Kaelberer (Qt Quick port of click-on-letter) * 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 .import "qrc:/gcompris/src/activities/lang/lang_api.js" as Lang var url = "qrc:/gcompris/src/activities/letter-in-word/resource/" -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; var dataset = null; var frequency; var incorrectFlag = false; var locale; function start(_items) { Core.checkForVoices(_items.main); items = _items; // register the voices for the locale locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale) GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(locale)) loadDataset(); levels = Lang.getAllLessons(dataset) currentLevel = 0; currentSubLevel = 0; maxLevel = levels.length; initLevel(); } function loadDataset() { var resourceUrl = "qrc:/gcompris/src/activities/lang/resource/" dataset = Lang.load(items.parser, resourceUrl, GCompris.ApplicationSettings.wordset ? "words.json" : "words_sample.json", "content-"+ locale +".json") // If dataset is empty, we try to load from short locale // and if not present again, we switch to default one var localeUnderscoreIndex = locale.indexOf('_') if(!dataset) { var localeShort; // We will first look again for locale xx (without _XX if exist) if(localeUnderscoreIndex > 0) { localeShort = locale.substring(0, localeUnderscoreIndex) } else { localeShort = locale; } dataset = Lang.load(items.parser, resourceUrl, GCompris.ApplicationSettings.wordset ? "words.json" : "words_sample.json", "content-"+localeShort+ ".json") } if(!dataset) { // English fallback dataset = Lang.load(items.parser, resourceUrl, GCompris.ApplicationSettings.wordset ? "words.json" : "words_sample.json", "content-en.json") } } function stop() { items.animateX.stop() } function shuffleString(s) { var a = s; 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() { var componentsArr; items.bar.level = currentLevel + 1; if (currentSubLevel == 0 && !incorrectFlag) { - level = levels[currentLevel]; + var level = levels[currentLevel]; words = Lang.getLessonWords(dataset, level); Core.shuffle(words); var limit = Math.min(11, words.length) words = words.slice(0,limit) frequency = calculateFrequency(); var tempQuestions = generateQuestions(); maxSubLevel = tempQuestions.length; items.score.numberOfSubLevels = maxSubLevel; items.score.currentSubLevel = 1; questions = shuffleString(tempQuestions); items.wordsModel.clear(); for (var i = 0; i < words.length; i++) { componentsArr = []; componentsArr.push({"textdata": words[i].translatedTxt}); items.wordsModel.append({ "spelling": words[i].translatedTxt, "imgurl": words[i].image, "selected": false, "components": componentsArr }); } } else { items.score.currentSubLevel = currentSubLevel + 1; } incorrectFlag = false; for(var i = 0; i < words.length; i++){ items.wordsModel.setProperty(i, "selected", false); } currentLetter = questions[currentSubLevel]; items.question = currentLetter items.animateX.restart(); if (GCompris.ApplicationSettings.isAudioVoicesEnabled && GCompris.DownloadManager.haveLocalResource( GCompris.DownloadManager.getVoicesResourceForLocale(locale))) { items.audioVoices.silence(100) playLetter(currentLetter) } } function calculateFrequency(){ var freq = []; //regex pattern to detect wether the character is an english alphabet or some accented latin chacarcter var pattern = /[A-Za-z\u00C0-\u017F]/; for(var i = 0; i < words.length; i++){ var currentWord = words[i].translatedTxt; for(var j = 0; j < currentWord.length; j++){ var character = currentWord.charAt(j); //consider the character if and only if it is an alphabet or an accented latin chataracter if(pattern.test(character)){ if(freq[character]){ freq[character]++; } else{ freq[character] = 1; } } } } return freq; } function generateQuestions(){ var freqArr = []; var ques = []; for(var character in frequency){ freqArr.push([character, frequency[character]]); } freqArr.sort(function(a, b) {return b[1] - a[1]}); var limit = Math.min(10, freqArr.length); for(var i = 0; i < limit; i++){ ques.push(freqArr[i][0]) } return ques; } function playLetter(letter) { 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 hasWordNotFound = false; var modelEntry; - for(var i = 0; i < words.length; i++){ + 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(modelEntry.spelling.indexOf(currentLetter) != -1 && modelEntry.selected == false) { + hasWordNotFound = true; + break; } } - if(checkFlag == false){ + if(hasWordNotFound == false) { items.bonus.good("flower"); } } function checkWord(index) { - var checkFlag = false; 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(); - checkFlag = true; - break; - } - } - if(checkFlag == true){ + if(modelEntry.spelling.indexOf(currentLetter) != -1) { + items.wordsModel.setProperty(index, "selected", true); + checkAnswer(); return true; } - else{ + else { items.bonus.bad("flower"); - return false; + return false; } } function incorrectSelection(){ incorrectFlag = true; var quesLen = questions.length; questions = questions.slice(0,currentSubLevel) + questions.slice(currentSubLevel+1,quesLen) + questions.charAt(currentSubLevel); currentSubLevel--; nextSubLevel(); }