Fixed theme file path and spec file for XSF (#209)

* Fixed theme file path and spec file for XSF

diff --git a/packaging/xsf.spec b/packaging/xsf.spec
index c15c4e7..4b5c01c 100644 (file)
--- a/packaging/xsf.spec
+++ b/packaging/xsf.spec
@@ -14,6 +14,7 @@ ExcludeArch: aarch64
 %define DOTNET_PRELOAD_PATH /usr/share/dotnet.tizen/preload
 %define DOTNET_NUGET_SOURCE /nuget
 %define SKIA_LIBRARY_PATH /usr/lib
+%define THEME_FILE_PATH /usr/share/elm-sharp
 %define LIB_HARFBUZZ_NAME libHarfBuzzSharp.2.6.1.so
 %define LIB_SKIASHARP_NAME libSkiaSharp.1.68.2.so
 
@@ -42,6 +43,9 @@ mkdir -p %{buildroot}%{DOTNET_PRELOAD_PATH}
 mv ./src/XSF/bin/Release/netstandard2.0/XSF.dll %{buildroot}%{DOTNET_ASSEMBLY_PATH}
 mv ./packaging/XSF.preload %{buildroot}%{DOTNET_PRELOAD_PATH}
 
+mkdir -p %{buildroot}%{THEME_FILE_PATH}
+mv ./src/XSF/theme/tizen-circular-ui-theme.edj %{buildroot}%{THEME_FILE_PATH}
+
 mkdir -p %{buildroot}%{SKIA_LIBRARY_PATH}
 %ifarch %{ix86}
 mv ./src/XSF/lib/x86/%{LIB_HARFBUZZ_NAME} %{buildroot}%{SKIA_LIBRARY_PATH}
@@ -56,4 +60,5 @@ mv ./src/XSF/lib/armel/%{LIB_SKIASHARP_NAME} %{buildroot}%{SKIA_LIBRARY_PATH}
 %license LICENSE LICENSE.Flora-1.1 LICENSE.Apache-2.0
 %attr(644,root,root) %{DOTNET_ASSEMBLY_PATH}/*.dll
 %attr(644,root,root) %{DOTNET_PRELOAD_PATH}/XSF.preload
-%attr(644,root,root) %{SKIA_LIBRARY_PATH}/*.so
\ No newline at end of file
+%attr(644,root,root) %{SKIA_LIBRARY_PATH}/*.so
+%attr(644,root,root) %{THEME_FILE_PATH}/*.edj

diff --git a/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/ThemeLoader.cs b/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/ThemeLoader.cs
index 31f847e..e7bbc2f 100644 (file)
--- a/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/ThemeLoader.cs
+++ b/src/XSF/Tizen.Wearable.CircularUI.Forms.Renderer/ThemeLoader.cs
@@ -20,7 +20,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
 {
     internal static class ThemeLoader
     {
-        const string CircularUITheme = "tizen-circular-ui-theme.edj";
+        const string CircularUITheme = "/usr/share/elm-sharp/tizen-circular-ui-theme.edj";
 
         public static string AppResourcePath { get; private set; }
 
@@ -43,7 +43,7 @@ namespace Tizen.Wearable.CircularUI.Forms.Renderer
                 Log.Error(FormsCircularUI.Tag, $"ThemeLoader is not initialized properly");
                 return;
             }
-            Elementary.AddThemeOverlay(Path.Combine(AppResourcePath, themeFilePath));
+            Elementary.AddThemeOverlay(themeFilePath);
         }
     }
 }