FCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp

equal deleted inserted replaced

-:70a8526f03f2
+:56b11cf8addb
 #endif
 const TInt KMPXMaxFileLength = 256;
 const TReal KIconFactor = 0.7;
 const TInt KThumbLoadingPauseForTransition(500000);
+const TInt KMPXInterviewTransition = 0;
+const TInt KMPXIntraviewTransition = 1;
 _LIT( KMPXDash, " - " );
 #ifdef HG_MP_LOC_AVAILABLE
 _LIT( KMPXSpace, " ");
 #endif //HG_MP_LOC_AVAILABLE
 _LIT( KMPXZeroDurationMark, "--");
-_LIT( KSong, " song" );
-_LIT( KSongs, " songs" );
-_LIT( KEpisode, " episode" );
-_LIT( KEpisodes, " episodes" );
-_LIT( KAlbum, " album" );
-_LIT( KAlbums, " albums" );
-_LIT( KSongDash, " song - " );
-_LIT( KSongsDash, " songs - " );
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // Two-phased constructor.
 }
 delete iPlaylist;
 delete iPlaylistHelper;
-if( iAsyncCallBack )
-{
-iAsyncCallBack->Cancel();
-}
-delete iAsyncCallBack;
 iCoeEnv->RemoveForegroundObserver( *this );
 }
 // ---------------------------------------------------------------------------
 // Symbian 2nd phase constructor can leave.
 CreateIconArrayL();
 iIsForeground = ETrue;
 iCoeEnv->AddForegroundObserverL( *this );
-TCallBack callback(CMPXCollectionViewHgContainer::AsyncCallback, this);
+iPreviousOrientation = Layout_Meta_Data::IsLandscapeOrientation();
-iAsyncCallBack = new (ELeave) CAsyncCallBack( CActive::EPriorityStandard );
-iAsyncCallBack->Set(callback);
 GfxTransEffect::Enable();
 CreateWindowL();
 ActivateL();
 TRAP_IGNORE(
 if ( aType == KAknsMessageSkinChange )
 {
 delete iIconArray;
 iIconArray = NULL;
-CreateIconArrayL();
 if( iCurrentViewType == EMPXViewMediawall || iCurrentViewType == EMPXViewTBone )
 {
 	iMediaWall->SetDefaultIconL(NULL);
-iMediaWall->EnableScrollBufferL(*this, KMPXListBufferSize, KMPXListBufferSize/4);
+	CreateIconArrayL();
+iMediaWall->EnableScrollBufferL(*this, KMPXListBufferSizeWithMediaWall, KMPXListBufferSizeWithMediaWall/4);
 }
 else
 {
 CHgScroller* list = CurrentListWidget();
 if( list )
 {
 list->SetDefaultIconL(NULL);
-list->EnableScrollBufferL(*this, KMPXListBufferSizeWithMediaWall, KMPXListBufferSizeWithMediaWall/4);
+		CreateIconArrayL();
+list->EnableScrollBufferL(*this, KMPXListBufferSize, KMPXListBufferSize/4);
 }
 }
-			SetDetailIconShuffleL();
+// Reset the shuffle item for TBone view
-}
+			if ( iCurrentViewType == EMPXViewTBone )
-else if ( aType == KEikDynamicLayoutVariantSwitch )
+				{
+				if (iMwListWidget && iMwListWidget->ItemCount() > 1)
+					{
+					SetShuffleItemToListL(iMwListWidget);
+					}
+				}
+			// Songs dialog is opened in mediawall, we need to reset its shuffle item
+			else if ( iCurrentViewType == EMPXViewMediawall && iDialog )
+				{
+				CAknIconArray* iconArray = new( ELeave ) CAknIconArray( 1 );
+				CleanupStack::PushL( iconArray );
+				// Prepare icon array.
+				CGulIcon* icon = (*iIconArray)[EMPXClvIconShuffle];
+				CGulIcon* iconCopy = CGulIcon::NewL(icon->Bitmap(), icon->Mask());
+				iconCopy->SetBitmapsOwnedExternally(ETrue);
+				iconArray->AppendL(iconCopy);
+				CAknSingleGraphicPopupMenuStyleListBox* listbox = (CAknSingleGraphicPopupMenuStyleListBox *)iDialog->ListBox();
+				listbox->ItemDrawer()->ColumnData()->SetIconArrayL( iconArray );
+				CleanupStack::Pop(); // iconArray
+				}
+			else
+				{
+	// Reset the shuffle item for other views
+				SetDetailIconShuffleL();
+				}
+}
+else if ( aType == KEikDynamicLayoutVariantSwitch &&
+		( iPreviousOrientation != landscapeOrientation ) )
 {
 iLayoutSwitch = ETrue;
+			// To prevent multiple layout change causing multiple repopulation of the list.
+			// Temporary fix until rootcause is found.
+iPreviousOrientation = landscapeOrientation;
 if ( iCurrentViewType == EMPXViewMediawall )
 {
 if ( iDialog )
 {
 iDialog->CancelPopup();
 }
-// make cba visible so that visible screen area is calculated correctly in list view
-if( iCbaHandler )
-iCbaHandler->ChangeCbaVisibility( ETrue );
 }
 iSetEmptyTextNeeded = ETrue;
 TRect clientRect = ((CAknView*)iView)->ClientRect();
 // from playback view.
 TBool pbv = (iPreviousViewId == TUid::Uid(KMPXPluginTypePlaybackUid)) ? ETrue : EFalse;
 if ( pbv )
 {
 	iPreviousViewId = TUid::Uid(0);
+	SetupTransitionType(KMPXInterviewTransition, pbv);
 }
-BeginFullScreenAnimation( pbv );
+else // intraview transitions
+				{
+	SetupTransitionType(KMPXIntraviewTransition);
+				}
+BeginFullScreenAnimation();
 }
 switch (iCurrentViewType)
 {
 case EMPXViewMediawall:
 }
 }
 DrawableWindow()->SetOrdinalPosition( -1 );
