Fix to show Accessibility Widget

- Accessibility Widget cannot be shown at all. Fixed to show the icon
for app loading.
- Updated Window size, too.

Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/Settings/SettingAccessibility/SettingAccessibility.csproj b/Settings/SettingAccessibility/SettingAccessibility.csproj
index 206d4917555c2c8be2252d141e194ac52e6a497f..6da42b4bf0d61743589c7330edce752dc1ce0272 100755 (executable)
--- a/Settings/SettingAccessibility/SettingAccessibility.csproj
+++ b/Settings/SettingAccessibility/SettingAccessibility.csproj
@@ -1,30 +1,31 @@
-<Project Sdk="Tizen.NET.Sdk/1.1.7">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>tizen10.0</TargetFramework>
-      <AssemblyName>SettingAccessibility</AssemblyName>
-      <disableimplicitframeworkreferences>True</disableimplicitframeworkreferences>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Folder Include="res\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="10.0.0.*" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <NeedInjection>True</NeedInjection>
-  </PropertyGroup>
-
-</Project>
-
+<Project Sdk="Tizen.NET.Sdk/1.1.8">\r
+\r
+  <PropertyGroup>\r
+    <OutputType>Exe</OutputType>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
+    <AssemblyName>SettingAccessibility</AssemblyName>\r
+    <DisableImplicitTizenReferences>True</DisableImplicitTizenReferences>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugType>portable</DebugType>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>None</DebugType>\r
+  </PropertyGroup>\r
+\r
+  <ItemGroup>\r
+    <EmbeddedResource Include="*.xaml" >\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </EmbeddedResource>\r
+  </ItemGroup>\r
+\r
+  <ItemGroup>\r
+    <PackageReference Include="Tizen.NET" Version="10.0.0.*" />\r
+  </ItemGroup>\r
+\r
+  <PropertyGroup>\r
+    <XamlOptimization>1</XamlOptimization>\r
+  </PropertyGroup>\r
+\r
+</Project>\r

diff --git a/Settings/SettingAccessibility/tizen-manifest.xml b/Settings/SettingAccessibility/tizen-manifest.xml
index 1e79b2f5c0857022acef53cc135b62a1d96f38dc..90764b947fcd7f417a8104b08827c5474dc42a0c 100755 (executable)
--- a/Settings/SettingAccessibility/tizen-manifest.xml
+++ b/Settings/SettingAccessibility/tizen-manifest.xml
@@ -1,20 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.cssetting-accessibility" version="1.0.0" api-version="7.0" xmlns="http://tizen.org/ns/packages">
-    <profile name="common" />
-    <widget-application appid="org.tizen.cssetting-accessibility" exec="SettingAccessibility.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-        <label>SettingAccessibility</label>
-        <icon>SettingAccessibility.png</icon>
-        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
-        <splash-screens />
-        <widget-class classid="accessibility" update-period="0">
-            <support-size preview="SettingAccessibility.png">4x4</support-size>
-        </widget-class>
-    </widget-application>
-    <privileges>
-        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-        <privilege>http://tizen.org/privilege/datasharing</privilege>
-        <privilege>http://tizen.org/privilege/imemanager</privilege>
-    </privileges>
-    <dependencies />
-    <provides-appdefined-privileges />
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>\r
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7.0" package="org.tizen.cssetting-accessibility" version="1.0.0">\r
+  <profile name="common" />\r
+  <widget-application appid="org.tizen.cssetting-accessibility" exec="SettingAccessibility.dll" type="dotnet" multiple="false" taskmanage="true" nodisplay="false" launch_mode="single">\r
+    <icon>SettingAccessibility.png</icon>\r
+    <label>SettingAccessibility</label>\r
+    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />\r
+    <widget-class classid="accessibility" update-period="0">\r
+      <support-size preview="SettingAccessibility.png">4x4</support-size>\r
+    </widget-class>\r
+  </widget-application>\r
+</manifest>\r

