1. Fixed jira 31308 2. AlbumNameEditor look changes

Change-Id: Ibaf8748a3302420e674ec7021cd0d12b309305ee
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/inc/GlTypes.h b/inc/GlTypes.h
index ae841cc..b1d5d58 100644 (file)
--- a/inc/GlTypes.h
+++ b/inc/GlTypes.h
@@ -26,7 +26,7 @@ enum ACTION_ID_
 {
        ACTION_ID_BUTTON_CHECKED = 101,
        ACTION_ID_BUTTON_CREATE_NAME_CANCEL = 102,
-       ACTION_ID_BUTTON_CREATE_NAME_DONE = 103,
+       ACTION_ID_BUTTON_CREATE_NAME_SAVE = 103,
        ACTION_ID_BUTTON_MOVE_TO_SELECTION = 104,
        ACTION_ID_BUTTON_UNCHECKED = 105,
        ACTION_ID_ALBUM_LIST_SELECT_ALL = 201,

diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml b/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
index a01eed7..71c99b7 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
+++ b/res/screen-size-normal/IDL_FORM_ALBUM_LIST_EDITOR.xml
@@ -3,13 +3,12 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
+<Scene Bversion="2.0.0.201303280947" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_ALBUM_LIST_EDITOR">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
-        <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
+        <layout mode="Portrait" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
         <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
@@ -24,14 +23,14 @@
             <buttonItem accessibilityHint="" actionId="201" disabledBGBitmapPath="" disabledIconPath="" highlightedBGBitmapPath="" highlightedIconPath="" normalBGBitmapPath="" normalIconPath="00_icon_select_all_web.png" position="BUTTON_POSITION_RIGHT" pressedBGBitmapPath="" pressedIconPath="00_icon_select_all_press_web.png" style="BUTTON_ITEM_STYLE_ICON" text="" type="right"/>
         </itemSet>
     </Header>
-    <IconListView id="IDC_ICONLISTVIEW_ALBUM_LIST_EDITOR" parent="IDL_FORM_ALBUM_LIST_EDITOR">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="T01_Nocontents_picture.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_LEFT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="348.0" itemBitmapWidth="348.0" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="6.0" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30.0" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="6.0" magneticScrollSize="0.0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS" touchAnimationEnabled="false"/>
-        <layout height="1023.0" mode="Portrait" style="ICON_LIST_VIEW_STYLE_MARK" width="720.0" x="0.0" y="0.0"/>
-        <layout height="124.0" mode="Landscape" style="ICON_LIST_VIEW_STYLE_MARK" width="730.0" x="416.0" y="85.0"/>
-    </IconListView>
     <Label id="IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED" parent="IDL_FORM_ALBUM_LIST_EDITOR">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="::IDS_ST_POP_NO_ITEMS_SELECTED" textColor="#FFFFFF" textSize="33.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="48.0" mode="Portrait" width="720.0" x="0.0" y="1023.0"/>
-        <layout height="15.0" mode="Landscape" width="533.0" x="119.0" y="529.0"/>
+        <layout bottomRelation="IDL_FORM_ALBUM_LIST_EDITOR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FORM_ALBUM_LIST_EDITOR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_FORM_ALBUM_LIST_EDITOR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="1023.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="15.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="533.0" x="119.0" y="529.0"/>
     </Label>
+    <IconListView id="IDC_ICONLISTVIEW_ALBUM_LIST_EDITOR" parent="IDL_FORM_ALBUM_LIST_EDITOR">
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="T01_Nocontents_picture.png" checkBoxPosition="ICON_LIST_VIEW_CHECK_BOX_POSITION_TOP_LEFT" colorOfEmptyListText="" highlightedItemTextColor="" itemBitmapHeight="348.0" itemBitmapWidth="348.0" itemBorderStyle="ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE" itemHorizontalAlignment="ALIGNMENT_CENTER" itemHorizontalSpacing="6.0" itemTextHorizontalAlignment="ALIGNMENT_CENTER" itemTextSize="30.0" itemTextVerticalAlignment="ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM" itemVerticalAlignment="ALIGNMENT_MIDDLE" itemVerticalSpacing="6.0" magneticScrollSize="0.0" normalItemTextColor="" pressedItemTextColor="" scrollDirection="ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS" touchAnimationEnabled="false"/>
+        <layout bottomRelation="IDC_LABEL_ALBUM_LIST_EDITOR_SELECTED" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="1023.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_FORM_ALBUM_LIST_EDITOR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_FORM_ALBUM_LIST_EDITOR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="ICON_LIST_VIEW_STYLE_MARK" topRelation="IDL_FORM_ALBUM_LIST_EDITOR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="ICON_LIST_VIEW_STYLE_MARK" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="730.0" x="416.0" y="85.0"/>
+    </IconListView>
 </Scene>

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index 25cf44f..341f3d4 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -74,7 +74,7 @@ result
 AlbumNameEditorForm::Initialize(void)
 {
        AppLogDebug("ENTER");
-       result r = Construct(FORM_STYLE_HEADER | FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
+       result r = Construct(FORM_STYLE_HEADER | FORM_STYLE_FOOTER | FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return r;
@@ -87,6 +87,24 @@ AlbumNameEditorForm::OnInitializing(void)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
        __pFilePresentationModel = FileListPresentationModel::GetInstance();
 
+       Header* pHeader = GetHeader();
+
+       pHeader->SetStyle(HEADER_STYLE_TITLE);
+
+       GetFooter()->SetBackButtonEnabled(true);
+       GetFooter()->SetBackButton();
+
+       FooterItem itemSave;
+       itemSave.Construct(ACTION_ID_BUTTON_CREATE_NAME_SAVE);
+       itemSave.SetText(L"Save");
+
+       GetFooter()->AddItem(itemSave);
+       GetFooter()->AddActionEventListener(*this);
+       GetFooter()->Invalidate(true);
+
+       SetFormBackEventListener(this);
+       SetActionBarsVisible(FORM_ACTION_BAR_FOOTER, true);
+
 
        __pNameEditField = new (std::nothrow) EditField();
        __pNameEditField->Construct(RECT_NAME_EDIT_FIELD, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY,
@@ -158,25 +176,25 @@ AlbumNameEditorForm::OnTextValueChanged(const Control& source)
 
        inputString.Trim();
 
-       Header* header = GetHeader();
-       HeaderItemStatus itemStatus;
-       header->GetItemStatus(0, itemStatus);
+
+       FooterItemStatus itemStatus;
+       GetFooter()->GetItemStatus(0, itemStatus);
        if (inputString.GetLength() == 0)
        {
-               if (itemStatus != HEADER_ITEM_STATUS_DISABLED)
+               if (itemStatus != FOOTER_ITEM_STATUS_DISABLED)
                {
-                       header->SetItemEnabled(0, false);
-                       header->RequestRedraw(true);
+                       GetFooter()->SetItemEnabled(0, false);
                }
        }
        else
        {
-               if (itemStatus == HEADER_ITEM_STATUS_DISABLED)
+               if (itemStatus == FOOTER_ITEM_STATUS_DISABLED)
                {
-                       header->SetItemEnabled(0, true);
-                       header->RequestRedraw(true);
+                       GetFooter()->SetItemEnabled(0, true);
                }
        }
+       GetFooter()->Invalidate(true);
+
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -344,7 +362,7 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId)
 
        switch (actionId)
        {
-       case ACTION_ID_BUTTON_CREATE_NAME_DONE:
+       case ACTION_ID_BUTTON_CREATE_NAME_SAVE:
        {
                if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_CREATE)
                {
@@ -358,14 +376,6 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId)
                }
                break;
        }
-       case ACTION_ID_BUTTON_CREATE_NAME_CANCEL:
-       {
-               __pNameEditField->SetText(__nameEditFieldPreText);
-               __pNameEditField->HideKeypad();
-               __pNameEditField->Draw();
-               pSceneManager->GoBackward(BackwardSceneTransition(__callerSceneId));
-               break;
-       }
 
        default:
                break;
@@ -453,53 +463,22 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
                __callerSceneId = EMPTY_SPACE;
        }
 
+
+
        if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_CREATE)
        {
-               Header* pHeader = GetHeader();
-               AppAssert(pHeader);
-               pHeader->SetStyle(HEADER_STYLE_BUTTON);
-
-               HeaderItem doneItem;
-               HeaderItem cancelItem;
-               doneItem.Construct(ACTION_ID_BUTTON_CREATE_NAME_DONE);
-               doneItem.SetText(ResourceManager::GetString(L"IDS_COM_SK_DONE"));
-               cancelItem.Construct(ACTION_ID_BUTTON_CREATE_NAME_CANCEL);
-               cancelItem.SetText(ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
-
-               pHeader->SetStyle(HEADER_STYLE_BUTTON);
-               pHeader->AddItem(doneItem);
-               pHeader->AddItem(cancelItem);
-               pHeader->AddActionEventListener(*this);
-               pHeader->SetItemEnabled(0, false);
 
                __nameEditFieldText = EMPTY_SPACE;
                __nameEditFieldPreText = EMPTY_SPACE;
                __pNameEditField->SetText(__nameEditFieldText);
                __nameEditFieldTempText = __nameEditFieldText;
-
-
                __pNameEditField->SetFocus();
-
+          GetHeader()->SetTitleText(L"Create album");
+       GetFooter()->SetItemEnabled(0, false);
+       GetFooter()->Invalidate(true);
        }
        else
        {
-               Header* pHeader = GetHeader();
-               AppAssert(pHeader);
-               pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_CHANGE_NAME"));
-               pHeader->SetStyle(HEADER_STYLE_BUTTON);
-
-               HeaderItem doneItem;
-               HeaderItem cancelItem;
-               doneItem.Construct(ACTION_ID_BUTTON_CREATE_NAME_DONE);
-               doneItem.SetText(ResourceManager::GetString(L"IDS_COM_SK_DONE"));
-               cancelItem.Construct(ACTION_ID_BUTTON_CREATE_NAME_CANCEL);
-               cancelItem.SetText(ResourceManager::GetString(L"IDS_COM_POP_CANCEL"));
-
-               pHeader->SetStyle(HEADER_STYLE_BUTTON);
-               pHeader->AddItem(doneItem);
-               pHeader->AddItem(cancelItem);
-               pHeader->AddActionEventListener(*this);
-
                String strName;
 
                IList* pAlbumInfoList = __pPresentationModel->GetAlbumInfoList();
@@ -509,7 +488,7 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId,
                __nameEditFieldText = strName;
                __nameEditFieldPreText = strName;
                __pNameEditField->SetText(__nameEditFieldText);
-
+                GetHeader()->SetTitleText(L"Rename");
                __pNameEditField->SetOverlayKeypadCommandButtonVisible(false);
                __pNameEditField->SetFocus();