-CleanPrevView();
 iPrevViewType = iCurrentViewType;
 iPrevContext = iContext;
 if ( iSetEmptyTextNeeded )
 {
 LoadAndSetEmptyTextL();
 iSetEmptyTextNeeded = EFalse;
 }
-if( !iDefaultIconSet )
-{
-SetDefaultIconL();
-}
 iLayoutSwitch = EFalse;
 }
 // -----------------------------------------------------------------------------
 // Handle listbox item addition, preserving the current display index
 {
 iSelectedAlbumIndex = mediaIndex;
 SaveSelectedAlbumItemL( iSelectedAlbumIndex );
 }
+TInt prevItemCount( iMediaWall->ItemCount() );
 iMediaWall->Reset();
 if ( aCount )
 {
+// enable scroll buffering now as it has not been enabled when empty mediawall was constructed
+if ( !prevItemCount )
+{
+iMediaWall->EnableScrollBufferL( *this, KMPXListBufferSizeWithMediaWall, KMPXListBufferSizeWithMediaWall/4 );
+}
 iMediaWall->ResizeL( aCount );
 ProvideDataWithoutThumbnailsMwL(aMediaArray);
 iMediaWall->SetSelectedIndex( mediaIndex + iShuffleItem);
 if ( iCurrentViewType == EMPXViewTBone )
 // Check if the list is empty, Enable scroll buffer won't call requst if list is empty
 ( iListWidget->ItemCount() != 0 ) )
 {
 MPX_DEBUG1("CMPXCollectionViewHgContainer::PrepareListL - EnableScrollBufferL");
 iListWidget->EnableScrollBufferL(*this, KMPXListBufferSize, KMPXListBufferSize/4);
+		iDefaultIconSet = EFalse;
+		// Setting an empty icon to the list as default icon.
+iListWidget->SetDefaultIconL(CGulIcon::NewL(new CFbsBitmap()));
+CleanPrevView();
 }
 else
 {
+		// Note: Special case
+		// We need to clean previous view prior to setting default icon otherwise the
+		// icon will be set to the wrong scroller.
+		CleanPrevView();
+SetDefaultIconL();
 EndFullScreenAnimation();
 iListWidget->RefreshScreen(0);
-}
+	iDefaultIconSet = ETrue;
-iDefaultIconSet = EFalse;
+}
 }
 // ----------------------------------------------------------------------------
 // Prepare view for displaying data in media wall with list
 // ----------------------------------------------------------------------------
 				mediaWallRect,
 				aCount,
 				CHgVgMediaWall::EHgVgMediaWallStyleCoverflowTBonePortrait,
 				EFalse,
 				this,
