Adding Multi Language support for save button.

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

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
index 5274aa04aefc07e7626e9677a46e0bbb311edef3..88d8730fbc243174e982f8fe0f9ec9717df3ed41 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.Designer.cs
@@ -78,6 +78,15 @@ namespace SettingWallpaper.LanguageResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Save.
+        /// </summary>
+        public static string IDS_SAVE {
+            get {
+                return ResourceManager.GetString("IDS_SAVE", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Tap To Preview.
         /// </summary>

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
index 0559f49c9191d8c01540a67738ae443082f54f11..de6693247e912a7254749f935405019946a675b7 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.en-US.resx
@@ -123,6 +123,9 @@
   <data name="IDS_NO_ALBUMS_TEXT" xml:space="preserve">
     <value>No Albums</value>
   </data>
+  <data name="IDS_SAVE" xml:space="preserve">
+    <value>Save</value>
+  </data>
   <data name="IDS_TAP_TO_PREVIEW" xml:space="preserve">
     <value>Tap To Preview</value>
   </data>

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.ko-KR.resx b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.ko-KR.resx
index ecb191ff2a983d6a15dc5cf21ffd5358d8ec6fb5..8f558d43187b3feb830c489a113391ea919c9be5 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.ko-KR.resx
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.ko-KR.resx
@@ -123,6 +123,9 @@
   <data name="IDS_NO_ALBUMS_TEXT" xml:space="preserve">
     <value>앨범 없음</value>
   </data>
+  <data name="IDS_SAVE" xml:space="preserve">
+    <value>저장</value>
+  </data>
   <data name="IDS_TAP_TO_PREVIEW" xml:space="preserve">
     <value>눌러서 미리보기</value>
   </data>

diff --git a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
index 0559f49c9191d8c01540a67738ae443082f54f11..de6693247e912a7254749f935405019946a675b7 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
+++ b/SettingWallpaper/SettingWallpaper/LanguageResources/LanguageResource.resx
@@ -123,6 +123,9 @@
   <data name="IDS_NO_ALBUMS_TEXT" xml:space="preserve">
     <value>No Albums</value>
   </data>
+  <data name="IDS_SAVE" xml:space="preserve">
+    <value>Save</value>
+  </data>
   <data name="IDS_TAP_TO_PREVIEW" xml:space="preserve">
     <value>Tap To Preview</value>
   </data>

diff --git a/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs b/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
index a0708ed018f5d606b959505aacbb0601578307b3..c821f96a1668c1afaa6b21dc0566b3944f46a554 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/WallpaperView.cs
@@ -304,18 +304,12 @@ namespace SettingWallpaper.Views
             backButton.Margin = AppCommon.backButtonMargin;
             backButton.Clicked += (s, e) => GadgetNavigation.NavigateBack();
 
-            ImageView icon = new ImageView
-            {
-                StyleName = "SaveIcon",
-            };
             SaveButton = new Button()
             {
-                Size2D = AppCommon.saveButtonSize,
-                BackgroundColor = Color.Transparent,
-                IsEnabled = true,
+                StyleName = "SaveButton",
+                Text = MainPage.gadgetResourceManager.GetString(nameof(LanguageResource.IDS_SAVE)),
                 Margin = AppCommon.saveButtonMargin,
             };
-            SaveButton.Add(icon);
             SaveButton.SetBinding(Control.CommandProperty, "SetWallpaperCommand");
             SaveButton.Hide();
 

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/dark.xaml b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/dark.xaml
index 7ec5e3a407e349b488f48853ed715195ace78ef0..4b0106e6326e9641001170cedeba7f56e374db8e 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/dark.xaml
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/dark.xaml
@@ -32,12 +32,6 @@ Id="DarkTheme">
         </ImageViewStyle.ResourceUrl>
     </ImageViewStyle>
 
-    <ImageViewStyle x:Key="SaveIcon" Size="110sp, 48sp">
-        <ImageViewStyle.ResourceUrl>
-            <Selector x:TypeArguments="x:String" Normal="*Resource*/mount/allowed/SettingWallpaper/images/dark/save.png" />
-        </ImageViewStyle.ResourceUrl>
-    </ImageViewStyle>
-
     <ImageViewStyle x:Key="AlbumIcon" Size="80sp, 80sp">
         <ImageViewStyle.ResourceUrl>
             <Selector x:TypeArguments="x:String" Normal="*Resource*/mount/allowed/SettingWallpaper/images/dark/folder.png"/>
@@ -45,4 +39,11 @@ Id="DarkTheme">
     </ImageViewStyle>
 
     <c:ButtonStyle x:Key="AlbumFolder" Size="114sp, 114sp" IsSelectable="false" IsEnabled="true" ThemeChangeSensitive="True" BackgroundColor="Transparent" BackgroundImage="*Resource*/mount/allowed/SettingWallpaper/images/dark/background.png"/>
+
+    <c:ButtonStyle x:Key="SaveButton" Size="110sp, 48sp" IsSelectable="false" IsEnabled="true" ThemeChangeSensitive="True" BackgroundColor="#FF8A00">
+        <c:ButtonStyle.Text>
+            <TextLabelStyle FontFamily="BreezeSans" PixelSize="24sp" TextColor="#16131A" >
+            </TextLabelStyle>
+        </c:ButtonStyle.Text>
+    </c:ButtonStyle>
 </Theme>
\ No newline at end of file

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/light.xaml b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/light.xaml
index bdcd0411c2d6385f2f4ef718cc6693a3404d4d47..320416f2fa95a4d7a4b09db2cf2dc1593aefb24e 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/light.xaml
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/themes/light.xaml
@@ -33,12 +33,6 @@ Id="LightTheme">
         </ImageViewStyle.ResourceUrl>
     </ImageViewStyle>
 
-    <ImageViewStyle x:Key="SaveIcon"  Size="110sp, 48sp">
-        <ImageViewStyle.ResourceUrl>
-            <Selector x:TypeArguments="x:String" Normal="*Resource*/mount/allowed/SettingWallpaper/images/light/save.png" />
-        </ImageViewStyle.ResourceUrl>
-    </ImageViewStyle>
-
     <ImageViewStyle x:Key="AlbumIcon" Size="80sp, 80sp">
         <ImageViewStyle.ResourceUrl>
             <Selector x:TypeArguments="x:String" Normal="*Resource*/mount/allowed/SettingWallpaper/images/light/folder.png"/>
@@ -46,4 +40,11 @@ Id="LightTheme">
     </ImageViewStyle>
 
     <c:ButtonStyle x:Key="AlbumFolder" Size="114sp, 114sp" IsSelectable="false" IsEnabled="true" ThemeChangeSensitive="True" BackgroundColor="Transparent" BackgroundImage="*Resource*/mount/allowed/SettingWallpaper/images/light/background.png"/>
+
+    <c:ButtonStyle x:Key="SaveButton" Size="110sp, 48sp" IsSelectable="false" IsEnabled="true" ThemeChangeSensitive="True" BackgroundColor="#FF6200">
+        <c:ButtonStyle.Text>
+            <TextLabelStyle FontFamily="BreezeSans" PixelSize="24sp" TextColor="#FDFDFD" >
+            </TextLabelStyle>
+        </c:ButtonStyle.Text>
+    </c:ButtonStyle>
 </Theme>
\ No newline at end of file

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll b/SettingWallpaper/SettingWallpaper/res/allowed/en-US/SettingWallpaper.resources.dll
index 06b531c4876a28488ae2e613b01e50e70bfa0f9f..a1434e43ff09e3dfc4e87816f67aa5a04a23953a 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 ddcfcc900f0f186e8e75aede3e57da5ce702a88a..d62cadb4aa83bb57ea55a800ae1b07afd66a4f8c 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 32841cc370b3f2dfe2aa53c39524bfe38ef34a29..2e6d133f5424ee192791e548cf7593ce2e23e37b 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