diff --git a/Settings/SettingView/SettingView.cs b/Settings/SettingView/SettingView.cs
index f0a225cce47914a585e6a07dd1add6e08c5bcc0f..c250731f9038593f0c2023582607b70d416e60e0 100755 (executable)
--- a/Settings/SettingView/SettingView.cs
+++ b/Settings/SettingView/SettingView.cs
@@ -45,8 +45,7 @@ namespace SettingView
         static void Main(string[] args)\r
         {\r
             var appCustomBorder = new SettingViewBorder();\r
-            // Need to fix the window size\r
-            var app = new Program("", new Size2D(500, 400), new Position2D(300, 100), appCustomBorder);\r
+            var app = new Program("", new Size2D(800, 400), new Position2D(300, 100), appCustomBorder);\r
             app.Run(args);\r
         }\r
     }\r

diff --git a/Settings/SettingView/SettingView.csproj b/Settings/SettingView/SettingView.csproj
index b31b50f653580be2f3c4d850c12a5513ce057b8a..a0f8584914dc9183f7b93a62890125d2e04f74ea 100755 (executable)
--- a/Settings/SettingView/SettingView.csproj
+++ b/Settings/SettingView/SettingView.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Tizen.NET.Sdk/1.1.7">\r
+<Project Sdk="Tizen.NET.Sdk/1.1.8">\r
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
     <TargetFramework>tizen10.0</TargetFramework>\r
-      <AssemblyName>SettingView</AssemblyName>\r
-      <disableimplicitframeworkreferences>True</disableimplicitframeworkreferences>\r
+    <AssemblyName>SettingView</AssemblyName>\r
+    <DisableImplicitTizenReferences>True</DisableImplicitTizenReferences>\r
   </PropertyGroup>\r
 \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
@@ -17,6 +17,9 @@
   <ItemGroup>\r
     <Folder Include="lib\"/>\r
     <Folder Include="res\"/>\r
+    <EmbeddedResource Include="*.xaml" >\r
+      <Generator>MSBuild:Compile</Generator>\r
+    </EmbeddedResource>\r
   </ItemGroup>\r
 \r
   <ItemGroup>\r
@@ -24,7 +27,7 @@
   </ItemGroup>\r
 \r
   <PropertyGroup>\r
-    <NeedInjection>True</NeedInjection>\r
+    <XamlOptimization>1</XamlOptimization>\r
   </PropertyGroup>\r
 \r
 </Project>\r

diff --git a/Settings/SettingView/SettingView.csproj.user b/Settings/SettingView/SettingView.csproj.user
deleted file mode 100755 (executable)
index 76428f1..0000000
--- a/Settings/SettingView/SettingView.csproj.user
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup />\r
-  <ItemGroup />\r
-</Project>
\ No newline at end of file

diff --git a/Settings/SettingView/res/images/tizen.png b/Settings/SettingView/res/images/tizen.png
new file mode 100755 (executable)
index 0000000..9765b1b
Binary files /dev/null and b/Settings/SettingView/res/images/tizen.png differ

diff --git a/Settings/SettingView/res/theme/theme.xaml b/Settings/SettingView/res/theme/theme.xaml
new file mode 100755 (executable)
index 0000000..b7e04b2
--- /dev/null
+++ b/Settings/SettingView/res/theme/theme.xaml
@@ -0,0 +1,9 @@
+<Theme\r
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"\r
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"\r
+  xmlns:c="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"\r
+  Id="sampleTheme" >\r
+\r
+  <!-- Put styles with x:Key here -->\r
+\r
+</Theme>
\ No newline at end of file

