apply badge maker and fix prevent

Change-Id: Ib37d27ec75d4a7f85d36e07a4119a527b9879944

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index df0ba30..d16e801 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -1132,8 +1132,9 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem)
                        pButton->SetToolbarSelectedBitmap(*pColorReplacedBitmap, false);
 
                        delete pColorReplacedBitmap;
-                       delete pSelectedBitmap;
                }
+
+               delete pSelectedBitmap;
        }
        else if (__style == FOOTER_STYLE_BUTTON_TEXT || __style == FOOTER_STYLE_BUTTON_ICON || __style == FOOTER_STYLE_BUTTON_ICON_TEXT)
        {
@@ -1476,6 +1477,7 @@ protected:
 
                String elementString;
                int opacity = 0;
+               int numberedBadge = 0;
                Color color;
 
                //Construct
@@ -1822,6 +1824,21 @@ protected:
                                }
 
                                pFooter->AddItem(footerItem);
+
+                               if (pControl->GetItemElement(i, "footerItemBadgeIconPath", elementString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(elementString);
+                                       result r = pFooter->SetItemBadgeIcon(i, pBitmap);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set an icon");
+                               }
+
+                               if (pControl->GetItemElement(i, "footerItemNumberedBadgeIcon", elementString))
+                               {
+                                       Base::Integer::Parse(elementString, numberedBadge);
+                                       result r = pFooter->SetItemNumberedBadgeIcon(i, numberedBadge);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set a numbered icon");
+                               }
                        }
                        else if (footerItemString.Equals(L"buttonItem", false))
                        {
@@ -1935,6 +1952,21 @@ protected:
                                }
                                
                                pFooter->SetButton(buttonPosition, buttonItem);
+
+                               if (pControl->GetItemElement(i, "buttonItemBadgeIconPath", elementString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(elementString);
+                                       result r = pFooter->SetButtonBadgeIcon(buttonPosition, pBitmap);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set an icon");
+                               }
+
+                               if (pControl->GetItemElement(i, "buttonItemNumberedBadgeIcon", elementString))
+                               {
+                                       Base::Integer::Parse(elementString, numberedBadge);
+                                       result r = pFooter->SetButtonNumberedBadgeIcon(buttonPosition, numberedBadge);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set a numbered icon");
+                               }
                        }
                }
 

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index 6b1f547..4852aac 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1482,8 +1482,9 @@ _HeaderImpl::ConvertHeaderItem(const HeaderItem& headerItem)
                        }
 
                        delete pColorReplacedBitmap;
-                       delete pSelectedBitmap;
                }
+
+               delete pSelectedBitmap;
        }
        else // __style == HEADER_STYLE_BUTTON
        {
@@ -1723,6 +1724,7 @@ protected:
                Header* pHeader = null;
                String elementString;
                int opacity = 0;
+               int numberedBadge = 0;
                Color color;
 
                //Construct
@@ -1819,6 +1821,13 @@ protected:
                                SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set an icon");
                        }
 
+                       if (pControl->GetElement(L"titleNumberedBadgeIcon", elementString))
+                       {
+                               Base::Integer::Parse(elementString, numberedBadge);
+                               result r = pHeader->SetTitleNumberedBadgeIcon(numberedBadge);
+                               SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set a numbered icon");
+                       }
+
                        // description
                        if (pControl->GetElement(L"descriptionText", elementString))
                        {
@@ -2133,6 +2142,21 @@ protected:
                                }
                                
                                pHeader->AddItem(headerItem);
+
+                               if (pControl->GetItemElement(i, "headerItemBadgeIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       result r = pHeader->SetItemBadgeIcon(i, pBitmap);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set an icon");
+                               }
+
+                               if (pControl->GetItemElement(i, "headerItemNumberedBadgeIcon", headerItemString))
+                               {
+                                       Base::Integer::Parse(headerItemString, numberedBadge);
+                                       result r = pHeader->SetItemNumberedBadgeIcon(i, numberedBadge);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set a numbered icon");
+                               }
                        }
                        else if (headerItemString.Equals(L"buttonItem", false))
                        {
@@ -2243,6 +2267,21 @@ protected:
                                        _ButtonItemImpl::GetInstance(buttonItem)->SetAccessibilityHint(elementString);
                                }
                                pHeader->SetButton(buttonPosition, buttonItem);
