Fixing issue TNINE-365 and TNINE-409

Change-Id: I518a3875b125f8651be12eeff075aeabf35531fc
Signed-off-by: tarunkumarmahay1999 <tarun.mahay@samsung.com>

diff --git a/SettingWallpaper/SettingWallpaper/Common/AppCommon.cs b/SettingWallpaper/SettingWallpaper/Common/AppCommon.cs
index 54138f88d8abe261e2525d42d38375d29220f935..8ec78e84848ef0aa61619e9f2585bc26b6469c58 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Common/AppCommon.cs
+++ b/SettingWallpaper/SettingWallpaper/Common/AppCommon.cs
@@ -30,7 +30,7 @@ namespace SettingWallpaper.Common
         public static int albumBaseViewHeight = 138.SpToPx();
         public static int albumBackgroundWidth = 122.SpToPx();
         public static int albumBackgroundHeight = 102.SpToPx();
-        public static Extents customAlbumTitlePadding = new Extents(16, 16, 24, 0).SpToPx();
+        public static Extents customAlbumTitlePadding = new Extents(16, 16, 0, 0).SpToPx();
 
         public static Extents itemPadding = new Extents(8, 8, 8, 8).SpToPx();
         public static Extents albumLayoutBaseViewPadding = new Extents(0, 0, 8, 0).SpToPx();
@@ -47,15 +47,15 @@ namespace SettingWallpaper.Common
         public static Size2D thumbnailSize = new Size2D(114, 114).SpToPx();
         public static int customItemHeight = 64.SpToPx();
         public static int albumTitleHeight = 32.SpToPx();
-        public static Extents backButtonMargin = new Extents(16, 8, 8, 8).SpToPx();
-        public static Extents albumTitleMargin = new Extents(0, 16, 16, 16).SpToPx();
+        public static Extents backButtonMargin = new Extents(16, 8, 0, 0).SpToPx();
         public static Extents saveButtonMargin = new Extents(0, 64, 8, 0).SpToPx();
+        public static Extents titleMargin = new Extents(0, 0, 24, 0).SpToPx();
 
         public static int centerTextHeight = 32.SpToPx();
         public static int centerTextPixelSize = 24.SpToPx();
 
         public static int bottomViewHeight = 144.SpToPx();
