[TIZENIOT-2542] Fixing search view overlap issue

Change-Id: I8ac2a5fb264f29dd249c36c323f1f6a8a106d819
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/music-player/Views/SearchView.cs b/music-player/Views/SearchView.cs
index 78b62307b0f47765b5da7299e269f9d5457cc040..0609d96cd740ae648959df7b1de96a1eabd8d968 100755 (executable)
--- a/music-player/Views/SearchView.cs
+++ b/music-player/Views/SearchView.cs
@@ -48,8 +48,8 @@ namespace MusicPlayer.Views
                 Padding = (DeviceInfo.IsPortrait ? new Extents(32, 32, 0, 0) : new Extents(64, 64, 0, 0)).SpToPx(),
             };
             AddTopView();
-            AddTopViewElements();
             AddSearchBox();
+            AddTopViewElements();
             AddCollectionView();
             UpdateSearchView();
             TouchEvent += (object source, TouchEventArgs e) => false;
@@ -88,7 +88,8 @@ namespace MusicPlayer.Views
             backButton = new Button("BackButton")
             {
                 ThemeChangeSensitive = true,
-                Size2D = new Size2D(48, 48).SpToPx(),
+                WidthSpecification = 48.SpToPx(),
+                HeightSpecification = 48.SpToPx(),
                 Margin = new Extents(0, 24, 0, 0).SpToPx(),
             };
             topView.Add(backButton);
@@ -108,12 +109,16 @@ namespace MusicPlayer.Views
                 FontFamily = "BreezeSans",
                 Margin = new Extents(0, 32, 0, 0).SpToPx(),
                 VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Begin,
                 FontStyle = UIFontStyles.NormalLight,
             };
             topView.Add(searchLabel);
             RelativeLayout.SetLeftTarget(searchLabel, backButton);
             RelativeLayout.SetLeftRelativeOffset(searchLabel, 1.0f);
+            RelativeLayout.SetRightTarget(searchLabel, searchBox);
+            RelativeLayout.SetRightRelativeOffset(searchLabel, 0.0f);
             RelativeLayout.SetFillHorizontal(searchLabel, true);
+            RelativeLayout.SetHorizontalAlignment(searchLabel, RelativeLayout.Alignment.Start);
             RelativeLayout.SetVerticalAlignment(searchLabel, RelativeLayout.Alignment.Center);
         }
 
@@ -123,8 +128,9 @@ namespace MusicPlayer.Views
             {
                 StyleName = "SearchBox",
                 ThemeChangeSensitive = true,
-                Size2D = new Size2D(648, 60).SpToPx(),
-                Margin = new Extents(0, 32, 0, 0).SpToPx(),
+                WidthSpecification = ((int)(Window.Instance.WindowSize.Width * 0.6f) > 648 ? 648 : (int)(Window.Instance.WindowSize.Width * 0.6f)).SpToPx(),
+                HeightSpecification = 60.SpToPx(),
+                Padding = new Extents(24, 24, 0, 0).SpToPx(),
                 Layout = new FlexLayout()
                 {
                     Direction = FlexLayout.FlexDirection.Row,
@@ -132,49 +138,47 @@ namespace MusicPlayer.Views
                     Justification = FlexLayout.FlexJustification.FlexStart,
                 },
             };
+            topView.Add(searchBox);
+            RelativeLayout.SetRightTarget(searchBox, topView);
+            RelativeLayout.SetRightRelativeOffset(searchBox, 1.0f);
+            RelativeLayout.SetHorizontalAlignment(searchBox, RelativeLayout.Alignment.End);
+            RelativeLayout.SetVerticalAlignment(searchBox, RelativeLayout.Alignment.Center);
 
             Button searchButton = new Button("SearchIcon")
             {
                 ThemeChangeSensitive = true,
                 Name = "searchbutton",
-                Margin = new Extents(24, 0, 10, 10).SpToPx(),
-                Position2D = new Position2D(24, 10).SpToPx(),
+                Margin = new Extents(0, 20, 0, 0).SpToPx(),
             };
+            searchBox.Add(searchButton);
+
             textField = new TextField()
             {
                 StyleName = "TextField",
                 ThemeChangeSensitive = true,
                 Name ="Textfield",
-                Size2D = new Size2D(460, 40).SpToPx(),
+                WidthSpecification = 256.SpToPx(),
+                HeightSpecification = 60.SpToPx(),
                 BackgroundColor = Color.Transparent,
-                Position2D = new Position2D(88, 10).SpToPx(),
-                Margin = new Extents(24, 0, 10, 10).SpToPx(),
                 PixelSize = 32.SpToPx(),
                 PlaceholderText = "Type Here",
                 PlaceholderTextFocused = "Search music",
+                HorizontalAlignment = HorizontalAlignment.Begin,
+                VerticalAlignment = VerticalAlignment.Center,
             };
+            searchBox.Add(textField);
+            FlexLayout.SetFlexGrow(textField, 1.0f);
             textField.TextChanged += TextFieldTextChanged;
 
             crossButton = new Button("ClearButton")
             {
                 ThemeChangeSensitive = true,
                 Name = "crossButton",
-                Margin = new Extents(24, 0, 6, 6).SpToPx(),
-                Position2D = new Position2D(572, 6).SpToPx(),
+                Margin = new Extents(20, 0, 0, 0).SpToPx(),
             };
-            crossButton.Clicked += CrossButtonClicked;
-
-            searchBox.Add(searchButton);
-            searchBox.Add(textField);
             searchBox.Add(crossButton);
+            crossButton.Clicked += CrossButtonClicked;
             crossButton.Hide();
-            topView.Add(searchBox);
-            RelativeLayout.SetLeftTarget(searchBox, searchLabel);
-            RelativeLayout.SetLeftRelativeOffset(searchLabel, 1.0f);
-            RelativeLayout.SetRightTarget(searchBox, topView);
-            RelativeLayout.SetRightRelativeOffset(searchBox, 1.0f);
-            RelativeLayout.SetHorizontalAlignment(searchBox, RelativeLayout.Alignment.End);
-            RelativeLayout.SetVerticalAlignment(searchBox, RelativeLayout.Alignment.Center);
         }
 
         private void TextFieldTextChanged(object sender, TextField.TextChangedEventArgs e)
@@ -183,12 +187,10 @@ namespace MusicPlayer.Views
             if (string.IsNullOrEmpty(searchText))
             {
                 crossButton.Hide();
-                crossButton.IsSelectable = false;
             }
             else
             {
                 crossButton.Show();
-                crossButton.IsSelectable = true;
             }
             viewModel.UpdateSearchViewModel(searchText);
             UpdateSearchView();

diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj
index bc2f29ff4e41f0e0c8562374516dd402317e06db..977367d675f9ba7176e8dfe3ed26266f1ec79eb5 100755 (executable)
--- a/music-player/music-player.csproj
+++ b/music-player/music-player.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>\r
 \r
   <ItemGroup>\r
-    <PackageReference Include="Tizen.NET" Version="10.0.0.17173" />\r
+    <PackageReference Include="Tizen.NET" Version="10.0.0.17235" />\r
     <PackageReference Include="Tizen.NET.Sdk" Version="1.1.8" />\r
   </ItemGroup>\r
 \r

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index 789d9ea362fc525f09caa58e9bd8e04099a377a9..fffbca8cff753ff9064353dfb73ddb8de004164c 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