Fix to N_SE-54345,N_SE-54559,N_SE-54500,N_SE-54495

Change-Id: I9438b92142cf838385d7cf06f3eaf68554cb502b
Signed-off-by: Gaurav Bhatt <gaurav.bhatt@samsung.com>

diff --git a/inc/ClEventEditorForm.h b/inc/ClEventEditorForm.h
index b83f8d0..10f4faf 100644 (file)
--- a/inc/ClEventEditorForm.h
+++ b/inc/ClEventEditorForm.h
@@ -39,6 +39,7 @@ class EventEditorForm
        , public virtual Tizen::Ui::Controls::ISectionTableViewItemEventListener
        , public virtual Tizen::Ui::Controls::ISectionTableViewItemProvider
        , public virtual Tizen::Ui::Scenes::ISceneEventListener
+       , public virtual Tizen::Ui::ITouchEventListener
        , public virtual ICalendarEventChangedEventListener
 {
 public:
@@ -82,6 +83,18 @@ public:
                                                                                const Tizen::Ui::Scenes::SceneId& nextSceneId);
 
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+
+       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo & touchInfo);
+       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                               const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo& touchInfo);
+
        virtual void OnCalendarEventChanged(void);
 
 private:
@@ -129,6 +142,9 @@ private:
        Tizen::Ui::Controls::Button* __pButtonDeleteReminder;
        Tizen::Ui::Controls::TableViewItem* __pItemReminder[MAX_COUNT_OF_REMINDER];
        CalendarSelectorPopup* __pCalendarSelectorPopup;
+       Tizen::Ui::Controls::Label* __pSaveSubText;
+       Tizen::Ui::Controls::Label* __pRemindSubText[MAX_COUNT_OF_REMINDER];
+       Tizen::Ui::Controls::Label* __pRepeatSubText;
 }; // EventEditorForm
 
 #endif // _CL_EVENT_EDITOR_FORM_H_

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 56b4f09..9a59b5d 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -101,6 +101,21 @@ static const int FONT_SIZE_DETAIL02 = 32;
 static const unsigned int COLOR_DETAIL02 = Color32<128, 128, 128>::Value;
 static const int FONT_SIZE_DETAIL03 = 44;
 static const unsigned int COLOR_DISABLE = Color32<58, 58, 58, 77>::Value;
+static const unsigned int COLOR_PRESS = Color32<255, 255, 255>::Value;
+static const wchar_t* SAVE_SUB = L"SAVE_SUB";
+static const wchar_t* SAVE_MAIN = L"SAVE_MAIN";
+static const wchar_t* REMINDER_SUB_1 = L"REMINDER_SUB1";
+static const wchar_t* REMINDER_MAIN_1 = L"REMINDER_MAIN1";
+static const wchar_t* REMINDER_SUB_2 = L"REMINDER_SUB2";
+static const wchar_t* REMINDER_MAIN_2 = L"REMINDER_MAIN2";
+static const wchar_t* REMINDER_SUB_3 = L"REMINDER_SUB3";
+static const wchar_t* REMINDER_MAIN_3 = L"REMINDER_MAIN3";
+static const wchar_t* REMINDER_SUB_4 = L"REMINDER_SUB4";
+static const wchar_t* REMINDER_MAIN_4 = L"REMINDER_MAIN4";
+static const wchar_t* REMINDER_SUB_5 = L"REMINDER_SUB5";
+static const wchar_t* REMINDER_MAIN_5 = L"REMINDER_MAIN5";
+static const wchar_t* REPEAT_SUB = L"REPEAT_SUB";
+static const wchar_t* REPEAT_MAIN = L"REPEAT_MAIN";
 
 static const int EXPANDABLE_EDIT_MAX_LINE = 10;
 static const int EDITFIELD_LIMIT_LENGTH = 500;
@@ -125,9 +140,12 @@ EventEditorForm::EventEditorForm(void)
        , __pButtonAddReminer(null)
        , __pButtonDeleteReminder(null)
        , __pCalendarSelectorPopup(null)
+       , __pSaveSubText(null)
+       , __pRepeatSubText(null)
 {
        memset(__pLabelReminder, 0, sizeof(Label*) * MAX_COUNT_OF_REMINDER);
        memset(__pItemReminder, 0, sizeof(TableViewItem*) * MAX_COUNT_OF_REMINDER);
+       memset(__pRemindSubText, 0, sizeof(Label*) * MAX_COUNT_OF_REMINDER);
 }
 
 EventEditorForm::~EventEditorForm(void)