-        public static float bottomViewWidthRatio = 0.55f;
+        public static float bottomViewWidthRatio = 0.56f;
         public static Size2D bottomViewItemsCellPadding = new Size2D(16, 0);
         public static Extents bottomViewMargin = new Extents(0, 0, 0, 80).SpToPx();
         public static int wallpaperListViewHeight = 114.SpToPx();

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
index 88d8730fbc243174e982f8fe0f9ec9717df3ed41..03b5d4bfadbf0d6b9e5ec9fcc28ee5a0bd30d668 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
@@ -88,7 +88,7 @@ namespace SettingWallpaper.LanguageResources {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to Tap To Preview.
+        ///   Looks up a localized string similar to Tap to preview.
         /// </summary>
         public static string IDS_TAP_TO_PREVIEW {
             get {

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
index de6693247e912a7254749f935405019946a675b7..40be3b116f2e60a105d4ca84f017c13344a4d2d9 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
@@ -127,7 +127,7 @@
     <value>Save</value>
   </data>
   <data name="IDS_TAP_TO_PREVIEW" xml:space="preserve">
-    <value>Tap To Preview</value>
+    <value>Tap to preview</value>
   </data>
   <data name="IDS_WALLPAPER" xml:space="preserve">
     <value>Wallpaper</value>

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
index de6693247e912a7254749f935405019946a675b7..40be3b116f2e60a105d4ca84f017c13344a4d2d9 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
@@ -127,7 +127,7 @@
     <value>Save</value>
   </data>
   <data name="IDS_TAP_TO_PREVIEW" xml:space="preserve">
-    <value>Tap To Preview</value>
+    <value>Tap to preview</value>
   </data>
   <data name="IDS_WALLPAPER" xml:space="preserve">
     <value>Wallpaper</value>

diff --git a/SettingWallpaper/SettingWallpaper/Views/AlbumItemLayout.cs b/SettingWallpaper/SettingWallpaper/Views/AlbumItemLayout.cs
index 2b819c31450587d7bd3cbe434f47507ebcbd8606..e3eaf468e4ecbcc3287f70853f4169dcaa586f01 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/AlbumItemLayout.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/AlbumItemLayout.cs
@@ -74,7 +74,6 @@ namespace SettingWallpaper.Views
             {
                 StyleName = "ItemText",
                 PixelSize = 16.SpToPx(),
-                HeightSpecification = AppCommon.albumIconTextHeight,
                 WidthSpecification = LayoutParamPolicies.MatchParent,
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,

diff --git a/SettingWallpaper/SettingWallpaper/Views/CustomAlbumTitle.cs b/SettingWallpaper/SettingWallpaper/Views/CustomAlbumTitle.cs
index f8674a9841270bca2e55a6465bbf12ae9a52c070..e08bea16e7430633f1f2dd0a9811f864833d7585 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/CustomAlbumTitle.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/CustomAlbumTitle.cs
@@ -32,6 +32,7 @@ namespace SettingWallpaper.Views
             HeightSpecification = AppCommon.customItemHeight;
             BackgroundColor = Color.Transparent;
             Padding = AppCommon.customAlbumTitlePadding;
+            Margin = AppCommon.titleMargin;
             ThemeChangeSensitive = true;
             Layout = new RelativeLayout()
             {
@@ -40,12 +41,12 @@ namespace SettingWallpaper.Views
             {
                 StyleName = "ItemText",
                 Text = LanguageResource.IDS_ALBUMS_TEXT,
+                HorizontalAlignment = HorizontalAlignment.Begin,
                 PixelSize = 24.SpToPx(),
-                HeightSpecification = AppCommon.albumTitleHeight,
                 BackgroundColor = Color.Transparent,
             };
             Add(albumTitle);
-            RelativeLayout.SetFillHorizontal(albumTitle, true);
+            RelativeLayout.SetVerticalAlignment(albumTitle, RelativeLayout.Alignment.Center);
         }
 
         protected override void Dispose(DisposeTypes type)

diff --git a/SettingWallpaper/SettingWallpaper/Views/CustomTitleItem.cs b/SettingWallpaper/SettingWallpaper/Views/CustomTitleItem.cs
index 12aa6618347b523624de9c3f76b693508d9d618d..b56f334ae0c79cc83a5e8377a7d702f32759e6e2 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/CustomTitleItem.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/CustomTitleItem.cs
@@ -31,6 +31,7 @@ namespace SettingWallpaper.Views
         {
             WidthSpecification = LayoutParamPolicies.MatchParent;
             HeightSpecification = AppCommon.customItemHeight;
+            Margin = AppCommon.titleMargin;
             BackgroundColor = Color.Transparent;
             ThemeChangeSensitive = true;
             Layout = new RelativeLayout();
@@ -50,19 +51,18 @@ namespace SettingWallpaper.Views
             };
             backButton.Add(icon);
             backButton.SetBinding(Control.CommandProperty, "BackButtonCommand");
-
+            RelativeLayout.SetVerticalAlignment(backButton, RelativeLayout.Alignment.Center);
             albumTitle = new TextLabel()
             {
                 StyleName = "ItemText",
                 PixelSize = 24.SpToPx(),
-                HeightSpecification = AppCommon.albumTitleHeight,
                 HorizontalAlignment = HorizontalAlignment.Begin,
-                Margin = AppCommon.albumTitleMargin,
                 BackgroundColor = Color.Transparent,
             };
             albumTitle.SetBinding(TextLabel.TextProperty, "AlbumName");
             RelativeLayout.SetLeftTarget(albumTitle, backButton);
             RelativeLayout.SetLeftRelativeOffset(albumTitle, 1.0f);
+            RelativeLayout.SetVerticalAlignment(albumTitle, RelativeLayout.Alignment.Center);
             Add(backButton);
             Add(albumTitle);
         }

diff --git a/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs b/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
index c821f96a1668c1afaa6b21dc0566b3944f46a554..90a87d8042adab804d9c71c6436c20ab4cdaf3ff 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
@@ -90,7 +90,6 @@ namespace SettingWallpaper.Views
         {
             centerText = new TextLabel()
             {
-                HeightSpecification = AppCommon.centerTextHeight,
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
                 Text = MainPage.gadgetResourceManager.GetString(nameof(LanguageResource.IDS_TAP_TO_PREVIEW)),

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll b/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll
index a1434e43ff09e3dfc4e87816f67aa5a04a23953a..e8fe952803ddcd84d7491f017ee4826292ec071a 100644 (file)
Binary files a/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll and b/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll differ

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/ko-KR/SettingWallpaper.resources.dll b/SettingWallpaper/SettingWallpaper/res/allowed/ko-KR/SettingWallpaper.resources.dll
index d62cadb4aa83bb57ea55a800ae1b07afd66a4f8c..157afeeb3d96400872943ccab9ed90c841931cb9 100644 (file)
Binary files a/SettingWallpaper/SettingWallpaper/res/allowed/ko-KR/SettingWallpaper.resources.dll and b/SettingWallpaper/SettingWallpaper/res/allowed/ko-KR/SettingWallpaper.resources.dll differ

diff --git a/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk b/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk
index 2e6d133f5424ee192791e548cf7593ce2e23e37b..c47484ad7ad7e2212c3d90f6416f51dfdbb4da01 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk and b/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk differ