-				DefaultIconL() );
+				CGulIcon::NewL( new CFbsBitmap()) );
 		if( !iIsForeground )
 		    iMediaWall->HandleLosingForeground();
 		iMediaWall->SetMopParent(this);
 if( iTranstionType == EMPXTranstionNotDefined )
 iMediaWall->RefreshScreen(iAlbumIndex);
 OpenAlbumL(iAlbumIndex);
 }
 iMwListWidget->RefreshScreen(0);
-	iDefaultIconSet = ETrue;
+	CleanPrevView();
 }
 // ----------------------------------------------------------------------------
 // Prepare view for displaying data in Media wall format.
 // ----------------------------------------------------------------------------
 if( iListWidget && (iPrevContext == EContextGroupAlbum || iPrevContext == EContextItemAlbum ) )
 {
 switchBuffer = CMPXCollectionViewHgSwitchBuffer::CreateBufferLC( *iListWidget );
 }
-else if ( iMediaWall )
+else if ( iMediaWall && iPrevViewType == EMPXViewTBone )
 {
 switchBuffer = CMPXCollectionViewHgSwitchBuffer::CreateBufferLC( *iMediaWall );
 switchBuffer->SetIndexOffset(1);
 }
 if( iMediaWall )
 iMediaWall->SetSelectionObserver(*this);
 iMediaWall->SetObserver( this ); // softkey visibility event observer
 // Check if the list is empty, Enable scroll buffer won't call requst if list is empty
 if( iMediaWall->ItemCount() != 0 )
 {
-		iMediaWall->EnableScrollBufferL(
+	iMediaWall->EnableScrollBufferL(
 *this,
 KMPXListBufferSizeWithMediaWall,
 KMPXListBufferSizeWithMediaWall / 4);
 }
 else
 	    iMediaWall->MakeVisible( ETrue );
 iMediaWall->SetFocus( ETrue );
 		// Check if the list is empty, Enable scroll buffer won't call requst if list is empty
 if( iMediaWall->ItemCount() != 0 )
 {
-		iMediaWall->EnableScrollBufferL(
+	iMediaWall->EnableScrollBufferL(
 *this,
 KMPXListBufferSizeWithMediaWall,
 KMPXListBufferSizeWithMediaWall / 4);
 }
 else
 if( iTranstionType != EMPXTranstionNotDefined )
 {
 iMediaWall->SetFlags( CHgVgMediaWall::EHgVgMediaWallDrawToWindowGC );
 }
-	if( iPopupListRect == TRect(0,0,0,0) )
+	  if( iPopupListRect == TRect(0,0,0,0) )
-		{
+		   {
-	    ResolvePopupListSizeL();
+	     ResolvePopupListSizeL();
-		}
+		   }
 iMediaWall->SetOpenedItemRect( iPopupListRect );
 iMediaWall->SetOpeningAnimationType( CHgVgMediaWall::EHgVgOpeningAnimationZoomToFront );
 if( switchBuffer )
 {
 switchBuffer->FillFromBufferL( *iMediaWall );
 CleanupStack::PopAndDestroy( switchBuffer );
 switchBuffer = NULL;
 }
 	iDefaultIconSet = ETrue;
+	CleanPrevView();
 }
 // ----------------------------------------------------------------------------
 // Add shuffle list item to the top of the list.
 // ----------------------------------------------------------------------------
 }
 default:
 break;
 }
 }
+// Start animation now as next view activated is
+// now playing view. We will end animation in now playing view.
+SetupTransitionType(KMPXInterviewTransition);
+BeginFullScreenAnimation();
 }
 }
 // ---------------------------------------------------------------------------
 // From MHgSelectionObserver
 // ganes list components still uses this version of the HandleOpen
 if ( iContext == EContextItemAlbum  )
 		{
 SaveSelectedAlbumItemL(iSelectedAlbumIndex);
 		UpdatePathAndOpenL(index);
+// Start animation now as next view activated is
+// now playing view. We will end animation in now playing view.
+SetupTransitionType(KMPXInterviewTransition);
+BeginFullScreenAnimation();
 		}
 else if ( iContext == EContextGroupAlbum )
 {
 SaveSelectedAlbumItemL(index);
 iAlbumIndex = index;
 if (!ShufflePlayAllL(index))
 {
 // To open the selected album.
 iView->ProcessCommandL( EMPXCmdCommonEnterKey );
 }
+// Start animation now as next view activated is
+// now playing view. We will end animation in now playing view.
+SetupTransitionType(KMPXInterviewTransition);
+BeginFullScreenAnimation();
 }
 else
 		{
 		iView->ProcessCommandL( EMPXCmdCommonEnterKey );
 		}
 			// If item in list was opened, we only play the selected one.
 SaveSelectedAlbumItemL(iSelectedAlbumIndex);
 // Open the selected song of album
 UpdatePathAndOpenL(index);
 }
