From: Akshat Airan/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics Date: Wed, 14 Feb 2024 05:23:57 +0000 (+0530) Subject: 1. Updated Tab with TabView X-Git-Tag: accepted/tizen/unified/20240424.063517~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ac7b1aa1b0a2eb56154b0bac8a2be69743a6cd2;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git 1. Updated Tab with TabView 2. Remove MultiResourceManager file 3. Added Multilanguage support Change-Id: I39ed660f995b55b556437775f97a87960b0e907a Signed-off-by: Akshat Airan/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics --- diff --git a/music-player/Common/MultiResourceManager.cs b/music-player/Common/MultiResourceManager.cs deleted file mode 100644 index eee8e26..0000000 --- a/music-player/Common/MultiResourceManager.cs +++ /dev/null @@ -1,27 +0,0 @@ - -using System.Globalization; -using System.Reflection; -using System.Resources; - -namespace MusicPlayer.Common -{ - internal class MultiResourceManager : ResourceManager -{ - public MultiResourceManager(string baseName, Assembly assembly) - : base(baseName, assembly) - { - } - - public override string GetString(string name) - { - return base.GetString(name) - ?? TextResources.Resources.ResourceManager.GetString(name); - } - - public override string GetString(string name, CultureInfo culture) - { - return base.GetString(name, culture) - ?? TextResources.Resources.ResourceManager.GetString(name, culture); - } - } -} diff --git a/music-player/MusicPlayer.cs b/music-player/MusicPlayer.cs index 3da2f3b..5fdc80f 100755 --- a/music-player/MusicPlayer.cs +++ b/music-player/MusicPlayer.cs @@ -67,8 +67,7 @@ namespace MusicPlayer Tizen.Log.Debug(AppConstants.LogTag, "Setting Language failed" + e.Message); } } - - MultilingualResourceManager = new MultiResourceManager("music-player.TextResources.Resources", typeof(Resources).Assembly); + MultilingualResourceManager = TextResources.Resources.ResourceManager; Tizen.System.SystemSettings.LocaleLanguageChanged += (s, e) => SetLanguage(); SetLanguage(); } diff --git a/music-player/TextResources/Resources.Designer.cs b/music-player/TextResources/Resources.Designer.cs index 987eddb..bf05458 100644 --- a/music-player/TextResources/Resources.Designer.cs +++ b/music-player/TextResources/Resources.Designer.cs @@ -60,15 +60,6 @@ namespace MusicPlayer.TextResources { } } - /// - /// Looks up a localized string similar to Add to playlist. - /// - internal static string ADD_TO_PLAYLIST { - get { - return ResourceManager.GetString("ADD_TO_PLAYLIST", resourceCulture); - } - } - /// /// Looks up a localized string similar to Add. /// @@ -88,7 +79,16 @@ namespace MusicPlayer.TextResources { } /// - /// Looks up a localized string similar to Albums. + /// Looks up a localized string similar to Add to playlist. + /// + internal static string IDS_ADD_TO_PLAYLIST { + get { + return ResourceManager.GetString("IDS_ADD_TO_PLAYLIST", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Albums. /// internal static string IDS_ALBUMS { get { @@ -97,7 +97,7 @@ namespace MusicPlayer.TextResources { } /// - /// Looks up a localized string similar to Artists. + /// Looks up a localized string similar to Artists. /// internal static string IDS_ARTISTS { get { @@ -150,6 +150,15 @@ namespace MusicPlayer.TextResources { } } + /// + /// Looks up a localized string similar to Details. + /// + internal static string IDS_DETAILS { + get { + return ResourceManager.GetString("IDS_DETAILS", resourceCulture); + } + } + /// /// Looks up a localized string similar to Enter Playlist Name. /// @@ -195,6 +204,15 @@ namespace MusicPlayer.TextResources { } } + /// + /// Looks up a localized string similar to Ok. + /// + internal static string IDS_OK { + get { + return ResourceManager.GetString("IDS_OK", resourceCulture); + } + } + /// /// Looks up a localized string similar to Playlist name already in use.. /// @@ -205,7 +223,7 @@ namespace MusicPlayer.TextResources { } /// - /// Looks up a localized string similar to Playlists. + /// Looks up a localized string similar to Playlists. /// internal static string IDS_PLAYLISTS { get { @@ -240,6 +258,15 @@ namespace MusicPlayer.TextResources { } } + /// + /// Looks up a localized string similar to Select All. + /// + internal static string IDS_SELECT_ALL { + get { + return ResourceManager.GetString("IDS_SELECT_ALL", resourceCulture); + } + } + /// /// Looks up a localized string similar to Share. /// @@ -250,11 +277,20 @@ namespace MusicPlayer.TextResources { } /// - /// Looks up a localized string similar to Tracks. + /// Looks up a localized string similar to This Track will be Deleted. + /// + internal static string IDS_THIS_TRACK_WILL_BE_DELETED { + get { + return ResourceManager.GetString("IDS_THIS_TRACK_WILL_BE_DELETED", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tracks. /// - internal static string IDS_TRACK { + internal static string IDS_TRACKS { get { - return ResourceManager.GetString("IDS_TRACK", resourceCulture); + return ResourceManager.GetString("IDS_TRACKS", resourceCulture); } } diff --git a/music-player/TextResources/Resources.en-US.resx b/music-player/TextResources/Resources.en-US.resx index 6ab452d..78249e7 100644 --- a/music-player/TextResources/Resources.en-US.resx +++ b/music-player/TextResources/Resources.en-US.resx @@ -117,20 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Add to playlist - Add Add playlist name + + Add to playlist + - Albums + Albums - Artists + Artists Cancel @@ -147,6 +147,9 @@ Delete + + Details + Enter Playlist Name @@ -162,8 +165,11 @@ No results found + + Ok + - Playlists + Playlists Playlist name already in use. @@ -177,11 +183,17 @@ Search music + + Select All + Share - - Tracks + + This track will be deleted + + + Tracks Type Here diff --git a/music-player/TextResources/Resources.ko-KR.resx b/music-player/TextResources/Resources.ko-KR.resx index e16836b..9c28168 100644 --- a/music-player/TextResources/Resources.ko-KR.resx +++ b/music-player/TextResources/Resources.ko-KR.resx @@ -117,20 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 재생 목록에 추가 - 더하다 재생 목록 이름 추가 + + 재생 목록에 추가 + - 앨범 + 앨범 - 예술가 + 예술가 취소 @@ -147,6 +147,9 @@ 삭제하다 + + 세부 정보 + 재생 목록 이름 입력 @@ -162,8 +165,11 @@ 결과를 찾을 수 없습니다. + + 그래 + - 재생 목록 + 재생 목록 이미 사용 중인 재생 목록 이름입니다. @@ -177,11 +183,17 @@ 음악 검색 + + 모두 선택 + 공유 - - 트랙 + + 이 트랙은 삭제됩니다. + + + 트랙 여기에 입력하십시오 diff --git a/music-player/TextResources/Resources.resx b/music-player/TextResources/Resources.resx index 6ab452d..326b1bb 100644 --- a/music-player/TextResources/Resources.resx +++ b/music-player/TextResources/Resources.resx @@ -117,20 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Add to playlist - Add Add playlist name + + Add to playlist + - Albums + Albums - Artists + Artists Cancel @@ -147,6 +147,9 @@ Delete + + Details + Enter Playlist Name @@ -162,8 +165,11 @@ No results found + + Ok + - Playlists + Playlists Playlist name already in use. @@ -177,11 +183,17 @@ Search music + + Select All + Share - - Tracks + + This Track will be Deleted + + + Tracks Type Here diff --git a/music-player/ViewModels/PlaylistViewModel.cs b/music-player/ViewModels/PlaylistViewModel.cs index 63ccfbc..b6c7a9e 100755 --- a/music-player/ViewModels/PlaylistViewModel.cs +++ b/music-player/ViewModels/PlaylistViewModel.cs @@ -44,6 +44,7 @@ namespace MusicPlayer.ViewModels return false; } + private string playlistCount; public string PlaylistCount @@ -51,8 +52,8 @@ namespace MusicPlayer.ViewModels get => playlistCount; set { - string countText = string.Equals(value, "1") ? value + " Playlist" : value + " Playlists"; - SetProperty(ref playlistCount, countText); + string text = string.Equals(value, "1") ? " playlist" : " playlists"; + SetProperty(ref playlistCount, value + text); } } diff --git a/music-player/Views/AlbumDetailView.cs b/music-player/Views/AlbumDetailView.cs index 304e1bb..a496151 100755 --- a/music-player/Views/AlbumDetailView.cs +++ b/music-player/Views/AlbumDetailView.cs @@ -52,13 +52,13 @@ namespace MusicPlayer.Views public override void UpdateSubContentMoreButtonItems(Menu moreMenu) { - var addtoPlaylist = new MenuItem("MenuItems") { Text = "Add to playlist" }; + var addtoPlaylist = new MenuItem("MenuItems") { TranslatableText = "IDS_ADD_TO_PLAYLIST" }; addtoPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem("MenuItems") { Text = "Share" }; + var share = new MenuItem("MenuItems") { TranslatableText = "IDS_SHARE" }; share.Clicked += OnShareClick; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addtoPlaylist, share, delete }; diff --git a/music-player/Views/AlbumView.cs b/music-player/Views/AlbumView.cs index 349f361..bee0dd6 100755 --- a/music-player/Views/AlbumView.cs +++ b/music-player/Views/AlbumView.cs @@ -91,9 +91,9 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { TranslatableText = "IDS_ADD_TO_PLAYLIST" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, delete }; diff --git a/music-player/Views/ArtistDetailView.cs b/music-player/Views/ArtistDetailView.cs index 6c9ecb3..16554e8 100755 --- a/music-player/Views/ArtistDetailView.cs +++ b/music-player/Views/ArtistDetailView.cs @@ -29,13 +29,13 @@ namespace MusicPlayer.Views public override void UpdateSubContentMoreButtonItems(Menu moreMenu) { - var addtoPlaylist = new MenuItem("MenuItems") { Text = "Add to playlist" }; + var addtoPlaylist = new MenuItem("MenuItems") { TranslatableText = "IDS_ADD_TO_PLAYLIST" }; addtoPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem("MenuItems") { Text = "Share" }; + var share = new MenuItem("MenuItems") { TranslatableText = "IDS_SHARE" }; share.Clicked += OnShareClick; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addtoPlaylist, share, delete }; diff --git a/music-player/Views/ArtistView.cs b/music-player/Views/ArtistView.cs index 5d9135b..2b0c1c5 100755 --- a/music-player/Views/ArtistView.cs +++ b/music-player/Views/ArtistView.cs @@ -78,9 +78,9 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { TranslatableText = "IDS_ADD_TO_PLAYLIST" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, delete }; diff --git a/music-player/Views/BaseView.cs b/music-player/Views/BaseView.cs index 8cb1db0..f0b1d32 100755 --- a/music-player/Views/BaseView.cs +++ b/music-player/Views/BaseView.cs @@ -15,21 +15,17 @@ namespace MusicPlayer.Views private Button backButton; private Button moreButton; private Button searchButton; - private Tab tabs; + private TabView tabs; private BaseContentView baseContentView; // TODO these name strings are temporary...once the po files are added // need to use Translatable names. private static readonly string[] TabNames = new string[] { - "Playlists", - "Tracks", - "Albums", - "Artists", - //"IDS_PLAYLIST", - //"IDS_TRACK", - //"IDS_ALBUMS", - //"IDS_ARTISTS", + "IDS_PLAYLISTS", + "IDS_TRACKS", + "IDS_ALBUMS", + "IDS_ARTISTS", }; public BaseView() : base() { @@ -67,7 +63,7 @@ namespace MusicPlayer.Views FontStyle = UIFontStyles.NormalLight, }; topView.Add(titleLabel); - titleLabel.SetBinding(TextLabel.TranslatableTextProperty, "Title"); + titleLabel.SetBinding(TextLabel.TextProperty, "Title"); RelativeLayout.SetLeftTarget(titleLabel, topView); RelativeLayout.SetLeftRelativeOffset(titleLabel, 0.0f); RelativeLayout.SetRightTarget(titleLabel, topView); @@ -84,21 +80,28 @@ namespace MusicPlayer.Views FlexLayout.SetFlexGrow(contentView, 1); FlexLayout.SetFlexShrink(contentView, 1); - tabs = new Tab("Tabs") + tabs = new TabView() { ThemeChangeSensitive = true, Size2D = new Size2D(Window.Instance.Size.Width, 84).SpToPx(), WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 84.SpToPx(), }; + + tabs.TabBar.Margin = new Extents(0, 0, 0, 0); base.Add(tabs); + for(int i = 0; i<4; ++i) { - Tab.TabItemData item = new Tab.TabItemData() + var button = new TabButton("Tabs") { - Text = TabNames[i], + Text = " ", + HeightSpecification = 84.SpToPx(), + }; - tabs.AddItem(item); + button.TranslatableText = TabNames[i]; + var content = new View(); + tabs.AddTab(button,content); } backButton = null; @@ -106,15 +109,15 @@ namespace MusicPlayer.Views searchButton = null; } - public Tab Tabs + public TabView Tabs { get => tabs; } public string Title { - get => titleLabel.TranslatableText; - set { titleLabel.TranslatableText = value;} + get => titleLabel.Text; + set { titleLabel.Text = value;} } public bool BackButton @@ -226,7 +229,7 @@ namespace MusicPlayer.Views else { BackButton = false; - Title = "IDS_MUSIC"; + Title = "Music"; } contentView.Add(view); baseContentView = view; @@ -302,7 +305,7 @@ namespace MusicPlayer.Views if (baseContentView != null) { BackButton = false; - Title = "IDS_Music"; + Title = "Music"; baseContentView.RemoveSubContentView(); } } diff --git a/music-player/Views/PlayerView.cs b/music-player/Views/PlayerView.cs index bf8db5c..7815942 100755 --- a/music-player/Views/PlayerView.cs +++ b/music-player/Views/PlayerView.cs @@ -287,21 +287,21 @@ namespace MusicPlayer.Views private void OnMoreButtonClicked(object sender, ClickedEventArgs e) { Menu moreMenu = CreateMenu(); - var share = new MenuItem("MenuItems") { Text = "Share" }; + var share = new MenuItem("MenuItems") { TranslatableText = "IDS_SHARE" }; share.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); viewModel.OnCurrentTrackShare(); }; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); OnDeleteClicked(); }; - var details = new MenuItem("MenuItems") { Text = "Details" }; + var details = new MenuItem("MenuItems") { TranslatableText = "IDS_DETAILS" }; details.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); @@ -331,7 +331,7 @@ namespace MusicPlayer.Views PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", FontStyle = UIFontStyles.AllNormal, - Text = "Delete", + TranslatableText = "IDS_DELETE", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, }; @@ -349,7 +349,7 @@ namespace MusicPlayer.Views PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", FontStyle = UIFontStyles.NormalLight, - Text = "This track will be deleted.", + TranslatableText = "IDS_THIS_TRACK_WILL_BE_DELETED", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Margin = new Extents(0, 0, 32, 64).SpToPx(), @@ -386,7 +386,7 @@ namespace MusicPlayer.Views { WidthSpecification = 336.SpToPx(), HeightSpecification = 96.SpToPx(), - Text = "Delete", + TranslatableText = "IDS_DELETE", PointSize = 16.SpToPx(), }; buttonArea.Add(deleteButton); diff --git a/music-player/Views/PlaylistSelectorView.cs b/music-player/Views/PlaylistSelectorView.cs index 609f107..941a485 100755 --- a/music-player/Views/PlaylistSelectorView.cs +++ b/music-player/Views/PlaylistSelectorView.cs @@ -173,7 +173,7 @@ namespace MusicPlayer.Views HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Top, }, - TitleContent = CreateAlertDialogTitle("Create playlist"), + TitleContent = CreateAlertDialogTitle("IDS_CREATE_PLAYLIST"), Content = createPlaylistContentArea, ActionContent = createPlaylistButtonArea, }; diff --git a/music-player/Views/SearchView.cs b/music-player/Views/SearchView.cs index ff9fe6d..3eec956 100755 --- a/music-player/Views/SearchView.cs +++ b/music-player/Views/SearchView.cs @@ -107,7 +107,7 @@ namespace MusicPlayer.Views TranslatableText = "IDS_SEARCH", PixelSize = 36.SpToPx(), FontFamily = "BreezeSans", - Margin = new Extents(0, 32, 0, 0).SpToPx(), + Margin = new Extents(0, 32, 40, 0).SpToPx(), VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Begin, FontStyle = UIFontStyles.NormalLight, @@ -218,7 +218,7 @@ namespace MusicPlayer.Views { ListItemLayout layout = new ListItemLayout(); layout.Icon.SetBinding(ImageView.ResourceUrlProperty, "Thumbnail"); - layout.TitleLabel.SetBinding(TextLabel.TranslatableTextProperty, "Title"); + layout.TitleLabel.SetBinding(TextLabel.TextProperty, "Title"); layout.SubtitleLabel.SetBinding(TextLabel.TextProperty, "SubTitle"); return layout; }), diff --git a/music-player/Views/SelectorView.cs b/music-player/Views/SelectorView.cs index 9490651..f6e89b5 100755 --- a/music-player/Views/SelectorView.cs +++ b/music-player/Views/SelectorView.cs @@ -240,7 +240,7 @@ namespace MusicPlayer.Views TextLabel selAll = new TextLabel() { StyleName ="LabelText", - Text = "Select All", + TranslatableText = "IDS_SELECT_ALL", HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", diff --git a/music-player/Views/TrackDetailView.cs b/music-player/Views/TrackDetailView.cs index f1e5a30..e89bce7 100755 --- a/music-player/Views/TrackDetailView.cs +++ b/music-player/Views/TrackDetailView.cs @@ -148,7 +148,7 @@ namespace MusicPlayer.Views PixelSize = 40.SpToPx(), FontFamily = "BreezeSans", FontStyle = UIFontStyles.AllNormal, - Text = "Details", + TranslatableText = "IDS_DETAILS", }; navigationContent.Add(titleLabel); return navigationContent; diff --git a/music-player/Views/TrackView.cs b/music-player/Views/TrackView.cs index 23b893d..27b6a5f 100755 --- a/music-player/Views/TrackView.cs +++ b/music-player/Views/TrackView.cs @@ -136,11 +136,11 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { TranslatableText = "IDS_ADD_TO_PLAYLIST" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem("MenuItems") { Text = "Share" }; + var share = new MenuItem("MenuItems") { TranslatableText = "IDS_SHARE" }; share.Clicked += OnShareClick; - var delete = new MenuItem("MenuItems") { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { TranslatableText = "IDS_DELETE" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, share, delete }; diff --git a/music-player/Views/ViewManager.cs b/music-player/Views/ViewManager.cs index c75df94..73772ea 100755 --- a/music-player/Views/ViewManager.cs +++ b/music-player/Views/ViewManager.cs @@ -14,7 +14,9 @@ namespace MusicPlayer.Views { private readonly ViewLibrary viewLibrary; private View rootView; - private BaseView baseView; + + private BaseView baseView; + private int previousIndex = -1; private static readonly string[] TabNames = new string[] { "Playlists", @@ -85,7 +87,7 @@ namespace MusicPlayer.Views rootView = new View() { StyleName = "AppBackground", - Size = new Size(win.Size), + Size = new Size(win.Size), ThemeChangeSensitive = true, Layout = new FlexLayout() { @@ -113,20 +115,31 @@ namespace MusicPlayer.Views { baseView = new BaseView() { - Title = "IDS_MUSIC", + Title = "Music", MoreButton = true, SearchButton = true, }; rootview.Add(baseView); FlexLayout.SetFlexGrow(baseView, 1); FlexLayout.SetFlexShrink(baseView, 1); - baseView.Tabs.SelectedItemIndex = (int)ContentViewType.Playlist; - baseView.Tabs.ItemChangedEvent += OnTabItemSelect; + baseView.Tabs.TabBar.TabButtonSelected += OnTabButtonSelected; baseView.GetSearchButton().Clicked += OnSearchIconClicked; SetTabItem(-1, (int)ContentViewType.Playlist); PlaybackHelper.Instance.AddMiniPlayer += OnMiniPlayerAdd; } + private void OnTabButtonSelected(object sender, TabButtonSelectedEventArgs e) + { + Tizen.Log.Debug(AppConstants.LogTag, "Tab Item selected: " + TabNames[e.Index]); + Tizen.Log.Debug(AppConstants.LogTag, "Tab Item selected: " + "Prev Index: " + previousIndex + ", Curr Index" + e.Index); + if (previousIndex == e.Index) + { + return; + } + SetTabItem(previousIndex, e.Index); + previousIndex = e.Index; + } + private void OnMiniPlayerAdd(object sender, EventArgs e) { PlaybackHelper.Instance.ShowMiniPlayer(rootView); @@ -181,16 +194,5 @@ namespace MusicPlayer.Views Tizen.Log.Error(AppConstants.LogTag, "Adding " + currentContentView?.Name); } } - - private void OnTabItemSelect(object sender, Tab.ItemChangedEventArgs e) - { - Tizen.Log.Debug(AppConstants.LogTag, "Tab Item selected: " + TabNames[e.CurrentIndex]); - Tizen.Log.Debug(AppConstants.LogTag, "Tab Item selected: " + "Prev Index: "+e.PreviousIndex+", Curr Index"+e.CurrentIndex); - if(e.PreviousIndex == e.CurrentIndex) - { - return; - } - SetTabItem(e.PreviousIndex, e.CurrentIndex); - } } } diff --git a/music-player/res/themes/dark.xaml b/music-player/res/themes/dark.xaml index aadc82b..7aec85b 100755 --- a/music-player/res/themes/dark.xaml +++ b/music-player/res/themes/dark.xaml @@ -230,14 +230,14 @@ Id="DarkTheme"> - - + + - - + + + diff --git a/music-player/res/themes/light.xaml b/music-player/res/themes/light.xaml index f4ef63c..7125659 100755 --- a/music-player/res/themes/light.xaml +++ b/music-player/res/themes/light.xaml @@ -230,14 +230,14 @@ Id="LightTheme"> - - + + - - + + + diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index 246a10d..1d986b4 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