From 8d2c14f5b816f38a500e92bb8b9fc88465b31ab0 Mon Sep 17 00:00:00 2001 From: v-crispadvice Date: Sat, 8 Jul 2023 16:09:05 +0300 Subject: [PATCH] Fix default values for font and text size --- apps/flashcards/README.md | 2 +- apps/flashcards/app.js | 6 +++++- apps/flashcards/flashcards.settings.json | 2 +- apps/flashcards/settings.js | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/flashcards/README.md b/apps/flashcards/README.md index 846871ed9..ddf199b4f 100644 --- a/apps/flashcards/README.md +++ b/apps/flashcards/README.md @@ -10,7 +10,7 @@ Configuration: 4. Add ".json" to the end of the Trello board URL and refresh page 5. Find your list ID 6. Save list ID to the "flashcards.settings.json" file on your watch, e.g.: -{"listId":"65942f7b27z68000996ddc00"} +{"listId":"65942f7b27z68000996ddc00","fontSize":1,"textSize":9} 7. Connect phone with Gadgetbridge to the watch 8. Enable "Allow Internet Access" in Gadgetbridge 9. On the watch go to Settings -> Apps -> Flash Cards -> Get from Trello diff --git a/apps/flashcards/app.js b/apps/flashcards/app.js index 2272aca13..fc81cb65b 100644 --- a/apps/flashcards/app.js +++ b/apps/flashcards/app.js @@ -19,7 +19,11 @@ let backSide = false; let drawTimeout = undefined; let fontSizes = ["15%","20%","25%"]; -let settings = storage.readJSON(CARD_SETTINGS_FILE,1) || { litsId: "", fontSize: fontSizes[1], textSize: 9 }; +let settings = Object.assign({ + listId: "", + fontSize: 1, + textSize: 9 +}, storage.readJSON(CARD_SETTINGS_FILE, true) || {}); // Cards data function wordWrap(str, maxLength) { diff --git a/apps/flashcards/flashcards.settings.json b/apps/flashcards/flashcards.settings.json index 3b85f6bc4..505738ce1 100644 --- a/apps/flashcards/flashcards.settings.json +++ b/apps/flashcards/flashcards.settings.json @@ -1 +1 @@ -{"listId":""} +{"listId":"","fontSize":1,"textSize":9} diff --git a/apps/flashcards/settings.js b/apps/flashcards/settings.js index faa1d0a2b..4f2793e96 100644 --- a/apps/flashcards/settings.js +++ b/apps/flashcards/settings.js @@ -8,8 +8,8 @@ var settings = Object.assign({ listId: "", - textSize: 9, - fontSize: 1 + fontSize: 1, + textSize: 9 }, storage.readJSON(settingsFile, true) || {}); function writeSettings() {