diff --git a/Settings/SettingView/tizen-manifest.xml b/Settings/SettingView/tizen-manifest.xml
index 40391269a5eda4a2081fc5253c1ca2c849a1eb15..5656c95f7394fdc37743f8ae6e1ef9117c3cc0d1 100755 (executable)
--- a/Settings/SettingView/tizen-manifest.xml
+++ b/Settings/SettingView/tizen-manifest.xml
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<manifest package="org.tizen.SettingView" version="1.0.0" api-version="7.0" xmlns="http://tizen.org/ns/packages">\r
-    <profile name="common" />\r
-    <ui-application appid="org.tizen.SettingView" exec="SettingView.dll" multiple="false" nodisplay="false" taskmanage="true" api-version="9" type="dotnet" launch_mode="single">\r
-        <label>SettingView</label>\r
-        <icon>SettingView.png</icon>\r
-        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />\r
-        <splash-screens />\r
-    </ui-application>\r
-    <shortcut-list />\r
-    <privileges>\r
-        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>\r
-        <privilege>http://tizen.org/privilege/datasharing</privilege>\r
-        <privilege>http://tizen.org/privilege/widget.viewer</privilege>\r
-    </privileges>\r
-    <dependencies />\r
-    <provides-appdefined-privileges />\r
+<?xml version="1.0" encoding="utf-8"?>\r
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7.0" package="org.tizen.example.SettingView" version="1.0.0">\r
+  <profile name="common" />\r
+  <ui-application appid="org.tizen.example.SettingView" exec="SettingView.dll" type="dotnet" multiple="false" taskmanage="true" api-version="9" nodisplay="false" launch_mode="single">\r
+    <icon>SettingView.png</icon>\r
+    <label>SettingView</label>\r
+    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />\r
+  </ui-application>\r
+  <privileges>\r
+    <privilege>http://tizen.org/privilege/appmanager.launch</privilege>\r
+    <privilege>http://tizen.org/privilege/datasharing</privilege>\r
+    <privilege>http://tizen.org/privilege/widget.viewer</privilege>\r
+  </privileges>\r
 </manifest>\r

diff --git a/Settings/Settings.sln b/Settings/Settings.sln
index ff0b7507a323770b2b2cb9bd583963bce1910589..32e7e508fa9c677154c782fd7d574e83ee63b80f 100755 (executable)
--- a/Settings/Settings.sln
+++ b/Settings/Settings.sln
@@ -1,11 +1,11 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio Version 16\r
-VisualStudioVersion = 16.0.31229.75\r
+VisualStudioVersion = 16.0.30804.86\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingView", "SettingView\SettingView.csproj", "{D3F7991B-DA48-4F2E-ACDF-28107935A2B0}"\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingView", "SettingView\SettingView.csproj", "{B1D6C84A-A1D2-41A9-B404-4D0D74DB86B7}"\r
 EndProject\r
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SettingAccessibility", "SettingAccessibility\SettingAccessibility.csproj", "{09329941-994B-4A42-8B26-C48ABF874894}"\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingAccessibility", "SettingAccessibility\SettingAccessibility.csproj", "{2887F58E-513C-452B-A1DB-73F88F08CC17}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -13,19 +13,19 @@ Global
                Release|Any CPU = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {D3F7991B-DA48-4F2E-ACDF-28107935A2B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {D3F7991B-DA48-4F2E-ACDF-28107935A2B0}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {D3F7991B-DA48-4F2E-ACDF-28107935A2B0}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {D3F7991B-DA48-4F2E-ACDF-28107935A2B0}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {09329941-994B-4A42-8B26-C48ABF874894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {09329941-994B-4A42-8B26-C48ABF874894}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {09329941-994B-4A42-8B26-C48ABF874894}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {09329941-994B-4A42-8B26-C48ABF874894}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {B1D6C84A-A1D2-41A9-B404-4D0D74DB86B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {B1D6C84A-A1D2-41A9-B404-4D0D74DB86B7}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {B1D6C84A-A1D2-41A9-B404-4D0D74DB86B7}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {B1D6C84A-A1D2-41A9-B404-4D0D74DB86B7}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {2887F58E-513C-452B-A1DB-73F88F08CC17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {2887F58E-513C-452B-A1DB-73F88F08CC17}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {2887F58E-513C-452B-A1DB-73F88F08CC17}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {2887F58E-513C-452B-A1DB-73F88F08CC17}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
-               SolutionGuid = {9520AE98-AE93-45F4-AE0B-5CAF9457F5C1}\r
+               SolutionGuid = {2A765334-A87C-413B-8BDB-7FD8F137B2EB}\r
        EndGlobalSection\r
 EndGlobal\r

diff --git a/packaging/org.tizen.cssetting-accessibility-1.0.0.tpk b/packaging/org.tizen.cssetting-accessibility-1.0.0.tpk
index 98de1fb90fd53c8c11c2d41f348bfabe39fcd34c..23b31c4389e63f3a6b52d076e51e730ac6d2f467 100755 (executable)
Binary files a/packaging/org.tizen.cssetting-accessibility-1.0.0.tpk and b/packaging/org.tizen.cssetting-accessibility-1.0.0.tpk differ