+
+                               if (pControl->GetItemElement(i, "buttonItemBadgeIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       result r = pHeader->SetButtonBadgeIcon(buttonPosition, pBitmap);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set an icon");
+                               }
+
+                               if (pControl->GetItemElement(i, "buttonItemNumberedBadgeIcon", headerItemString))
+                               {
+                                       Base::Integer::Parse(headerItemString, numberedBadge);
+                                       result r = pHeader->SetButtonNumberedBadgeIcon(buttonPosition, numberedBadge);
+                                       SysLogException(NID_UI_CTRL, r, "[E_INVALID_STATE] Failed to set a numbered icon");
+                               }
                        }
 
                }

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 4118b1e..bc4fbf1 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -1071,12 +1071,7 @@ _Toolbar::GetItemTextColor(_ButtonStatus status) const
 int
 _Toolbar::GetSelectedItemIndex(void) const
 {
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->GetSelectedItemIndex();
-       }
-
-       return 0;
+       return __pToolbarPresenter->GetSelectedItemIndex();
 }
 
 ToolbarStyle
@@ -1114,21 +1109,13 @@ _Toolbar::GetTitleTextHorizontalAlignment(void) const
 bool
 _Toolbar::IsInitialDraw(void) const
 {
-       if (__pToolbarPresenter)
-               return __pToolbarPresenter->IsInitialDraw();
-       else
-               return false;
+       return __pToolbarPresenter->IsInitialDraw();
 }
 
 bool
 _Toolbar::IsTabEditModeEnabled(void) const
 {
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->IsTabEditModeEnabled();
-       }
-
-       return false;
+       return __pToolbarPresenter->IsTabEditModeEnabled();
 }
 
 bool
@@ -1365,10 +1352,7 @@ _Toolbar::RemoveAllItems(void)
        // clears vector
        __pItems.clear();
 
-       if (__pToolbarPresenter)
-       {
-               __pToolbarPresenter->SetInitialDrawState(true);
-       }
+       __pToolbarPresenter->SetInitialDrawState(true);
 
        SetItemSelected(-1);
 
@@ -2258,10 +2242,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire)
        int currentSelectedItemIndex = 0;
        currentSelectedItemIndex = GetSelectedItemIndex();
 
