summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzijur Rahman Sheatu <azijur.r@samsung.com>2024-05-27 18:13:33 +0600
committerAzijur Rahman Sheatu <azijur.r@samsung.com>2024-05-27 18:13:33 +0600
commit6b6adc8e4461adab8d91653286ba572bf1fc6240 (patch)
tree48466b593dc8b3e780ff26bad8830800ffd4fa50
parenta4c813c05098d4120616cb76f3d93eb8ab4dc1e4 (diff)
downloadsetting-wallpaper-accepted/tizen_unified_toolchain.tar.gz
setting-wallpaper-accepted/tizen_unified_toolchain.tar.bz2
setting-wallpaper-accepted/tizen_unified_toolchain.zip
[Issue] TNINE-398 [Problem] Album window border wrong icons wrong size and stroke width are not aligned with GUI guide [Cause & Measure] Cause : Border properties and icons were not set properly. Measure : Border properties and new icons are added properly. Change-Id: Ife4f342ea9bd3c043924b1951651f11e76f435ac Signed-off-by: azijur-r <azijur.r@samsung.com>
-rw-r--r--SettingWallpaper/SettingWallpaper/CustomBorder.cs41
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/close.pngbin216 -> 2092 bytes
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/leftCorner.pngbin446 -> 1583 bytes
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/maximalize.pngbin211 -> 1101 bytes
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/minimalize.pngbin148 -> 150 bytes
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/rightCorner.pngbin434 -> 1763 bytes
-rw-r--r--SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/smallwindow.pngbin258 -> 1429 bytes
-rw-r--r--packaging/org.tizen.cssetting-wallpaper-1.0.0.rpkbin78304 -> 84815 bytes
8 files changed, 25 insertions, 16 deletions
diff --git a/SettingWallpaper/SettingWallpaper/CustomBorder.cs b/SettingWallpaper/SettingWallpaper/CustomBorder.cs
index 5a5ca5f..2e74528 100644
--- a/SettingWallpaper/SettingWallpaper/CustomBorder.cs
+++ b/SettingWallpaper/SettingWallpaper/CustomBorder.cs
@@ -43,10 +43,14 @@ namespace SettingWallpaper
private ImageView closeIcon;
private ImageView leftCornerIcon;
+ private static Size2D IconSize = new Size2D(48, 48);
+ private const int BorderThickness = 6;
+ private const int BottomViewHeight = 48;
+ private const int BorderCornerRadius = 24;
+
public event Action CloseClicked;
public CustomBorder() : base()
{
- BorderLineThickness = 0;
ResizePolicy = Window.BorderResizePolicyType.Free;
MinSize = new Size2D(320, 280).SpToPx();
}
@@ -63,28 +67,34 @@ namespace SettingWallpaper
return false;
}
this.bottomView = bottomView;
+
bottomView.Layout = new RelativeLayout();
+ bottomView.HeightSpecification = BottomViewHeight.SpToPx();
minimalizeIcon = new ImageView()
{
+ Size2D = IconSize.SpToPx(),
ResourceUrl = MinimalizeIcon,
AccessibilityHighlightable = true,
};
maximalizeIcon = new ImageView()
{
+ Size2D = IconSize.SpToPx(),
ResourceUrl = MaximalizeIcon,
AccessibilityHighlightable = true,
};
closeIcon = new ImageView()
{
+ Size2D = IconSize.SpToPx(),
ResourceUrl = CloseIcon,
AccessibilityHighlightable = true,
};
leftCornerIcon = new ImageView()
{
+ Size2D = IconSize.SpToPx(),
ResourceUrl = LeftCornerIcon,
AccessibilityHighlightable = true,
};
@@ -149,15 +159,15 @@ namespace SettingWallpaper
public override void CreateBorderView(View borderView)
{
this.borderView = borderView;
- borderView.CornerRadius = new Vector4(0.03f, 0.03f, 0.03f, 0.03f);
- borderView.CornerRadiusPolicy = VisualTransformPolicyType.Relative;
+
+ BorderLineThickness = (uint)BorderThickness.SpToPx();
borderView.BackgroundColor = borderBackgroundColor;
}
public override void OnCreated(View borderView)
{
base.OnCreated(borderView);
- UpdateIcons();
+ UpdateView();
}
public override bool OnCloseIconTouched(object sender, View.TouchEventArgs e)
@@ -182,29 +192,28 @@ namespace SettingWallpaper
{
if (borderView != null)
{
- borderView.BackgroundColor = borderBackgroundColor;
base.OnResized(width, height);
- UpdateIcons();
+
+ borderView.BackgroundColor = borderBackgroundColor;
+ UpdateView();
}
}
- private void UpdateIcons()
+ private void UpdateView()
{
- if (BorderWindow != null && borderView != null)
+ if (BorderWindow != null && borderView != null && maximalizeIcon != null)
{
+ // CornerRadious needed to be set in the OnResized to get effect properly
+ borderView.CornerRadiusPolicy = VisualTransformPolicyType.Absolute;
+ borderView.CornerRadius = BorderCornerRadius.SpToPx();
+
if (BorderWindow.IsMaximized() == true)
{
- if (maximalizeIcon != null)
- {
- maximalizeIcon.ResourceUrl = RestoreIcon;
- }
+ maximalizeIcon.ResourceUrl = RestoreIcon;
}
else
{
- if (maximalizeIcon != null)
- {
- maximalizeIcon.ResourceUrl = MaximalizeIcon;
- }
+ maximalizeIcon.ResourceUrl = MaximalizeIcon;
}
}
}
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/close.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/close.png
index c49e480..6b09554 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/close.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/close.png
Binary files differ
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/leftCorner.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/leftCorner.png
index 6f82440..72e2119 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/leftCorner.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/leftCorner.png
Binary files differ
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/maximalize.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/maximalize.png
index c5cbbaf..320b602 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/maximalize.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/maximalize.png
Binary files differ
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/minimalize.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/minimalize.png
index 6b116b2..266d548 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/minimalize.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/minimalize.png
Binary files differ
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/rightCorner.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/rightCorner.png
index 68d837f..05871f3 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/rightCorner.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/rightCorner.png
Binary files differ
diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/smallwindow.png b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/smallwindow.png
index 8f4263b..9def8da 100644
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/smallwindow.png
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/images/smallwindow.png
Binary files differ
diff --git a/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk b/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk
index 4eb15d7..34861a5 100644
--- a/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk
+++ b/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk
Binary files differ