diff --git a/apps/flashcards/app.js b/apps/flashcards/app.js index 04a7e40f7..2272aca13 100644 --- a/apps/flashcards/app.js +++ b/apps/flashcards/app.js @@ -17,8 +17,9 @@ let cards = []; let cardIndex = 0; let backSide = false; let drawTimeout = undefined; +let fontSizes = ["15%","20%","25%"]; -let settings = storage.readJSON(CARD_SETTINGS_FILE,1) || { litsId: "", fontSize: "20%", textSize: 9 }; +let settings = storage.readJSON(CARD_SETTINGS_FILE,1) || { litsId: "", fontSize: fontSizes[1], textSize: 9 }; // Cards data function wordWrap(str, maxLength) { @@ -88,7 +89,7 @@ let queueDraw = function() { let cardLayout = new Layout( { type:"v", c: [ {type:"txt", font:"6x8:3", label:"", id:"widgets", fillx:1 }, - {type:"txt", font:settings.fontSize, label:"ABCDEFGHIJ KLMNOPQRST UVWXYZÅÖÄ", filly:1, fillx:1, id:"card" }, + {type:"txt", font:fontSizes[settings.fontSize], label:"ABCDEFGHIJ KLMNOPQRST UVWXYZÅÖÄ", filly:1, fillx:1, id:"card" }, {type:"txt", font:"6x8:2", label:"00:00", id:"clock", fillx:1, bgCol:g.theme.fg, col:g.theme.bg } ] }, {lazy:true}); diff --git a/apps/flashcards/settings.js b/apps/flashcards/settings.js index 62dc98d13..faa1d0a2b 100644 --- a/apps/flashcards/settings.js +++ b/apps/flashcards/settings.js @@ -9,25 +9,26 @@ var settings = Object.assign({ listId: "", textSize: 9, - fontSize: "20%" + fontSize: 1 }, storage.readJSON(settingsFile, true) || {}); function writeSettings() { storage.writeJSON(settingsFile, settings); } + const fontSizes = ["15%","20%","25%"]; var settingsMenu = { "" : { "title" : "Flash Cards" }, "< Back" : () => back(), /*LANG*/"Font Size": { value: settings.fontSize, - min: 0, max: 2, - format: v => ["15%","20%","25%"][v], + min: 0, max: 2, wrap: true, + format: v => fontSizes[v], onchange: v => { settings.fontSize = v; writeSettings(); } }, /*LANG*/"Text Size": { value: settings.textSize, - min: 4, max: 14, + min: 5, max: 14, onchange: v => { settings.textSize = v; writeSettings(); } }, /*LANG*/"Get from Trello": () => {