From 6346d9fd9cf81b5eb24a84cdf0bd412a12505c9e Mon Sep 17 00:00:00 2001
From: Pawel Olejniczak <pawel.olejniczak@mudita.com>
Date: Mon, 21 Feb 2022 18:00:12 +0100
Subject: [PATCH] [MOS-76] Add missing space in the separator

Days of the week should be separated by
a comma and a space in the alarm repeat widget
---
 .../application-alarm-clock/models/NewEditAlarmModel.cpp | 4 ++--
 .../presenter/AlarmRRulePresenter.cpp                    | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
index 1369c07a888a789623b58c73824572ba042c4805..550b5464c818f23478863c9a35df5be74953965f 100644
--- a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
+++ b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
@@ -19,8 +19,8 @@ namespace app::alarmClock
                                          std::shared_ptr<SoundsPlayer> player,
                                          std::shared_ptr<alarmClock::AlarmRRulePresenter> rRulePresenter,
                                          std::shared_ptr<AbstractAlarmsRepository> alarmsRepository)
-        : application(app), alarmsRepository{std::move(alarmsRepository)}, soundsPlayer(player),
-          rRulePresenter(rRulePresenter)
+        : application(app), alarmsRepository{std::move(alarmsRepository)}, soundsPlayer(std::move(player)),
+          rRulePresenter(std::move(rRulePresenter))
     {}
 
     unsigned int NewEditAlarmModel::requestRecordsCount()
diff --git a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
index 049927433771c937f75c9fb438916ba4b9a253b5..2213318b29f5116f787a8190884c75f9c26a0776 100644
--- a/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
+++ b/module-apps/application-alarm-clock/presenter/AlarmRRulePresenter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AlarmRRulePresenter.hpp"
@@ -6,7 +6,8 @@
 
 namespace app::alarmClock
 {
-    AlarmRRulePresenter::AlarmRRulePresenter(std::shared_ptr<AlarmEventRecord> recordToLoad) : alarm(recordToLoad)
+    AlarmRRulePresenter::AlarmRRulePresenter(std::shared_ptr<AlarmEventRecord> recordToLoad)
+        : alarm(std::move(recordToLoad))
     {}
 
     void AlarmRRulePresenter::loadRecord(std::shared_ptr<AlarmEventRecord> recordToLoad)
@@ -63,11 +64,11 @@ namespace app::alarmClock
             for (unsigned int i = 0; i < utl::num_days; ++i) {
                 if ((0x1 & (setDays >> i)) != 0) {
                     auto dayname = utils::time::Locale::get_short_day(i);
-                    retval += dayname + ",";
+                    retval += dayname + ", ";
                 }
             }
             if (retval.length() > 0) {
-                retval.removeChar(retval.length() - 1);
+                retval.removeChar(retval.length() - 2);
             }
         }
         return retval;