summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>2022-10-16 14:52:02 +0530
committerShivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>2022-10-16 15:12:25 +0530
commit0479a372712ae826e9e0ededd7e487043ae74d75 (patch)
treed81e7458968def0b045c00ab3454052fd33b4998
parent9a46a7d735b7a164a8ccb31817f30ce15226cf43 (diff)
downloadsetting-wallpaper-accepted/tizen_7.0_unified.tar.gz
setting-wallpaper-accepted/tizen_7.0_unified.tar.bz2
setting-wallpaper-accepted/tizen_7.0_unified.zip
2. Fixing Save Button Position. Change-Id: Ic944d2858a9865077db238249beb59ddce5cb193 Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>
-rw-r--r--Settings/SettingWallpaper/SettingWallpaper.csproj15
-rw-r--r--Settings/SettingWallpaper/SettingWidgetWallpaper.cs4
-rw-r--r--Settings/SettingWallpaper/ViewManager.cs15
-rw-r--r--Settings/SettingWallpaper/Views/WallpaperView.cs2
-rw-r--r--Settings/SettingWallpaper/res/resx/LanguageResources.Designer.cs90
-rw-r--r--Settings/SettingWallpaper/res/resx/LanguageResources.ko-KR.resx129
-rw-r--r--Settings/SettingWallpaper/res/resx/LanguageResources.resx129
-rw-r--r--packaging/org.tizen.cssetting-wallpaper-1.0.0.tpkbin83577 -> 91282 bytes
8 files changed, 369 insertions, 15 deletions
diff --git a/Settings/SettingWallpaper/SettingWallpaper.csproj b/Settings/SettingWallpaper/SettingWallpaper.csproj
index 4f6102d..ed72c0b 100644
--- a/Settings/SettingWallpaper/SettingWallpaper.csproj
+++ b/Settings/SettingWallpaper/SettingWallpaper.csproj
@@ -46,4 +46,19 @@
<Folder Include="res\images\dark\" />
</ItemGroup>
+ <ItemGroup>
+ <Compile Update="res\resx\LanguageResources.Designer.cs">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>LanguageResources.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Update="res\resx\LanguageResources.resx">
+ <Generator>PublicResXFileCodeGenerator</Generator>
+ <LastGenOutput>LanguageResources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+
</Project>
diff --git a/Settings/SettingWallpaper/SettingWidgetWallpaper.cs b/Settings/SettingWallpaper/SettingWidgetWallpaper.cs
index 7490d30..9e8b369 100644
--- a/Settings/SettingWallpaper/SettingWidgetWallpaper.cs
+++ b/Settings/SettingWallpaper/SettingWidgetWallpaper.cs
@@ -17,6 +17,7 @@
using Tizen.Applications;
using Tizen.NUI;
using Tizen.NUI.Components;
+using SettingWallpaper.Common;
namespace SettingWallpaper
{
@@ -46,8 +47,7 @@ namespace SettingWallpaper
private void OnWindowResized(object sender, Window.ResizedEventArgs e)
{
- Tizen.Log.Info(SettingWallpaper.Common.Resources.LogTag, " Window Resized");
- Tizen.Log.Info(SettingWallpaper.Common.Resources.LogTag, " Size: " + e.WindowSize.Width + " " + e.WindowSize.Height);
+ Tizen.Log.Info(Resources.LogTag, " Window Resized");
ViewManager.Instance.UpdateViews();
}
diff --git a/Settings/SettingWallpaper/ViewManager.cs b/Settings/SettingWallpaper/ViewManager.cs
index 1f40b1e..ad7a560 100644
--- a/Settings/SettingWallpaper/ViewManager.cs
+++ b/Settings/SettingWallpaper/ViewManager.cs
@@ -88,8 +88,6 @@ namespace SettingWallpaper
public void UpdateViews()
{
- contentPage.Size2D = new Size2D(window.WindowSize.Width, window.WindowSize.Height);
- appBar.TitleContent.WidthSpecification = window.Size.Width - 238.SpToPx();
wallpaperView.UpdateView();
}
@@ -122,15 +120,12 @@ namespace SettingWallpaper
CloseSettingWallpaper();
};
appBar.NavigationContent = navigationContent;
- RelativeLayout.SetLeftTarget(appBar.NavigationContent, appBar);
- RelativeLayout.SetLeftRelativeOffset(appBar.NavigationContent, 0.0f);
RelativeLayout.SetVerticalAlignment(appBar.NavigationContent, RelativeLayout.Alignment.Center);
appBarStyle.Dispose();
- TextLabel titleContent = new TextLabel("Wallpaper")
+ TextLabel titleContent = new TextLabel(res.resx.LanguageResources.Title)
{
StyleName = "PageLabel",
- WidthSpecification = window.Size.Width - 238.SpToPx(),
PixelSize = 24.SpToPx(),
FontFamily = "BreezeSans",
VerticalAlignment = VerticalAlignment.Center,
@@ -143,7 +138,7 @@ namespace SettingWallpaper
Button actionContent = new Button()
{
- Text = "Save",
+ Text = res.resx.LanguageResources.Save,
Size2D = new Size2D(110, 48).SpToPx(),
PointSize = 12.SpToPx(),
ThemeChangeSensitive = true,
@@ -154,10 +149,7 @@ namespace SettingWallpaper
CloseSettingWallpaper();
};
appBar.ActionContent = actionContent;
- RelativeLayout.SetRightTarget(appBar.ActionContent, appBar);
- RelativeLayout.SetRightRelativeOffset(appBar.ActionContent, 1.0f);
- RelativeLayout.SetLeftTarget(appBar.ActionContent, appBar.TitleContent);
- RelativeLayout.SetLeftRelativeOffset(appBar.ActionContent, 1.0f);
+ RelativeLayout.SetHorizontalAlignment(appBar.ActionContent, RelativeLayout.Alignment.End);
RelativeLayout.SetVerticalAlignment(appBar.ActionContent, RelativeLayout.Alignment.Center);
}
@@ -183,7 +175,6 @@ namespace SettingWallpaper
{
contentPage = new ContentPage()
{
- Size2D = new Size2D(window.WindowSize.Width, window.WindowSize.Height),
AppBar = appBar,
Content = wallpaperView,
BackgroundImage = wallpaperView.CurrentWallpaper,
diff --git a/Settings/SettingWallpaper/Views/WallpaperView.cs b/Settings/SettingWallpaper/Views/WallpaperView.cs
index 123c4ae..f127b25 100644
--- a/Settings/SettingWallpaper/Views/WallpaperView.cs
+++ b/Settings/SettingWallpaper/Views/WallpaperView.cs
@@ -127,7 +127,7 @@ namespace SettingWallpaper.Views
HeightSpecification = 32.SpToPx(),
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center,
- Text = "Tap to preview",
+ Text = res.resx.LanguageResources.Preview,
TextColor = Color.White,
PixelSize = 24.SpToPx(),
FontFamily = "BreezeSans",
diff --git a/Settings/SettingWallpaper/res/resx/LanguageResources.Designer.cs b/Settings/SettingWallpaper/res/resx/LanguageResources.Designer.cs
new file mode 100644
index 0000000..e7ab42d
--- /dev/null
+++ b/Settings/SettingWallpaper/res/resx/LanguageResources.Designer.cs
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace SettingWallpaper.res.resx {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class LanguageResources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal LanguageResources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SettingWallpaper.res.resx.LanguageResources", typeof(LanguageResources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Tap to preview.
+ /// </summary>
+ public static string Preview {
+ get {
+ return ResourceManager.GetString("Preview", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Save.
+ /// </summary>
+ public static string Save {
+ get {
+ return ResourceManager.GetString("Save", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Wallpaper.
+ /// </summary>
+ public static string Title {
+ get {
+ return ResourceManager.GetString("Title", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/Settings/SettingWallpaper/res/resx/LanguageResources.ko-KR.resx b/Settings/SettingWallpaper/res/resx/LanguageResources.ko-KR.resx
new file mode 100644
index 0000000..48d22a0
--- /dev/null
+++ b/Settings/SettingWallpaper/res/resx/LanguageResources.ko-KR.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Preview" xml:space="preserve">
+ <value>탭하여 미리보기</value>
+ </data>
+ <data name="Save" xml:space="preserve">
+ <value>저장</value>
+ </data>
+ <data name="Title" xml:space="preserve">
+ <value>월페이퍼</value>
+ </data>
+</root> \ No newline at end of file
diff --git a/Settings/SettingWallpaper/res/resx/LanguageResources.resx b/Settings/SettingWallpaper/res/resx/LanguageResources.resx
new file mode 100644
index 0000000..5bd71f2
--- /dev/null
+++ b/Settings/SettingWallpaper/res/resx/LanguageResources.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Preview" xml:space="preserve">
+ <value>Tap to preview</value>
+ </data>
+ <data name="Save" xml:space="preserve">
+ <value>Save</value>
+ </data>
+ <data name="Title" xml:space="preserve">
+ <value>Wallpaper</value>
+ </data>
+</root> \ No newline at end of file
diff --git a/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk b/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk
index 77366b9..fd4f103 100644
--- a/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk
+++ b/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk
Binary files differ