-       if (__pToolbarPresenter)
-       {
-               r = __pToolbarPresenter->SetItemSelected(itemIndex);
-       }
+       r = __pToolbarPresenter->SetItemSelected(itemIndex);
 
        if (itemIndex != -1 && itemIndex == currentSelectedItemIndex && __pItems.at(itemIndex) != null) // same item selected
        {
@@ -2365,10 +2346,7 @@ _Toolbar::SetStyle(ToolbarStyle style)
 {
        __style = style;
 
-       if (__pToolbarPresenter)
-       {
-               __pToolbarPresenter->SetInitialDrawState(true);
-       }
+       __pToolbarPresenter->SetInitialDrawState(true);
 
        if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
        {
@@ -2474,7 +2452,7 @@ _Toolbar::AdjustToolbarBounds(void)
                        dimension = pParent->TranslateSize(dimension);
                        bounds.height = dimension.height;
 
-                       if (__transparent || !IsVisible())
+                       if (__transparent || !GetVisibleState())
                        {
                                bounds.y -= bounds.height;
                        }
@@ -2489,12 +2467,7 @@ _Toolbar::AdjustToolbarBounds(void)
 result
 _Toolbar::SetTabEditModeEnabled(bool enable)
 {
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->SetTabEditModeEnabled(enable);
-       }
-
-       return E_SUCCESS;
+       return __pToolbarPresenter->SetTabEditModeEnabled(enable);
 }
 
 result
@@ -2528,10 +2501,7 @@ _Toolbar::SetTitleText(const String& text, HorizontalAlignment alignment)
 
        RearrangeItems();
 
-       if (__pToolbarPresenter)
-       {
-               r = __pToolbarPresenter->SetTitleText(__titleText, __titleTextAlignment);
-       }
+       r = __pToolbarPresenter->SetTitleText(__titleText, __titleTextAlignment);
 
        if(likely(!(_AccessibilityManager::IsActivated())))
        {
@@ -2942,10 +2912,8 @@ _Toolbar::OnDraw(void)
 {
        ClearLastResult();
 
-       if (__pToolbarPresenter)
-       {
-               __pToolbarPresenter->Draw();
-       }
+       __pToolbarPresenter->Draw();
+
        if(likely(!(_AccessibilityManager::IsActivated())))
        {
                return;
@@ -2996,12 +2964,7 @@ _Toolbar::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
        ClearLastResult();
 
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->OnTouchPressed(source, touchinfo);
-       }
-
-       return true;
+       return __pToolbarPresenter->OnTouchPressed(source, touchinfo);
 }
 
 bool
@@ -3009,12 +2972,7 @@ _Toolbar::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
 {
        ClearLastResult();
 
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->OnTouchReleased(source, touchinfo);
-       }
-
-       return true;
+       return __pToolbarPresenter->OnTouchReleased(source, touchinfo);
 }
 
 bool
@@ -3022,12 +2980,7 @@ _Toolbar::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
 {
        ClearLastResult();
 
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->OnTouchMoved(source, touchinfo);
-       }
-
-       return true;
+       return __pToolbarPresenter->OnTouchMoved(source, touchinfo);
 }
 
 bool
@@ -3035,12 +2988,7 @@ _Toolbar::OnTouchCanceled(const _Control& source, const _TouchInfo& touchinfo)
 {
        ClearLastResult();
 
-       if (__pToolbarPresenter)
-       {
-               return __pToolbarPresenter->OnTouchCanceled(source, touchinfo);
-       }
-
-       return true;
+       return __pToolbarPresenter->OnTouchCanceled(source, touchinfo);
 }
 
 void
@@ -4287,10 +4235,7 @@ _Toolbar::RearrangeItems(void)
                }
        }
 
-       if (__pToolbarPresenter)
-       {
-               __pToolbarPresenter->SetUsableAreaBounds(__titleTextArea);
-       }
+       __pToolbarPresenter->SetUsableAreaBounds(__titleTextArea);
 
        if (0 == __itemCount)
        {
@@ -5271,10 +5216,7 @@ _Toolbar::SetPropertyDescriptionText(const Variant& text)
 
        result r = E_SUCCESS;
 
-       if (__pToolbarPresenter)
-       {
-               r = __pToolbarPresenter->SetDescriptionText(__descriptionText);
-       }
+       r = __pToolbarPresenter->SetDescriptionText(__descriptionText);
 
        if(__pTitleTextElement)
        {

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index 75245e1..52208cc 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -601,6 +601,7 @@ _ToolbarPresenter::LoadBouncingEffectBitmap(ToolbarStyle style, bool isHeader, b
        if (__pBouncingEffectBitmap != null)
        {
                delete __pBouncingEffectBitmap;
+               __pBouncingEffectBitmap = null;
        }
 
        if (style == TOOLBAR_TAB)
@@ -678,7 +679,7 @@ _ToolbarPresenter::LoadBouncingEffectBitmap(ToolbarStyle style, bool isHeader, b
                }
        }
 
-       if (__pBouncingEffectBitmap)
+       if (__pBouncingEffectBitmap != null)
        {
                __bouncingEffectWidth = __pBouncingEffectBitmap->GetWidthF();
                __bouncingEffectHeight = __pBouncingEffectBitmap->GetHeightF();

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 5564055..d8ef992 100755 (executable)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -45,8 +45,8 @@ START_UI_CONFIG(HEADER);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4P);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5); // temp $B052L4P
+       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5);// temp $B052L4P
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8);