Resolved issue N_SE-38507

Change-Id: If8ffc94d23bb1d9ad4e6c1ede86bfe24b44fb2f6

diff --git a/inc/ClReminderForm.h b/inc/ClReminderForm.h
index e6e17e3..426fcfa 100644 (file)
--- a/inc/ClReminderForm.h
+++ b/inc/ClReminderForm.h
@@ -28,7 +28,6 @@
 class ReminderForm
        : public Tizen::Ui::Controls::Form
        , public virtual Tizen::Ui::IActionEventListener
-       , public virtual Tizen::Ui::IKeypadEventListener
        , public virtual Tizen::Ui::ITextEventListener
        , public virtual Tizen::Ui::Controls::IEditTextFilter
        , public virtual Tizen::Ui::Controls::IFormBackEventListener
@@ -79,11 +78,6 @@ public:
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual void OnKeypadWillOpen(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
-       virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction);
-
 private:
        enum ReminderType
        {

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index 1c56491..1c58c94 100755 (executable)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -66,7 +66,6 @@ static const unsigned int COLOR_GROUP_ITEM_TODAY_BACKGROUND = Color32<239, 236,
 static const unsigned int COLOR_GROUP_ITEM_TEXT = Color32<128, 128, 128>::Value;
 static const unsigned int COLOR_GROUP_ITEM_TODAY_TEXT = Color32<59, 115, 182>::Value;
 static const unsigned int COLOR_TOP_BOTTOM_ITEM_TEXT = Color32<42, 137, 194>::Value;
-static const unsigned int COLOR_ITEM_BACKGROUND = Color32<248, 246, 239>::Value;
 static const unsigned int COLOR_ITEM_TODAY_BACKGROUND = Color32<239, 236, 224>::Value;
 static const unsigned int COLOR_ITEM_TEXT_PRESSED = Color32<255, 255, 255>::Value;
 
@@ -182,7 +181,7 @@ EventDeleterForm::OnInitializing(void)
 result
 EventDeleterForm::OnTerminating(void)
 {
-       if (__pThread != null)
+       if (__pThread)
        {
                __pThread->Join();
                delete __pThread;
@@ -217,7 +216,7 @@ EventDeleterForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                        delete __pThread;
                }
 
-               if (__pProgressPopup == null)
+               if (!__pProgressPopup)
                {
                        __pProgressPopup = new (std::nothrow) ProgressPopup();
                        __pProgressPopup->Construct(false, false);
@@ -854,7 +853,7 @@ bool
 EventDeleterForm::IsSelectedAllEventBeforeToday(void)
 {
        DateTime today = EventListPresentationModel::GetToday();
-       today.SetValue(today.GetYear(), today.GetMonth(), today.GetDay(), 0, 0, 0);
+       today.SetValue(today.GetYear(), today.GetMonth(), today.GetDay());
 
        if (__pPm->GetDateTimeFromGroupIndex(0) >= today)
        {

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 4b46706..aab941c 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -369,9 +369,9 @@ EventEditorForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pIte
                switch (itemIndex)
                {
                case FROM_DATE_SELECTOR_ITEM_START:
-                       if (__pPm->IsAllDayEvent() == true)
+                       if (__pPm->IsAllDayEvent())
                        {
-                               if (__pEditDateStartDate != null)
+                               if (__pEditDateStartDate)
                                {
                                        DateTime start;
                                        start.SetValue(__pEditDateStartDate->GetYear(), __pEditDateStartDate->GetMonth(), __pEditDateStartDate->GetDay());
@@ -380,7 +380,7 @@ EventEditorForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pIte
                        }
                        else
                        {
-                               if (__pEditDateStartDate != null && __pEditTimeStartTime != null)
+                               if (__pEditDateStartDate && __pEditTimeStartTime)
                                {
                                        DateTime start;
                                        start.SetValue(__pEditDateStartDate->GetYear(), __pEditDateStartDate->GetMonth(), __pEditDateStartDate->GetDay(),
@@ -392,9 +392,9 @@ EventEditorForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pIte
                        __pEditTimeStartTime = null;
                        break;
                case TO_DATE_SELECTOR_ITEM_END:
-                       if (__pPm->IsAllDayEvent() == true)
+                       if (__pPm->IsAllDayEvent())
                        {
-                               if (__pEditDateEndDate != null)
+                               if (__pEditDateEndDate)
                                {
                                        DateTime end;
                                        end.SetValue(__pEditDateEndDate->GetYear(), __pEditDateEndDate->GetMonth(), __pEditDateEndDate->GetDay());
@@ -403,7 +403,7 @@ EventEditorForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pIte
                        }
                        else
                        {
-                               if (__pEditDateEndDate != null && __pEditTimeEndTime != null)
+                               if (__pEditDateEndDate && __pEditTimeEndTime)
                                {
                                        DateTime end;
                                        end.SetValue(__pEditDateEndDate->GetYear(), __pEditDateEndDate->GetMonth(), __pEditDateEndDate->GetDay(),
@@ -738,15 +738,15 @@ EventEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        if (previousSceneId == IDSCN_REMINDER)
        {
                int index = 0;
-               if (pArgs != null)
+               if (pArgs)
                {
                        Integer* pIndex = dynamic_cast<Integer*>(pArgs->GetAt(0));
-                       if (pIndex != null)
+                       if (pIndex)
                        {
                                index = pIndex->ToInt();
                        }
                        Reminder* pReminder = dynamic_cast<Reminder*>(pArgs->GetAt(1));
-                       if (pReminder != null)
+                       if (pReminder)
                        {
                                if (index < __pPm->GetCountReminder())
                                {
@@ -903,7 +903,7 @@ EventEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 
        __pTableView->SetItemChecked(GROUP_DATE_SELECTOR, DATE_SELECTOR_ITEM_ALL_DAY_EVENT, __pPm->IsAllDayEvent());
 
-       if (pArgs != null)
+       if (pArgs)
        {
                pArgs->RemoveAll(true);
                delete pArgs;

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index c6eeca6..35f294e 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -769,20 +769,18 @@ EventPresentationModel::Update(void)
        // Check duplicated reminder
        for (int i = 0; i < GetCountReminder() - 1; ++i)
        {
-               const Reminder* pReminder = GetReminder(i);
+               Reminder reminder = *GetReminder(i);
                for (int j = i + 1; j < GetCountReminder(); ++j)
                {
-                       const Reminder* pCompReminder = GetReminder(j);
-                       if (pReminder->GetTimeOffset() == pCompReminder->GetTimeOffset()
-                                && pReminder->GetTimeUnit() == pCompReminder->GetTimeUnit())
+                       Reminder compReminder = *GetReminder(j);
+                       if (reminder.GetTimeOffset() == compReminder.GetTimeOffset()
+                                && reminder.GetTimeUnit() == compReminder.GetTimeUnit())
                        {
                                __pEvent->RemoveReminderAt(j--);
                        }
                }
        }
 
-       result r = E_SUCCESS;
-
        DateTime startUtcTime, endUtcTime;
        if (__pEvent->IsAllDayEvent())
        {
@@ -795,7 +793,7 @@ EventPresentationModel::Update(void)
                endUtcTime = ResourceManager::ConvertWallTimeToUtcTime(__endDateTime);
        }
 
-       r = __pEvent->SetStartAndEndTime(startUtcTime, endUtcTime);
+       result r = __pEvent->SetStartAndEndTime(startUtcTime, endUtcTime);
        TryReturn(r == E_SUCCESS, E_REJECTED, "[%s] %ls ~ %ls Failed SetStartAndEndTime",
                        GetErrorMessage(r), startUtcTime.ToString().GetPointer(), endUtcTime.ToString().GetPointer());
 

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index 0b9416f..3263fc0 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -77,8 +77,6 @@ ReminderForm::Initialize(void)
 result
 ReminderForm::OnInitializing(void)
 {
-       __pReminder = new (std::nothrow) Reminder();
-
        SetFormBackEventListener(this);
 
        __pTableView = dynamic_cast<SectionTableView*>(GetControl(L"IDC_SECTIONTABLEVIEW"));
@@ -142,18 +140,15 @@ void
 ReminderForm::OnFormBackRequested(Form& source)
 {
        SetFocus();
-       if (__reminderType == REMINDER_TYPE_OFF)
+       LinkedList* pList = new (std::nothrow) LinkedList(SingleObjectDeleter);
+       pList->Add(new (std::nothrow) Integer(__index));
+
+       if (__reminderType != REMINDER_TYPE_OFF)
        {
-               LinkedList* pList = new (std::nothrow) LinkedList();
-               pList->Add(new (std::nothrow) Integer(__index));
-               SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), pList);
-               return;
+               pList->Add(__pReminder);
+               __pReminder = null;
        }
 
-       LinkedList* pList = new (std::nothrow) LinkedList();
-       pList->Add(new (std::nothrow) Integer(__index));
-       pList->Add(__pReminder);
-       __pReminder = null;
        SceneManager::GetInstance()->GoBackward(BackwardSceneTransition(SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), pList);
 }
 
@@ -210,7 +205,6 @@ ReminderForm::CreateItem(int sectionIndex, int itemIndex, int itemWidth)
                __pEditFieldReminderTime->Construct(Rectangle(x, Y_REMINDER_TYPE_CUSTOM_EDIT_FILED, W_REMINDER_TYPE_CUSTOM_EDIT_FILED,
                                                                                        H_REMINDER_TYPE_CUSTOM_EDIT_FILED), EDIT_FIELD_STYLE_NUMBER, INPUT_STYLE_OVERLAY, false, 2);
                __pEditFieldReminderTime->SetGuideText(L"00");
-               __pEditFieldReminderTime->AddKeypadEventListener(*this);
                __pEditFieldReminderTime->AddTextEventListener(*this);
                __pEditFieldReminderTime->SetEditTextFilter(this);
                __pEditFieldReminderTime->SetText(__customReminderTimeOffset);
@@ -418,135 +412,133 @@ ReminderForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& c
        AppLogDebug("Enter.");
        Reminder* pReminder = null;
        Integer* pIndex = null;
-       TryCatch(pArgs != null, , "Unable to get arguments.");
 
-       pIndex = dynamic_cast<Integer*>(pArgs->GetAt(1));
-       if (pIndex != null)
+       if (pArgs)
        {
-               __index = pIndex->ToInt();
-       }
-
-       pReminder = dynamic_cast<Reminder*>(pArgs->GetAt(0));
-       if (pReminder != null)
-       {
-               if (pArgs->RemoveAt(0) == E_SUCCESS)
-               {
-                       __pReminder = pReminder;
-               }
-               else
+               pIndex = dynamic_cast<Integer*>(pArgs->GetAt(1));
+               if (pIndex)
                {
-                       *__pReminder = *pReminder;
+                       __index = pIndex->ToInt();
                }
 
-               int itemIndex = (int)__reminderType;
-               __reminderType = REMINDER_TYPE_CUSTOM;
-
-               if (__pReminder->GetTimeOffset() == 0)
+               pReminder = dynamic_cast<Reminder*>(pArgs->GetAt(0));
+               if (pReminder)
                {
-                       __reminderType = REMINDER_TYPE_ON_TIME;
-               }
+                       __pReminder = new (std::nothrow) Reminder(*pReminder);
 
-               switch (__pReminder->GetTimeUnit())
-               {
-               case REMINDER_TIME_UNIT_MINUTE:
-                       switch (__pReminder->GetTimeOffset())
-                       {
-                       case 5:
-                               __reminderType = REMINDER_TYPE_5_MINS_BEFORE;
-                               break;
-                       case 15:
-                               __reminderType = REMINDER_TYPE_15_MINS_BEFORE;
-                               break;
-                       }
-                       break;
-               case REMINDER_TIME_UNIT_HOUR:
-                       if (__pReminder->GetTimeOffset() == 1)
-                       {
-                               __reminderType = REMINDER_TYPE_1_HOUR_BEFORE;
-                       }
-                       break;
-               case REMINDER_TIME_UNIT_DAY:
-                       switch (__pReminder->GetTimeOffset())
-                       {
-                       case 1:
-                               __reminderType = REMINDER_TYPE_1_DAY_BEFORE;
-                               break;
-                       case 2:
-                               __reminderType = REMINDER_TYPE_2_DAYS_BEFORE;
-                               break;
-                       }
-                       break;
-               case REMINDER_TIME_UNIT_WEEK:
-                       if (__pReminder->GetTimeOffset() == 1)
+                       int itemIndex = (int)__reminderType;
+                       __reminderType = REMINDER_TYPE_CUSTOM;
+
+                       if (__pReminder->GetTimeOffset() == 0)
                        {
-                               __reminderType = REMINDER_TYPE_1_WEEK_BEFORE;
+                               __reminderType = REMINDER_TYPE_ON_TIME;
                        }
-                       break;
-               default:
-                       break;
-               }
 
-               if (__reminderType == REMINDER_TYPE_CUSTOM)
-               {
-                       __reminderTimeUnit = __pReminder->GetTimeUnit();
-                       __customReminderTimeUnit = __reminderTimeUnit;
-                       switch (__customReminderTimeUnit)
+                       switch (__pReminder->GetTimeUnit())
                        {
                        case REMINDER_TIME_UNIT_MINUTE:
-                               __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_MINUTE);
+                               switch (__pReminder->GetTimeOffset())
+                               {
+                               case 5:
+                                       __reminderType = REMINDER_TYPE_5_MINS_BEFORE;
+                                       break;
+                               case 15:
+                                       __reminderType = REMINDER_TYPE_15_MINS_BEFORE;
+                                       break;
+                               }
                                break;
                        case REMINDER_TIME_UNIT_HOUR:
-                               __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_HOUR);
+                               if (__pReminder->GetTimeOffset() == 1)
+                               {
+                                       __reminderType = REMINDER_TYPE_1_HOUR_BEFORE;
+                               }
                                break;
                        case REMINDER_TIME_UNIT_DAY:
-                               __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_DAY);
+                               switch (__pReminder->GetTimeOffset())
+                               {
+                               case 1:
+                                       __reminderType = REMINDER_TYPE_1_DAY_BEFORE;
+                                       break;
+                               case 2:
+                                       __reminderType = REMINDER_TYPE_2_DAYS_BEFORE;
+                                       break;
+                               }
                                break;
                        case REMINDER_TIME_UNIT_WEEK:
-                               __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_WEEK);
+                               if (__pReminder->GetTimeOffset() == 1)
+                               {
+                                       __reminderType = REMINDER_TYPE_1_WEEK_BEFORE;
+                               }
                                break;
                        default:
                                break;
                        }
 
-                       if (__pReminder->GetTimeOffset() > 0)
+                       if (__reminderType == REMINDER_TYPE_CUSTOM)
                        {
-                               if (__pReminder->GetTimeOffset() > MAX_REMINDER_TIME_UNIT)
+                               __reminderTimeUnit = __pReminder->GetTimeUnit();
+                               __customReminderTimeUnit = __reminderTimeUnit;
+                               switch (__customReminderTimeUnit)
                                {
-                                       __customReminderTimeOffset = Integer::ToString(MAX_REMINDER_TIME_UNIT);
+                               case REMINDER_TIME_UNIT_MINUTE:
+                                       __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_MINUTE);
+                                       break;
+                               case REMINDER_TIME_UNIT_HOUR:
+                                       __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_HOUR);
+                                       break;
+                               case REMINDER_TIME_UNIT_DAY:
+                                       __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_DAY);
+                                       break;
+                               case REMINDER_TIME_UNIT_WEEK:
+                                       __customReminderTimeUnitText = ResourceManager::GetString(IDS_REMINDER_CUSTOM_TIME_UNIT_WEEK);
+                                       break;
+                               default:
+                                       break;
                                }
-                               else
+
+                               if (__pReminder->GetTimeOffset() > 0)
                                {
-                                       __customReminderTimeOffset = Integer::ToString(__pReminder->GetTimeOffset());
+                                       if (__pReminder->GetTimeOffset() > MAX_REMINDER_TIME_UNIT)
+                                       {
+                                               __customReminderTimeOffset = Integer::ToString(MAX_REMINDER_TIME_UNIT);
+                                       }
+                                       else
+                                       {
+                                               __customReminderTimeOffset = Integer::ToString(__pReminder->GetTimeOffset());
+                                       }
                                }
                        }
+
+                       __pTableView->SetItemChecked(0, itemIndex, false);
                }
 
-               __pTableView->SetItemChecked(0, itemIndex, false);
+               pArgs->RemoveAll(true);
+               delete pArgs;
        }
 
-       pArgs->RemoveAll(true);
-       delete pArgs;
+       if (!__pReminder)
+       {
+               __pReminder = new (std::nothrow) Reminder();
+       }
 
-CATCH:
        __pTableView->UpdateTableView();
        __pTableView->SetItemChecked(0, __reminderType, true);
        __pTableView->Invalidate(true);
-       AppLogDebug("Exit.");
 }
 
 void
 ReminderForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& nextSceneId)
 {
        AppLogDebug("Enter.");
-       AppLogDebug("Exit.");
+       delete __pReminder;
+       __pReminder = null;
 }
 
 void
 ReminderForm::OnActionPerformed(const Control& source, int actionId)
 {
-       SetFocus();
        int timeOffset = 0;
-       if (__pEditFieldReminderTime != null)
+       if (__pEditFieldReminderTime)
        {
                Integer::Parse(__pEditFieldReminderTime->GetText(), timeOffset);
        }
@@ -554,11 +546,14 @@ ReminderForm::OnActionPerformed(const Control& source, int actionId)
        switch (actionId)
        {
        case IDA_REMINDER_FORM_TIME_UNIT:
-               __pContextMenuTimeUnitSelector->SetAnchorPosition(Point(X_TIME_UNIT_SELECTOR, Y_TIME_UNIT_SELECTOR));
+       {
+               Point point = __pButtonReminderTimeUnit->ConvertToScreenPosition(__pButtonReminderTimeUnit->GetPosition());
+               point.x -= __pButtonReminderTimeUnit->GetWidth();
+               __pContextMenuTimeUnitSelector->SetAnchorPosition(point);
                __pContextMenuTimeUnitSelector->SetShowState(true);
                __pContextMenuTimeUnitSelector->Show();
                break;
-
+       }
        case REMINDER_TIME_UNIT_MINUTE:
                __reminderTimeUnit = REMINDER_TIME_UNIT_MINUTE;
                __customReminderTimeUnit = REMINDER_TIME_UNIT_MINUTE;
@@ -592,27 +587,3 @@ ReminderForm::OnActionPerformed(const Control& source, int actionId)
                break;
        }
 }
-
-void
-ReminderForm::OnKeypadWillOpen(Tizen::Ui::Control& source)
-{
-}
-
-void
-ReminderForm::OnKeypadOpened(Tizen::Ui::Control& source)
-{
-       Invalidate(true);
-       __pTableView->ScrollToItem(0, REMINDER_TYPE_CUSTOM, TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
-}
-
-void
-ReminderForm::OnKeypadClosed(Tizen::Ui::Control& source)
-{
-       Invalidate(true);
-}
-
-void
-ReminderForm::OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction)
-{
-
-}