@@ -451,15 +469,24 @@ EventEditorForm::DeleteItem(int sectionIndex, int itemIndex, TableViewItem* pIte
                case ADDITIONAL_CONTENT_ITEM_REMINDER4:
                        // fall through
                case ADDITIONAL_CONTENT_ITEM_REMINDER5:
+                       __pRemindSubText[itemIndex]->RemoveTouchEventListener(*this);
+                       __pLabelReminder[itemIndex]->RemoveTouchEventListener(*this);
+                       __pRemindSubText[itemIndex] = null;
                        __pLabelReminder[itemIndex] = null;
                        __pItemReminder[itemIndex] = null;
                        break;
                case ADDITIONAL_CONTENT_ITEM_REPEAT:
+                       __pRepeatSubText->RemoveTouchEventListener(*this);
+                       __pLabelRepeat->RemoveTouchEventListener(*this);
+                       __pRepeatSubText = null;
                        __pLabelRepeat = null;
                        break;
                }
                break;
        case GROUP_SAVE_TO:
+               __pLabelSaveTo->RemoveTouchEventListener(*this);
+               __pSaveSubText->RemoveTouchEventListener(*this);
+               __pSaveSubText = null;
                __pLabelSaveTo = null;
                break;
        default:
@@ -1025,6 +1052,147 @@ EventEditorForm::OnActionPerformed(const Control& source, int actionId)
 }
 
 void
+EventEditorForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo & touchInfo)
+{
+       AppLogDebug("Source Name = %ls",source.GetName().GetPointer());
+       if (source.GetName() == SAVE_SUB || source.GetName() == SAVE_MAIN)
+       {
+               __pSaveSubText->SetTextColor(Color(COLOR_PRESS));
+               __pSaveSubText->Invalidate(false);
+       }
+       else if (source.GetName() == REPEAT_SUB || source.GetName() == REPEAT_MAIN)
+       {
+               __pRepeatSubText->SetTextColor(Color(COLOR_PRESS));
+               __pRepeatSubText->Invalidate(false);
+       }
+       else
+       {
+               if (source.GetName() == REMINDER_SUB_1 || source.GetName() == REMINDER_MAIN_1)
+               {
+                       __pRemindSubText[0]->SetTextColor(Color(COLOR_PRESS));
+                       __pRemindSubText[0]->Invalidate(false);
+               }
+               else if (source.GetName() == REMINDER_SUB_2 || source.GetName() == REMINDER_MAIN_2)
+               {
+                       __pRemindSubText[1]->SetTextColor(Color(COLOR_PRESS));
+                       __pRemindSubText[1]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_3 || source.GetName() == REMINDER_MAIN_3)
+               {
+                       __pRemindSubText[2]->SetTextColor(Color(COLOR_PRESS));
+                       __pRemindSubText[2]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_4 || source.GetName() == REMINDER_MAIN_4)
+               {
+                       __pRemindSubText[3]->SetTextColor(Color(COLOR_PRESS));
+                       __pRemindSubText[3]->Invalidate(false);
+               }
+               else
+               {
+                       __pRemindSubText[4]->SetTextColor(Color(COLOR_PRESS));
+                       __pRemindSubText[4]->Invalidate(false);
+               }
+       }
+
+}
+
+void
+EventEditorForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
+{
+       if (source.GetName() == SAVE_SUB || source.GetName() == SAVE_MAIN)
+       {
+               __pSaveSubText->SetTextColor(Color(COLOR_DETAIL02));
+               __pSaveSubText->Invalidate(false);
+       }
+       else if (source.GetName() == REPEAT_SUB || source.GetName() == REPEAT_MAIN)
+       {
+               __pRepeatSubText->SetTextColor(Color(COLOR_DETAIL02));
+               __pRepeatSubText->Invalidate(false);
+       }
+       else
+       {
+               if (source.GetName() == REMINDER_SUB_1 || source.GetName() == REMINDER_MAIN_1)
+               {
+                       __pRemindSubText[0]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[0]->Invalidate(false);
+               }
+               else if (source.GetName() == REMINDER_SUB_2 || source.GetName() == REMINDER_MAIN_2)
+               {
+                       __pRemindSubText[1]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[1]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_3 || source.GetName() == REMINDER_MAIN_3)
+               {
+                       __pRemindSubText[2]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[2]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_4 || source.GetName() == REMINDER_MAIN_4)
+               {
+                       __pRemindSubText[3]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[3]->Invalidate(false);
+               }
+               else
+               {
+                       __pRemindSubText[4]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[4]->Invalidate(false);
+               }
+       }
+
+}
+
+void
+EventEditorForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
+{
+       if (source.GetName() == SAVE_SUB || source.GetName() == SAVE_MAIN)
+       {
+               __pSaveSubText->SetTextColor(Color(COLOR_DETAIL02));
+               __pSaveSubText->Invalidate(false);
+       }
+       else if (source.GetName() == REPEAT_SUB || source.GetName() == REPEAT_MAIN)
+       {
+               __pRepeatSubText->SetTextColor(Color(COLOR_DETAIL02));
+               __pRepeatSubText->Invalidate(false);
+       }
+       else
+       {
+               if (source.GetName() == REMINDER_SUB_1 || source.GetName() == REMINDER_MAIN_1)
+               {
+                       __pRemindSubText[0]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[0]->Invalidate(false);
+               }
+               else if (source.GetName() == REMINDER_SUB_2 || source.GetName() == REMINDER_MAIN_2)
+               {
+                       __pRemindSubText[1]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[1]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_3 || source.GetName() == REMINDER_MAIN_3)
+               {
+                       __pRemindSubText[2]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[2]->Invalidate(false);
+               }
+               else            if (source.GetName() == REMINDER_SUB_4 || source.GetName() == REMINDER_MAIN_4)
+               {
+                       __pRemindSubText[3]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[3]->Invalidate(false);
+               }
+               else
+               {
+                       __pRemindSubText[4]->SetTextColor(Color(COLOR_DETAIL02));
+                       __pRemindSubText[4]->Invalidate(false);
+               }
+       }
+}
+void
+EventEditorForm::OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo& touchInfo)
+{
+}
+void
+EventEditorForm::OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
+                                                                       const Tizen::Ui::TouchEventInfo& touchInfo)
+{
+}
+void
 EventEditorForm::OnCalendarEventChanged(void)
 {
        if(__style == EDIT_EVENT_FORM_STYLE_EDIT && __pPm->IsEventValid() == false)
@@ -1269,6 +1437,8 @@ EventEditorForm::CreateReminderItemN(int itemWidth, int itemHeight, const String
        pLabel->SetTextColor(Color(COLOR_DETAIL02));
        pLabel->SetTextConfig(FONT_SIZE_DETAIL02, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       __pRemindSubText[index] = pLabel;
+       pLabel->AddTouchEventListener(*this);
 
        Label* pContentLabel = new (std::nothrow) Label();
        pContentLabel->Construct(Rectangle(0, Y_ITEM_CONTENT02, itemWidth - W_REMINDER_DELETE_BUTTON_MARGIN, H_ITEM_CONTENT02), reminder);
@@ -1277,7 +1447,25 @@ EventEditorForm::CreateReminderItemN(int itemWidth, int itemHeight, const String
 
        pContentLabel->SetTextConfig(FONT_SIZE_DETAIL03, LABEL_TEXT_STYLE_NORMAL);
        pContentLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-
+       switch(index)
+       {
+       case 0: pLabel->SetName(REMINDER_SUB_1);
+                   pContentLabel->SetName(REMINDER_MAIN_1);
+                   break;
+       case 1: pLabel->SetName(REMINDER_SUB_2);
+               pContentLabel->SetName(REMINDER_MAIN_2);
+               break;
+       case 2: pLabel->SetName(REMINDER_SUB_3);
+                       pContentLabel->SetName(REMINDER_MAIN_3);
+                       break;
+       case 3: pLabel->SetName(REMINDER_SUB_4);
+                       pContentLabel->SetName(REMINDER_MAIN_4);
+                       break;
+       case 4: pLabel->SetName(REMINDER_SUB_5);
+                       pContentLabel->SetName(REMINDER_MAIN_5);
+                       break;
+       }
+       pContentLabel->AddTouchEventListener(*this);
        // Add delete button
        Button* pButtonDeleteReminder = new (std::nothrow) Button();
        pButtonDeleteReminder->Construct(Rectangle(itemWidth - W_REMINDER_DELETE_BUTTON_MARGIN,
@@ -1382,11 +1570,16 @@ EventEditorForm::CreateRepeatItemN(int itemWidth, const String& repeat)
        pLabel->SetTextColor(Color(COLOR_DETAIL02));
        pLabel->SetTextConfig(FONT_SIZE_DETAIL02, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+       __pRepeatSubText = pLabel;
+       pLabel->SetName(REPEAT_SUB);
+       pLabel->AddTouchEventListener(*this);
 
        pContentLabel = new (std::nothrow) Label();
        pContentLabel->Construct(Rectangle(0, Y_ITEM_CONTENT02, itemWidth, H_ITEM_CONTENT02), repeat);
-
+       pLabel->AddTouchEventListener(*this);
        pItem->AddControl(pContentLabel);
+       pContentLabel->SetName(REPEAT_MAIN);
+       pContentLabel->AddTouchEventListener(*this);
 
        pContentLabel->SetTextConfig(FONT_SIZE_DETAIL03, LABEL_TEXT_STYLE_NORMAL);
        pContentLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -1418,7 +1611,9 @@ EventEditorForm::CreateSaveToItemN(int itemWidth, const String& calendarName, co
                                                  ResourceManager::GetString(IDS_ST_BODY_SAVE_TO));
 
        pItem->AddControl(pLabel);
-
+       pLabel->SetName(SAVE_SUB);
+       __pSaveSubText = pLabel;
+       pLabel->AddTouchEventListener(*this);
        pLabel->SetTextColor(Color(COLOR_DETAIL02));
        pLabel->SetTextConfig(FONT_SIZE_DETAIL02, LABEL_TEXT_STYLE_NORMAL);
        pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -1427,6 +1622,8 @@ EventEditorForm::CreateSaveToItemN(int itemWidth, const String& calendarName, co
        pContentLabel->Construct(Rectangle(0, Y_ITEM_CONTENT02, itemWidth, H_ITEM_CONTENT02), calendarName);
 
        pItem->AddControl(pContentLabel);
+       pContentLabel->AddTouchEventListener(*this);
+       pContentLabel->SetName(SAVE_MAIN);
 
        pContentLabel->SetTextConfig(FONT_SIZE_DETAIL03, LABEL_TEXT_STYLE_NORMAL);
        pContentLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index 3a7a0ef..ed3202e 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -638,11 +638,14 @@ ReminderForm::OnKeypadClosed(Tizen::Ui::Control& source)
        __isKeypadOpen = false;
        if(__showContextMenu == true)
        {
+               if(__reminderType == REMINDER_TYPE_CUSTOM)
+               {
                Point point = __pButtonReminderTimeUnit->ConvertToScreenPosition(__pButtonReminderTimeUnit->GetPosition());
                point.x -= __pButtonReminderTimeUnit->GetWidth();
                __pContextMenuTimeUnitSelector->SetAnchorPosition(point);
                __pContextMenuTimeUnitSelector->SetShowState(true);
                __pContextMenuTimeUnitSelector->Show();
+               }
                __showContextMenu = false;
        }
 }

diff --git a/src/ClRepeatForm.cpp b/src/ClRepeatForm.cpp
index e256b27..95dcd0c 100644 (file)
--- a/src/ClRepeatForm.cpp
+++ b/src/ClRepeatForm.cpp
@@ -54,6 +54,7 @@ static const int X_REPEAT_UNTIL_TYPE_EDIT_DATE = 0;
 static const int Y_REPEAT_UNTIL_TYPE_EDIT_DATE = 0;
 static const int DEFAULT_REPEAT_COUNT = 10;
 static const int IDA_REMINDER_FORM_BACK = 29101;
+static const int REMINDER_COUNT_MAX = 99;
 
 RepeatForm::RepeatForm(void)
        : __pRepeat(null)
@@ -698,6 +699,10 @@ RepeatForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId& cur
                if (__pRepeat->GetCounts() > 0)
                {
                        __repeatCount = __pRepeat->GetCounts();
+                       if (__repeatCount > REMINDER_COUNT_MAX)
+                       {
+                               __repeatCount = REMINDER_COUNT_MAX;
+                       }
                        __repeatUntilType = REPEAT_UNTIL_TYPE_COUNT;
                }
                else if (*__pRepeat->GetUntil() < maxdate)

diff --git a/src/ClSettingForm.cpp b/src/ClSettingForm.cpp
index e349c01..8caf7cf 100644 (file)
--- a/src/ClSettingForm.cpp
+++ b/src/ClSettingForm.cpp
@@ -835,7 +835,7 @@ SettingForm::CreateFirstDayOfWeekExpanderItemN(int itemWidth, bool isSundayFirst
        pItem->AddControl(pLabel);
 
        Label* pFirstDayOfWeekLabel = new (std::nothrow) Label();
-       pFirstDayOfWeekLabel->Construct(Rectangle(0, Y_FIRST_DAY_OF_WEEK_ITEM_CONTENT, itemWidth, GetMainContentHeight()),
+       pFirstDayOfWeekLabel->Construct(Rectangle(0, Y_FIRST_DAY_OF_WEEK_ITEM_CONTENT, itemWidth - __itemHeight * H_ICON_SCALE - W_FIRST_DAY_OF_WEEK_ITEM_ICON_MARGIN, GetMainContentHeight()),
                                                                        (isSundayFirst == true) ? ResourceManager::GetString(IDS_CLD_BODY_SUNDAY) : ResourceManager::GetString(IDS_CLD_BODY_MONDAY));
        pFirstDayOfWeekLabel->SetTextConfig(__fontSize, LABEL_TEXT_STYLE_NORMAL);
        pFirstDayOfWeekLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);