From 32ead4a0514943df62c10c77c4e6a3a8f69b8221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kamo=C5=84?=
 <70628259+mkamonMdt@users.noreply.github.com>
Date: Tue, 1 Dec 2020 09:51:10 +0100
Subject: [PATCH] [EGD-4374] meditation: fix default counter settings (#1099)

---
 changelog.md                                                  | 2 ++
 image/assets/lang/English.json                                | 2 +-
 module-apps/application-meditation/data/OptionsData.hpp       | 2 +-
 .../application-meditation/widgets/MeditationModel.cpp        | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index f01020ddc5bddefa400210787e5d6b6aa6bd5f44..16728dd668f1d7491c7f53f89e8f89190294a86f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,8 @@
 
 ### Fixed
 
+* `[meditation]` Fixed default counter settings 
+
 ### Other
 
 * `[test]` Rewritten tests and updated test documentation.
diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index 732dc466d0eb12be8b39ad7a4017c2d7f5d39668..90249487c840d90b29a4a983d506a745feb02536 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -162,7 +162,7 @@
   "app_desktop_sim_enter_pin": "Enter new PIN code",
   "app_desktop_sim_confirm_pin": "Enter new PIN code",
   "app_desktop_sim_type_puk": "To unblock it, type the PUK code:",
-  "app_desktop_no_pin_lock": "<text>Press <b>Unlock</b> and then <b>#</b></text>",
+  "app_desktop_press_to_unlock": "<text>Press <b>Unlock</b> and then <b>#</b></text>",
   "app_desktop_sim_wrong_pin": "Wrong PIN code",
   "app_desktop_sim_wrong_puk": "Wrong PUK code",
   "app_desktop_sim_you_have": "You have",
diff --git a/module-apps/application-meditation/data/OptionsData.hpp b/module-apps/application-meditation/data/OptionsData.hpp
index eea7786379d899cb5a9199887e0bedd39809efdc..89ebbad17ead75a69e4339ade1390d9e09f8b852 100644
--- a/module-apps/application-meditation/data/OptionsData.hpp
+++ b/module-apps/application-meditation/data/OptionsData.hpp
@@ -17,6 +17,6 @@ namespace gui
         {}
 
         std::chrono::seconds preparationTime{5};
-        bool showCounter = true;
+        bool showCounter = false;
     };
 } // namespace gui
diff --git a/module-apps/application-meditation/widgets/MeditationModel.cpp b/module-apps/application-meditation/widgets/MeditationModel.cpp
index f15c17d250fa395d263618bdbb87850544fde9bc..e65d6a574c813925062361a36dca7689389b892e 100644
--- a/module-apps/application-meditation/widgets/MeditationModel.cpp
+++ b/module-apps/application-meditation/widgets/MeditationModel.cpp
@@ -47,7 +47,7 @@ PreparationTimeModel::PreparationTimeModel(app::Application *app) : MeditationMo
 void PreparationTimeModel::clearData()
 {
     itemCurrentlySelected = nullptr;
-    clearData();
+    MeditationModel::clearData();
 }
 
 namespace
@@ -68,7 +68,7 @@ void PreparationTimeModel::createData()
             itemCurrentlySelected = item;
         }
 
-        item->activatedCallback = [this, app, item, record](gui::Item &) {
+        item->activatedCallback = [this, app, item](gui::Item &) {
             LOG_DEBUG("Selecting meditation time period");
             if (itemCurrentlySelected != nullptr) {
                 itemCurrentlySelected->select(false);