From dfb665bb4b8c470f9db96c9bd03fcf3c31dfe49c Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Mon, 24 Oct 2016 16:56:05 +0200 Subject: [PATCH] alarms: change new alarm default values. Set alarms initial values according to guideline. Change-Id: I07c67a1731a5c89b43153328b4381de2089e4b8e --- clock/inc/Common/Defines.h | 3 +++ clock/inc/Presenter/RingPresenter.h | 2 -- clock/src/Presenter/EditAlarmPresenter.cpp | 16 +++++++--------- clock/src/Presenter/RingPresenter.cpp | 7 +++---- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/clock/inc/Common/Defines.h b/clock/inc/Common/Defines.h index dfac3f0..a933777 100644 --- a/clock/inc/Common/Defines.h +++ b/clock/inc/Common/Defines.h @@ -6,4 +6,7 @@ #define APP_CONTROL_OPERATION_TIMEOUT "http://tizen.org/appcontrol/operation/timeout" #define APP_CONTROL_OPERATION_ALARM "http://tizen.org/appcontrol/operation/alarm" +#define SOUND_DEFAULT "settings/ringtone_sdk.mp3" + + #endif diff --git a/clock/inc/Presenter/RingPresenter.h b/clock/inc/Presenter/RingPresenter.h index b16bd99..0910adb 100644 --- a/clock/inc/Presenter/RingPresenter.h +++ b/clock/inc/Presenter/RingPresenter.h @@ -60,8 +60,6 @@ namespace presenter { * @brief Callback function called on sound stream focus change. */ void SoundStreamChanged(void); - - static const char *SOUND_DEFAULT; }; } //namespace presenter diff --git a/clock/src/Presenter/EditAlarmPresenter.cpp b/clock/src/Presenter/EditAlarmPresenter.cpp index 114365d..a366684 100644 --- a/clock/src/Presenter/EditAlarmPresenter.cpp +++ b/clock/src/Presenter/EditAlarmPresenter.cpp @@ -1,5 +1,7 @@ +#include "Common/Defines.h" #include "Presenter/EditAlarmPresenter.h" #include "Utils/Log.h" +#include "Utils/Utils.h" #include "Model/AlarmProvider.h" #include "Utils/EventBus.h" #include "Model/AlarmEvent.h" @@ -30,16 +32,12 @@ view::EditAlarmView::AlarmViewInfo EditAlarmPresenter::GetDefaultInfo() const view::EditAlarmView::AlarmViewInfo data; data.time = Time::Now(); - data.flags.AddDay(WeekDay::MONDAY); - data.flags.AddDay(WeekDay::TUESDAY); - data.flags.AddDay(WeekDay::WEDNESDAY); - data.flags.AddDay(WeekDay::THURSDAY); - data.flags.AddDay(WeekDay::FRIDAY); data.snooze = true; - data.volume = 0.6; - data.melody = "Over the horizon"; - data.type = AlarmType::VIBRATION; - data.name = "Alarm"; + data.volume = 0.7; + data.melody = Utils::GetAppResourcePath( + Utils::APP_DIR_RESOURCE, SOUND_DEFAULT); + data.type = AlarmType::SOUND_ONLY; + data.name = ""; return data; } diff --git a/clock/src/Presenter/RingPresenter.cpp b/clock/src/Presenter/RingPresenter.cpp index 569d4f7..5a8f30f 100644 --- a/clock/src/Presenter/RingPresenter.cpp +++ b/clock/src/Presenter/RingPresenter.cpp @@ -18,11 +18,10 @@ #include "Utils/Time.h" #include "Utils/Utils.h" #include "Controller/RingController.h" +#include "Common/Defines.h" namespace presenter { -const char *SOUND_DEFAULT = "settings/ringtone_sdk.mp3"; - RingPresenter::RingPresenter(view::RingView *view, model::Ring *model) : view_(view), model_(model) { @@ -41,7 +40,7 @@ RingPresenter::RingPresenter(view::RingView *view, model::Ring *model) model_->Run(); animator_.Start(); view_->EnableSnooze(false); - view_->PlayMusic(utils::Utils::GetAppResourcePath(utils::Utils::APP_DIR_RESOURCE, presenter::SOUND_DEFAULT), 1.0); + view_->PlayMusic(utils::Utils::GetAppResourcePath(utils::Utils::APP_DIR_RESOURCE, SOUND_DEFAULT), 1.0); view_->StartVibration(); } @@ -69,7 +68,7 @@ RingPresenter::RingPresenter(view::RingView *view, model::Alarm *alarm) else { DBG("Invalid alarm's sound path. Playing default."); view_->PlayMusic(utils::Utils::GetAppResourcePath( - utils::Utils::APP_DIR_RESOURCE, presenter::SOUND_DEFAULT), + utils::Utils::APP_DIR_RESOURCE, SOUND_DEFAULT), alarm_->GetVolume()); } -- 2.7.4