Fixed jira issue related with Search operation(launch of artist)

Change-Id: I1c8f9cd6de3b843556f07a3d0b0e06a79195de71

diff --git a/inc/MpSearchPresentationModel.h b/inc/MpSearchPresentationModel.h
old mode 100755 (executable)
new mode 100644 (file)
index 4752cd1..65b6176
--- a/inc/MpSearchPresentationModel.h
+++ b/inc/MpSearchPresentationModel.h
@@ -36,7 +36,7 @@ public:
        int GetTotalContentCount(void);
        void InitializeContentList(const Tizen::Base::String& keyword);
        void Release(void);
-       ContentInformation* GetContentInfo(int index);
+       ContentInformation* GetContentInfoN(int index);
        void RemoveSearchResult(void);
 
 private:
@@ -52,4 +52,4 @@ private:
        Tizen::Base::Collection::IList* __pSearchList;
 };
 
-#endif // _MP_SEARCH_PRESENTATION_MODEL_H_
\ No newline at end of file
+#endif // _MP_SEARCH_PRESENTATION_MODEL_H_

diff --git a/src/MpSearchForm.cpp b/src/MpSearchForm.cpp
index 64e8086..62ac560 100644 (file)
--- a/src/MpSearchForm.cpp
+++ b/src/MpSearchForm.cpp
@@ -260,8 +260,8 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
        delete pItem;
        pItem = null;
 
-       ContentInformation* pContentInfoStruct = __pPresentationModel->GetContentInfo(itemIndex);
-       if (pContentInfoStruct == null)
+       ContentInformation* pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
+       if (pContentInfo == null)
        {
                return null;
        }
@@ -272,7 +272,7 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
        if (itemIndex < __pPresentationModel->GetAlbumIndex())
        {
                Label* pArtistNameLabel = new (std::nothrow) Label();
-               pArtistNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT), pContentInfoStruct->ArtistName);
+               pArtistNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT), pContentInfo->ArtistName);
                pArtistNameLabel->SetTextColor(COLOR_MAIN_TEXT);
                pArtistNameLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
                pArtistNameLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -281,13 +281,13 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
        else if (itemIndex < __pPresentationModel->GetSongIndex())
        {
                Label* pAlbumNameLabel = new (std::nothrow) Label();
-               pAlbumNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT / 2), pContentInfoStruct->AlbumName);
+               pAlbumNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT / 2), pContentInfo->AlbumName);
                pAlbumNameLabel->SetTextColor(COLOR_MAIN_TEXT);
                pAlbumNameLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
                pAlbumNameLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
 
                Label* pArtistNameLabel = new (std::nothrow) Label();
-               pArtistNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, pAlbumNameLabel->GetHeight(), W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT / 2), pContentInfoStruct->ArtistName);
+               pArtistNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, pAlbumNameLabel->GetHeight(), W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT / 2), pContentInfo->ArtistName);
                pArtistNameLabel->SetTextColor(COLOR_SUB_TEXT);
                pArtistNameLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
                pArtistNameLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -298,7 +298,7 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
        else
        {
                Label* pSongNameLabel = new (std::nothrow) Label();
-               pSongNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT), pContentInfoStruct->TitleName);
+               pSongNameLabel->Construct(Rectangle(X_GAP_THUMBNAIL, 0, W_CLIENT_AREA - X_GAP_THUMBNAIL, ITEM_HEIGHT), pContentInfo->TitleName);
                pSongNameLabel->SetTextColor(COLOR_MAIN_TEXT);
                pSongNameLabel->SetTextConfig(MAIN_TEXT_SIZE, LABEL_TEXT_STYLE_NORMAL);
                pSongNameLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -306,8 +306,8 @@ SearchForm::CreateItem(const int itemIndex, int itemWidth)
                pItem->AddControl(*pSongNameLabel);
        }
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+       delete pContentInfo;
+       pContentInfo = null;
 
        AppLogDebug("EXIT");
        return pItem;
@@ -360,26 +360,27 @@ SearchForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
                return;
        }
 
-       ContentInformation* pContentInfoStruct;
+       ContentInformation* pContentInfo;
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
        if (itemIndex < __pPresentationModel->GetAlbumIndex())
        {
-               pContentInfoStruct = __pPresentationModel->GetContentInfo(itemIndex);
+               pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
 
                ArrayList* pData = new (std::nothrow) ArrayList();
                pData->Construct();
-               pData->Add(*(new (std::nothrow) String(pContentInfoStruct->ArtistName)));
+               pData->Add(*(new (std::nothrow) String(IDSCN_ARTIST_LIST)));
+               pData->Add(*(new (std::nothrow) String(pContentInfo->ArtistName)));
 
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_ALBUM_SEARCH_LIST), pData);
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ARTIST_CONTENT_LIST), pData);
        }
        else if (itemIndex < __pPresentationModel->GetSongIndex())
        {
-               pContentInfoStruct = __pPresentationModel->GetContentInfo(itemIndex);
+               pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
 
                String temp;
-               temp = CommonUtil::SpecialReplaceChange(pContentInfoStruct->AlbumName);
+               temp = CommonUtil::SpecialReplaceChange(pContentInfo->AlbumName);
                temp = CommonUtil::MakeQuery(STRING_SORT_ALBUM, temp);
 
                ArrayList* pData = new (std::nothrow) ArrayList();
@@ -392,10 +393,10 @@ SearchForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
        }
        else
        {
-               pContentInfoStruct = __pPresentationModel->GetContentInfo(itemIndex);
+               pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
                ArrayList* pPath = new (std::nothrow) ArrayList();
                pPath->Construct();
-               pPath->Add(*(new (std::nothrow) String(pContentInfoStruct->ContentFilePath)));
+               pPath->Add(*(new (std::nothrow) String(pContentInfo->ContentFilePath)));
 
                ArrayList* pData = new (std::nothrow) ArrayList();
                pData->Construct();
@@ -406,8 +407,8 @@ SearchForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_PLAYER), pData);
        }
 
-       delete pContentInfoStruct;
-       pContentInfoStruct = null;
+       delete pContentInfo;
+       pContentInfo = null;
        AppLogDebug("EXIT");
 }
 
@@ -656,4 +657,4 @@ SearchForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 
        pSceneManager->GoForward(ForwardSceneTransition(__pSceneId->GetPointer(), SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        AppLogDebug("EXIT");
-}
\ No newline at end of file
+}

diff --git a/src/MpSearchPresentationModel.cpp b/src/MpSearchPresentationModel.cpp
index c4a9a27..308410e 100644 (file)
--- a/src/MpSearchPresentationModel.cpp
+++ b/src/MpSearchPresentationModel.cpp
@@ -211,7 +211,7 @@ SearchPresentationModel::Release(void)
 }
 
 ContentInformation*
-SearchPresentationModel::GetContentInfo(int index)
+SearchPresentationModel::GetContentInfoN(int index)
 {
        AppLogDebug("ENTER");
        ContentInformation* pContentInfoStruct = null;
@@ -243,4 +243,4 @@ SearchPresentationModel::MakeQuery(const Tizen::Base::String& WhereExpr, const T
 
        AppLogDebug("EXIT");
        return StrMakeQuery;
-}
\ No newline at end of file
+}