+// Start animation now as next view activated is
+// now playing view. We will end animation in now playing view.
+SetupTransitionType(KMPXInterviewTransition);
+BeginFullScreenAnimation();
 }
 else if ( iContext == EContextGroupAlbum  )
 {
 if ( aControl == iMediaWall )
 {
 			// Check if shuffle play all was selected.
 			if (!ShufflePlayAllL(index))
 				{
 	            OpenAlbumL(index);
+				}
+			else
+				{
+				// Start animation now as next view activated is
+				// now playing view. We will end animation in now playing view.
+				SetupTransitionType(KMPXInterviewTransition);
+				BeginFullScreenAnimation();
 				}
 }
 }
 else
 {
 				break;
 				}
 			}
 if ( canRefresh )
 {
+			if( !iDefaultIconSet )
+				{
+				SetDefaultIconL();
+				iDefaultIconSet = ETrue;
+				}
 if( iCurrentViewType == EMPXViewTBone || iCurrentViewType == EMPXViewMediawall )
 {
 if( iTranstionType != EMPXTranstionNotDefined )
 {
-// This will tricker the transtition animation
+// This will trigger the transtition animation
 EndFullScreenAnimation();
 iMediaWall->DrawNow();
 }
 else
 {
 }
 else
 {
 if( iTranstionType != EMPXTranstionNotDefined )
 {
-// This will tricker the transtition animation
+// This will trigger the transtition animation
 // Use DrawNow since RefreshScreen uses DrawDeferred and we want to start
 // the animation immediately.
 EndFullScreenAnimation();
 listWidget->DrawNow();
 }
 			}
 		case EContextGroupAlbum:
 		case EContextItemAlbum:
 {
 defaultIcon = EMPXDefaultIconAlbum;
-iconIndex = EMPXClvIconAlbum;
+iconIndex = 27; // default album art in mediawall and list view
 			break;
 			}
 		case EContextGroupPodcast:
 		case EContextItemPodcast:
 			{
 KMPXMediaArrayContents ) ) );
 User::LeaveIfNull( songArray );
 TInt songCount = songArray->Count();
 CDesC16ArrayFlat* songList = new (ELeave) CDesC16ArrayFlat(songCount);
 CleanupStack::PushL(songList);
 if ( songCount > 1 )
 {
 HBufC* shuffleText = StringLoader::LoadLC(
 R_MPX_MEDIAWALL_DIALOG_SHUFFLE );
 // Make room for 3 more formatting characters.
 TInt index = listBox->CurrentItemIndex();
 // If item in list was opened, we only play the selected one.
 SaveSelectedAlbumItemL(iSelectedAlbumIndex);
 // Open the selected song of album
 UpdatePathAndOpenL(index);
+// Start animation now as next view activated is
+// now playing view. We will end animation in now playing view.
+SetupTransitionType(KMPXInterviewTransition);
+BeginFullScreenAnimation();
 }
 else if( !iLayoutSwitch && iMediaWall )
 {
 // Close mediawall "flip animation"
 iMediaWall->StartOpeningAnimationL( EFalse );
 }
 void CMPXCollectionViewHgContainer::HandleGainingForeground()
 {
 iIsForeground = ETrue;
+if ( iCurrentViewType == EMPXViewMediawall )
+{
+if( iCbaHandler )
+iCbaHandler->ChangeCbaVisibility( EFalse );
+}
 }
 void CMPXCollectionViewHgContainer::HandleLosingForeground()
 {
 iIsForeground = EFalse;
 	// MediaWall sets the default icon in the construction phase.
 	iDefaultIconSet = EFalse;
 if( !iLayoutSwitch  )
 {
+		SetupTransitionType(KMPXIntraviewTransition);
 BeginFullScreenAnimation();
 }
 	RestoreSelectedAlbumItemL(mediaArray);
 	PrepareMediaWallWithListL( mediaArray, mediaCount );
 DrawableWindow()->SetOrdinalPosition( -1 );
-CleanPrevView();
 iPrevViewType = iCurrentViewType;
-if( !iDefaultIconSet )
-{
-SetDefaultIconL();
-}
 // We need to adjust the CBA for this view.
 	if( iCbaHandler )
 		iCbaHandler->UpdateCba();
 	iLayoutSwitch = EFalse;
 // ---------------------------------------------------------------------------
 // Prepare and begin fullscreen animation effects
 // ---------------------------------------------------------------------------
 //
-void CMPXCollectionViewHgContainer::BeginFullScreenAnimation(TBool aPrevViewWasPlayback)
+void CMPXCollectionViewHgContainer::BeginFullScreenAnimation()
 {
-if( iTranstionType != EMPXTranstionNotDefined )
+if( iTranstionType == EMPXTranstionNotDefined )
 return;
-iTranstionType = EMPXTranstionToLeft;
-if ( (iPrevContext == EContextUnknown ||
-iPrevContext == EContextItemAlbum ) && aPrevViewWasPlayback )
-{
-iTranstionType = EMPXTranstionToLeft;
-}
-else if( iPrevContext == EContextUnknown )
-{
-// We aren't coming from playback view and prev context is unknown.
-// Musicplayer is propably started so we shouldn't use any animation.
-iTranstionType = EMPXTranstionNotDefined;
-return;
-}
-else if( iContext == EContextItemAlbum ||
-iContext == EContextItemGenre ||
-iContext == EContextItemPlaylist )
-{
-iTranstionType = EMPXTranstionToRight;
-}
-if( iPrevViewType == EMPXViewMediawall || iPrevViewType == EMPXViewTBone )
-{
-iMediaWall->SetFlags( CHgVgMediaWall::EHgVgMediaWallDrawToWindowGC );
-iMediaWall->DrawNow();
-		// workaround for NGA animations: includes Media Wall into transition animation.
-		iCoeEnv->WsSession().Finish();
-		User::After(1000);
-}
 const TInt flags = AknTransEffect::TParameter::EActivateExplicitCancel;
 TRect appRect = ((CAknAppUi*)iCoeEnv->AppUi())->ApplicationRect();
 GfxTransEffect::BeginFullScreen( iTranstionType, appRect,
 AknTransEffect::EParameterType,
 //iThumbnailManager->Pause(TTimeIntervalMicroSeconds32(KThumbLoadingPauseForTransition));
 }
 }
 // ---------------------------------------------------------------------------
+// Setup transition types for animation.
+// ---------------------------------------------------------------------------
+//
+void CMPXCollectionViewHgContainer::SetupTransitionType( TInt aType, TBool aPrevViewWasPlayback )
+{
+	if ( aType == KMPXIntraviewTransition )
+		{
+		iTranstionType = EMPXTranstionToLeft;
+		if( iPrevContext == EContextUnknown )
+			{
+			// We aren't coming from playback view and prev context is unknown.
+			// Musicplayer is propably started so we shouldn't use any animation.
+			iTranstionType = EMPXTranstionNotDefined;
+			return;
+			}
+		else if( iContext == EContextItemAlbum ||
+				 iContext == EContextItemGenre ||
+				 iContext == EContextItemPlaylist )
+			{
+			iTranstionType = EMPXTranstionToRight;
+			}
+		if( iPrevViewType == EMPXViewMediawall || iPrevViewType == EMPXViewTBone )
+			{
+			iMediaWall->SetFlags( CHgVgMediaWall::EHgVgMediaWallDrawToWindowGC );
+			iMediaWall->DrawNow();
+			}
+		}
+	else // interview transition
+		{
+		iTranstionType = EMPXTranstionToRight;
+		if ( (iPrevContext == EContextUnknown ||
+			  iPrevContext == EContextItemAlbum ) && aPrevViewWasPlayback )
+			{
+			iTranstionType = EMPXTranstionToLeft;
+			}
+		}
+}
+// ---------------------------------------------------------------------------
 // Resolving the size of the popup list rectangle.
 // ---------------------------------------------------------------------------
 //
 void CMPXCollectionViewHgContainer::ResolvePopupListSizeL()
 {

branch	RCL_3
changeset 28	56b11cf8addb
parent 26	70a8526f03f2
child 31	a12246c97fcc