Corrected Images resource path, spec file

Change-Id: I9c9860d865005a9fb9c9c473852eb71b4489a86f

diff --git a/SettingWallpaper/SettingWallpaper/Common/Resources.cs b/SettingWallpaper/SettingWallpaper/Common/Resources.cs
index 6092469f8e43ef83e33b38daf9b75be3707682d3..0634b19ceb01b7b81798eb17370b30f12b0ab648 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Common/Resources.cs
+++ b/SettingWallpaper/SettingWallpaper/Common/Resources.cs
@@ -48,18 +48,17 @@ namespace SettingWallpaper.Common
         }
         public static string GetImagePath()
         {
-            Tizen.Log.Info(Resources.LogTag, "GetImagePath: " + mResourcePath + "/images/");
             return mResourcePath + "/images/";
         }
 
         public static string GetLightImagePath()
         {
-            return mResourcePath + "/light/";
+            return GetImagePath() + "/light/";
         }
 
         public static string GetDarkImagePath()
         {
-            return mResourcePath + "/dark/";
+            return GetImagePath() + "/dark/";
         }
 
         public static string GetCurrentThemePath()

diff --git a/SettingWallpaper/SettingWallpaper/Views/ViewManager.cs b/SettingWallpaper/SettingWallpaper/Views/ViewManager.cs
index a4bf2fcf84eab541c823436ac8293e7f66ca8c17..6d7a62c547dd16d0c1e6c21d3c98d60fcfa17ad7 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/Views/ViewManager.cs
+++ b/SettingWallpaper/SettingWallpaper/Views/ViewManager.cs
@@ -55,7 +55,7 @@ namespace SettingWallpaper
         {
             Tizen.Log.Info(Resources.LogTag, "Initializing ViewManager");
 
-           // UpdateTheme(ThemeManager.PlatformThemeId);
+            UpdateTheme(ThemeManager.PlatformThemeId);
             //CreateAppBar();
             wallpaperView = new WallpaperView();
             wallpaperView.TouchEvent += (object source, View.TouchEventArgs e) =>

diff --git a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/wallpaper-icon.svg b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/wallpaper-icon.svg
index 8b7ca02cd403b09cddb7b2a70eb1b4a5851d96c8..c30f3d8e0eece1c1da3d327dc9e469eeff787a22 100644 (file)
--- a/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/wallpaper-icon.svg
+++ b/SettingWallpaper/SettingWallpaper/res/allowed/SettingWallpaper/wallpaper-icon.svg
@@ -1,4 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M28 0H4C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H28C30.2091 32 32 30.2091 32 28V4C32 1.79086 30.2091 0 28 0Z" fill="#0075FF"/>
-<path d="M22.536 10.6779H22.028V10.5629C22.0272 10.1495 21.8626 9.75329 21.5702 9.46106C21.2777 9.16883 20.8814 9.00443 20.468 9.00391H9.56C9.1466 9.00443 8.75027 9.16883 8.45786 9.46106C8.16544 9.75329 8.00079 10.1495 8 10.5629V11.9499C8.00079 12.3633 8.16544 12.7595 8.45786 13.0518C8.75027 13.344 9.1466 13.5084 9.56 13.5089H20.468C20.8814 13.5084 21.2777 13.344 21.5702 13.0518C21.8626 12.7595 22.0272 12.3633 22.028 11.9499V11.8339H22.536C22.6238 11.8401 22.7055 11.8806 22.7635 11.9467C22.8216 12.0128 22.8512 12.0991 22.846 12.1869V13.6999C22.8481 13.7731 22.8274 13.8452 22.7867 13.9061C22.7461 13.967 22.6875 14.0138 22.619 14.0399L16.253 16.0809C15.9515 16.1809 15.6894 16.374 15.5047 16.6324C15.32 16.8908 15.222 17.2012 15.225 17.5189V18.1279C15.1701 18.1381 15.1204 18.1668 15.084 18.2092C15.0476 18.2516 15.0268 18.3051 15.025 18.3609V18.5539C14.9298 18.6061 14.8503 18.6828 14.7946 18.7759C14.7389 18.8691 14.709 18.9754 14.708 19.0839V21.9069C14.7285 22.1838 14.853 22.4428 15.0565 22.6317C15.2599 22.8207 15.5273 22.9257 15.805 22.9257C16.0827 22.9257 16.3501 22.8207 16.5536 22.6317C16.757 22.4428 16.8815 22.1838 16.902 21.9069V19.0989C16.9016 18.977 16.8662 18.8577 16.7999 18.7554C16.7335 18.6531 16.6392 18.572 16.528 18.5219V18.3629C16.526 18.3177 16.5111 18.2739 16.4851 18.2369C16.459 18.1999 16.4229 18.1711 16.381 18.1539V17.5209C16.3787 17.4478 16.3992 17.3757 16.4397 17.3148C16.4802 17.2539 16.5387 17.2071 16.607 17.1809L22.973 15.1409C23.2749 15.0411 23.5373 14.8479 23.7222 14.5892C23.9072 14.3306 24.0052 14.0199 24.002 13.7019V12.1889C24.0051 11.9934 23.9695 11.7992 23.8975 11.6175C23.8254 11.4357 23.7183 11.2699 23.5822 11.1296C23.446 10.9893 23.2835 10.8772 23.104 10.7997C22.9245 10.7221 22.7315 10.6808 22.536 10.6779ZM20.874 11.9479C20.8738 12.0555 20.8309 12.1586 20.7548 12.2347C20.6787 12.3108 20.5756 12.3536 20.468 12.3539H9.56C9.4524 12.3536 9.34931 12.3108 9.27322 12.2347C9.19714 12.1586 9.15429 12.0555 9.15402 11.9479V10.5629C9.15455 10.4554 9.19747 10.3524 9.2735 10.2764C9.34952 10.2004 9.45248 10.1574 9.56 10.1569H20.468C20.5755 10.1574 20.6785 10.2004 20.7545 10.2764C20.8305 10.3524 20.8735 10.4554 20.874 10.5629V11.9479Z" fill="#FAFAFA"/>
+<path d="M22.536 10.6779H22.028V10.5629C22.0272 10.1495 21.8626 9.75329 21.5702 9.46106C21.2777 9.16883 20.8814 9.00443 20.468 9.00391H9.56C9.1466 9.00443 8.75027 9.16883 8.45786 9.46106C8.16544 9.75329 8.00079 10.1495 8 10.5629V11.9499C8.00079 12.3633 8.16544 12.7595 8.45786 13.0518C8.75027 13.344 9.1466 13.5084 9.56 13.5089H20.468C20.8814 13.5084 21.2777 13.344 21.5702 13.0518C21.8626 12.7595 22.0272 12.3633 22.028 11.9499V11.8339H22.536C22.6238 11.8401 22.7055 11.8806 22.7635 11.9467C22.8216 12.0128 22.8512 12.0991 22.846 12.1869V13.6999C22.8481 13.7731 22.8274 13.8452 22.7867 13.9061C22.7461 13.967 22.6875 14.0138 22.619 14.0399L16.253 16.0809C15.9515 16.1809 15.6894 16.374 15.5047 16.6324C15.32 16.8908 15.222 17.2012 15.225 17.5189V18.1279C15.1701 18.1381 15.1204 18.1668 15.084 18.2092C15.0476 18.2516 15.0268 18.3051 15.025 18.3609V18.5539C14.9298 18.6061 14.8503 18.6828 14.7946 18.7759C14.7389 18.8691 14.709 18.9754 14.708 19.0839V21.9069C14.7285 22.1838 14.853 22.4428 15.0565 22.6317C15.2599 22.8207 15.5273 22.9257 15.805 22.9257C16.0827 22.9257 16.3501 22.8207 16.5536 22.6317C16.757 22.4428 16.8815 22.1838 16.902 21.9069V19.0989C16.9016 18.977 16.8662 18.8577 16.7999 18.7554C16.7335 18.6531 16.6392 18.572 16.528 18.5219V18.3629C16.526 18.3177 16.5111 18.2739 16.4851 18.2369C16.459 18.1999 16.4229 18.1711 16.381 18.1539V17.5209C16.3787 17.4478 16.3992 17.3757 16.4397 17.3148C16.4802 17.2539 16.5387 17.2071 16.607 17.1809L22.973 15.1409C23.2749 15.0411 23.5373 14.8479 23.7222 14.5892C23.9072 14.3306 24.0052 14.0199 24.002 13.7019V12.1889C24.0051 11.9934 23.9695 11.7992 23.8975 11.6175C23.8254 11.4357 23.7183 11.2699 23.5822 11.1296C23.446 10.9893 23.2835 10.8772 23.104 10.7997C22.9245 10.7221 22.7315 10.6808 22.536 10.6779ZM20.874 11.9479C20.8738 12.0555 20.8309 12.1586 20.7548 12.2347C20.6787 12.3108 20.5756 12.3536 20.468 12.3539H9.56C9.4524 12.3536 9.34931 12.3108 9.27322 12.2347C9.19714 12.1586 9.15429 12.0555 9.15402 11.9479V10.5629C9.15455 10.4554 9.19747 10.3524 9.2735 10.2764C9.34952 10.2004 9.45248 10.1574 9.56 10.1569H20.468C20.5755 10.1574 20.6785 10.2004 20.7545 10.2764C20.8305 10.3524 20.8735 10.4554 20.874 10.5629V11.9479Z" fill="#16131A"/>
 </svg>

diff --git a/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk b/packaging/org.tizen.cssetting-wallpaper-1.0.0.rpk
index b084ee36101b3724b92f808f8f5f86259effdcbb..e9dd6d13548717af9e1d5fe4a37e6a2be82c9462 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

diff --git a/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk b/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk
deleted file mode 100644 (file)
index fd1a26c..0000000
Binary files a/packaging/org.tizen.cssetting-wallpaper-1.0.0.tpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-wallpaper.spec b/packaging/org.tizen.cssetting-wallpaper.spec
index 0d615516d3e5e51ae5ec42df795332ec49c92cca..ae8d68b796ff3efbd49dab0aa681b1a829e42a53 100644 (file)
--- a/packaging/org.tizen.cssetting-wallpaper.spec
+++ b/packaging/org.tizen.cssetting-wallpaper.spec
@@ -1,8 +1,8 @@
-Name:          org.tizen.setting-wallpaper
+Name:          org.tizen.cssetting-wallpaper
 summary:       NUI wallpaper setting application
 Version:       1.0.0
 Release:       1
-Provides:      org.tizen.setting-wallpaper = %{version}-%{release}
+Provides:      org.tizen.cssetting-wallpaper = %{version}-%{release}
 Group:         Applications/Security
 License:       Apache-2.0
 Source0:    %{name}-%{version}.tar.gz