From: tarun.mahay Date: Mon, 3 Oct 2022 08:56:15 +0000 (+0530) Subject: Fixing scale factor issues. X-Git-Tag: accepted/tizen/unified/20221004.073937^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9d8de9c47bf17949a138153f322aeb8bca6e65b;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git Fixing scale factor issues. Change-Id: I78038297789cbea2eacd25375da75f1c0ab13031 Signed-off-by: tarun.mahay --- diff --git a/music-player/Views/AlbumDetailLayout.cs b/music-player/Views/AlbumDetailLayout.cs index 820337a..c301ea8 100755 --- a/music-player/Views/AlbumDetailLayout.cs +++ b/music-player/Views/AlbumDetailLayout.cs @@ -54,7 +54,7 @@ namespace MusicPlayer.Views { textView = new View() { - HeightSpecification = 76.SpToPx(), + HeightSpecification = 84.SpToPx(), WidthSpecification = (DeviceInfo.IsPortrait ? 748 : 564).SpToPx(), BackgroundColor = Color.Transparent, Layout = new LinearLayout() @@ -77,7 +77,7 @@ namespace MusicPlayer.Views titleLabel = new TextLabel() { WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, @@ -94,7 +94,7 @@ namespace MusicPlayer.Views { WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, @@ -110,7 +110,7 @@ namespace MusicPlayer.Views { WidthSpecification = 108.SpToPx(), HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.End, diff --git a/music-player/Views/AlbumDetailView.cs b/music-player/Views/AlbumDetailView.cs index b336977..304e1bb 100755 --- a/music-player/Views/AlbumDetailView.cs +++ b/music-player/Views/AlbumDetailView.cs @@ -159,7 +159,7 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, WidthSpecification = (DeviceInfo.IsPortrait ? 508 : 640).SpToPx(), HeightSpecification = 48.SpToPx(), - PixelSize = 36.SpToPx(), + PixelSize = 32.SpToPx(), Margin = new Extents(0, 0, 32, 14).SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, @@ -176,7 +176,7 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, WidthSpecification = (DeviceInfo.IsPortrait ? 508 : 640).SpToPx(), HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, diff --git a/music-player/Views/ArtistDetailGroupLayout.cs b/music-player/Views/ArtistDetailGroupLayout.cs index 6c8ee56..d8e1657 100755 --- a/music-player/Views/ArtistDetailGroupLayout.cs +++ b/music-player/Views/ArtistDetailGroupLayout.cs @@ -62,7 +62,7 @@ namespace MusicPlayer.Views TextLabel titleLabel = new TextLabel() { StyleName = "ItemLabel", - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, diff --git a/music-player/Views/ArtistDetailItemLayout.cs b/music-player/Views/ArtistDetailItemLayout.cs index c2c8f82..c320649 100755 --- a/music-player/Views/ArtistDetailItemLayout.cs +++ b/music-player/Views/ArtistDetailItemLayout.cs @@ -62,7 +62,7 @@ namespace MusicPlayer.Views { titleLabel = new TextLabel() { - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, @@ -84,7 +84,7 @@ namespace MusicPlayer.Views { WidthSpecification = 160.SpToPx(), HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.End, diff --git a/music-player/Views/BaseContentView.cs b/music-player/Views/BaseContentView.cs index e6cd965..de345fe 100755 --- a/music-player/Views/BaseContentView.cs +++ b/music-player/Views/BaseContentView.cs @@ -156,7 +156,7 @@ namespace MusicPlayer.Views StyleName = "TitleText", Size2D = new Size2D(234, 36).SpToPx(), Text = "No items in folder", - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, Margin = new Extents(0, 0, 8, 0).SpToPx(), diff --git a/music-player/Views/BaseSubContentView.cs b/music-player/Views/BaseSubContentView.cs index db4327a..e8a38f6 100755 --- a/music-player/Views/BaseSubContentView.cs +++ b/music-player/Views/BaseSubContentView.cs @@ -153,7 +153,7 @@ namespace MusicPlayer.Views StyleName = "TitleText", Size2D = new Size2D(234, 36).SpToPx(), Text = "No items in folder", - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, Margin = new Extents(0, 0, 8, 0).SpToPx(), diff --git a/music-player/Views/ListItemLayout.cs b/music-player/Views/ListItemLayout.cs index 8e18b9f..8ea2040 100755 --- a/music-player/Views/ListItemLayout.cs +++ b/music-player/Views/ListItemLayout.cs @@ -9,7 +9,7 @@ namespace MusicPlayer.Views { class ListItemLayout : RecyclerViewItem { - private const int IconSize = 64; + private const int IconSize = 70; private const int SeperatorHeight = 2; private View itemSeperator; @@ -77,7 +77,7 @@ defaultValueCreator: (bindable) => ((ListItemLayout)bindable).playingStatus); textView = new View() { BackgroundColor = Color.Transparent, - HeightSpecification = 76.SpToPx(), + HeightSpecification = 84.SpToPx(), Layout = new LinearLayout() { LinearOrientation = LinearLayout.Orientation.Vertical, @@ -96,7 +96,7 @@ defaultValueCreator: (bindable) => ((ListItemLayout)bindable).playingStatus); titleLabel = new TextLabel() { WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, @@ -110,7 +110,7 @@ defaultValueCreator: (bindable) => ((ListItemLayout)bindable).playingStatus); { WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, diff --git a/music-player/Views/MiniPlayer.cs b/music-player/Views/MiniPlayer.cs index 32f15bd..de86828 100755 --- a/music-player/Views/MiniPlayer.cs +++ b/music-player/Views/MiniPlayer.cs @@ -173,7 +173,7 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 28.SpToPx(), - PixelSize = 22.SpToPx(), + PixelSize = 19.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, diff --git a/music-player/Views/PlayerView.cs b/music-player/Views/PlayerView.cs index 044075d..624bbee 100755 --- a/music-player/Views/PlayerView.cs +++ b/music-player/Views/PlayerView.cs @@ -328,7 +328,7 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 48.SpToPx(), - PixelSize = 36.SpToPx(), + PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", FontStyle = UIFontStyles.AllNormal, Text = "Delete", @@ -345,14 +345,14 @@ namespace MusicPlayer.Views StyleName = "LabelText", ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", FontStyle = UIFontStyles.NormalLight, Text = "This track will be deleted.", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, - Margin = new Extents(0, 0, 40, 64).SpToPx(), + Margin = new Extents(0, 0, 32, 64).SpToPx(), }; return titleLabel; } @@ -387,6 +387,7 @@ namespace MusicPlayer.Views WidthSpecification = 336.SpToPx(), HeightSpecification = 96.SpToPx(), Text = "Delete", + PointSize = 32.SpToPx(), }; buttonArea.Add(deleteButton); RelativeLayout.SetRightRelativeOffset(deleteButton, 1.0f); @@ -493,7 +494,7 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = ModifySize(36).SpToPx(), - PixelSize = ModifySize(28).SpToPx(), + PixelSize = ModifySize(24).SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, diff --git a/music-player/Views/PlaylistSelectorView.cs b/music-player/Views/PlaylistSelectorView.cs index 318717e..a330d8e 100755 --- a/music-player/Views/PlaylistSelectorView.cs +++ b/music-player/Views/PlaylistSelectorView.cs @@ -317,6 +317,7 @@ namespace MusicPlayer.Views { Size2D = new Size2D(336, 96).SpToPx(), Text = "Cancel", + PointSize = 32.SpToPx(), }; selectPlaylistActionArea.Add(selectPlaylistCancelButton); selectPlaylistCancelButton.TextLabel.FontStyle = UIFontStyles.AllNormal; @@ -356,7 +357,7 @@ namespace MusicPlayer.Views StyleName = "TitleText", ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), Text = "Add playlist name.", HorizontalAlignment = HorizontalAlignment.Center, @@ -379,7 +380,7 @@ namespace MusicPlayer.Views StyleName = "ItemLabel", ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 32.SpToPx(), + HeightSpecification = 36.SpToPx(), PixelSize = 24.SpToPx(), Text = "Can't enter more than 64 characters.", HorizontalAlignment = HorizontalAlignment.Begin, @@ -486,6 +487,7 @@ namespace MusicPlayer.Views { Size2D = new Size2D(336, 96).SpToPx(), Text = "Create", + PointSize = 32.SpToPx(), }; createPlaylistCreateButton.TextLabel.FontStyle = UIFontStyles.AllNormal; createPlaylistCreateButton.IsSelectable = true; diff --git a/music-player/Views/PlaylistView.cs b/music-player/Views/PlaylistView.cs index 4586f63..d13ed00 100755 --- a/music-player/Views/PlaylistView.cs +++ b/music-player/Views/PlaylistView.cs @@ -38,7 +38,7 @@ namespace MusicPlayer.Views { StyleName = "LabelText", ThemeChangeSensitive = true, - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), Text = "Playlist COUNT", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, @@ -144,7 +144,7 @@ namespace MusicPlayer.Views FontStyle = UIFontStyles.NormalLight, Text = "Add playlist name", WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), HorizontalAlignment = HorizontalAlignment.Center, }; return contentLabel; @@ -194,14 +194,14 @@ namespace MusicPlayer.Views { Name = "AlertDialogContent", WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 116.SpToPx(), + HeightSpecification = 122.SpToPx(), BackgroundColor = Color.Transparent, Layout = new LinearLayout() { LinearOrientation = LinearLayout.Orientation.Vertical, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Top, - Margin = new Extents(0, 0, 40, 24).SpToPx(), + Margin = new Extents(0, 0, 34, 24).SpToPx(), } }; return contentArea; @@ -225,6 +225,7 @@ namespace MusicPlayer.Views Size2D = new Size2D(336, 96).SpToPx(), Name = "AlertDialogCreateButton", Text = "Create", + PointSize = 32.SpToPx(), }; return createButton; } diff --git a/music-player/Views/SearchView.cs b/music-player/Views/SearchView.cs index 0609d96..0a4d999 100755 --- a/music-player/Views/SearchView.cs +++ b/music-player/Views/SearchView.cs @@ -321,7 +321,7 @@ namespace MusicPlayer.Views WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 36.SpToPx(), Text = "No results found", - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Center, Margin = new Extents(0, 0, 32, 0).SpToPx(), diff --git a/music-player/Views/SelectListLayout.cs b/music-player/Views/SelectListLayout.cs index ae72565..c12a9cb 100755 --- a/music-player/Views/SelectListLayout.cs +++ b/music-player/Views/SelectListLayout.cs @@ -8,7 +8,7 @@ namespace MusicPlayer.Views class SelectListLayout : RecyclerViewItem { private const int BoxSize = 36; - private const int IconSize = 64; + private const int IconSize = 70; private CheckBox checkBox; private View itemSeperator; @@ -51,7 +51,7 @@ namespace MusicPlayer.Views textView = new View() { BackgroundColor = Color.Transparent, - HeightSpecification = 76.SpToPx(), + HeightSpecification = 84.SpToPx(), Layout = new LinearLayout() { LinearOrientation = LinearLayout.Orientation.Vertical, @@ -71,7 +71,7 @@ namespace MusicPlayer.Views { StyleName = "ItemLabel", WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, @@ -86,7 +86,7 @@ namespace MusicPlayer.Views StyleName = "ItemLabel", WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 36.SpToPx(), - PixelSize = 28.SpToPx(), + PixelSize = 24.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, diff --git a/music-player/Views/SelectorView.cs b/music-player/Views/SelectorView.cs index ffc3821..9490651 100755 --- a/music-player/Views/SelectorView.cs +++ b/music-player/Views/SelectorView.cs @@ -100,7 +100,7 @@ namespace MusicPlayer.Views { StyleName = "TitleText", HeightSpecification = 48.SpToPx(), - PixelSize = 36.SpToPx(), + PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, VerticalAlignment = VerticalAlignment.Center, @@ -241,7 +241,7 @@ namespace MusicPlayer.Views { StyleName ="LabelText", Text = "Select All", - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), PixelSize = 32.SpToPx(), FontFamily = "BreezeSans", HorizontalAlignment = HorizontalAlignment.Begin, diff --git a/music-player/Views/TrackDetailView.cs b/music-player/Views/TrackDetailView.cs index 0515245..f1e5a30 100755 --- a/music-player/Views/TrackDetailView.cs +++ b/music-player/Views/TrackDetailView.cs @@ -187,7 +187,7 @@ namespace MusicPlayer.Views View textArea = new View() { WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 76.SpToPx(), + HeightSpecification = 84.SpToPx(), Layout = new LinearLayout() { LinearOrientation = LinearLayout.Orientation.Vertical, @@ -203,7 +203,8 @@ namespace MusicPlayer.Views { ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, - HeightSpecification = 40.SpToPx(), + HeightSpecification = 48.SpToPx(), + PixelSize = 32.SpToPx(), StyleName = "DetailTitle", FontStyle = UIFontStyles.NormalLight, Text = title, @@ -228,7 +229,7 @@ namespace MusicPlayer.Views View itemSeparator = new View() { BackgroundColor = UIColors.HEXC3CAD2, - WidthSpecification = LayoutParamPolicies.MatchParent, + WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 2.SpToPx(), }; view.Add(itemSeparator); diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj index 7724c30..6093c0e 100755 --- a/music-player/music-player.csproj +++ b/music-player/music-player.csproj @@ -19,7 +19,7 @@ - + diff --git a/music-player/res/themes/dark.xaml b/music-player/res/themes/dark.xaml index eae8943..e97574c 100755 --- a/music-player/res/themes/dark.xaml +++ b/music-player/res/themes/dark.xaml @@ -17,7 +17,7 @@ Id="DarkTheme"> - + @@ -188,7 +188,7 @@ Id="DarkTheme"> - + @@ -232,7 +232,7 @@ Id="DarkTheme"> - + @@ -264,7 +264,7 @@ Id="DarkTheme"> - + diff --git a/music-player/res/themes/light.xaml b/music-player/res/themes/light.xaml index b295b59..be03722 100755 --- a/music-player/res/themes/light.xaml +++ b/music-player/res/themes/light.xaml @@ -17,7 +17,7 @@ Id="LightTheme"> - + @@ -188,7 +188,7 @@ Id="LightTheme"> - + @@ -232,7 +232,7 @@ Id="LightTheme"> - + @@ -264,7 +264,7 @@ Id="LightTheme"> - + diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index f425a87..c9c401c 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