Fix default theme

Add themes(org.tizen.default-light-theme, org.tizen.default-dark-theme) for
preloaded package. The light theme will be a default theme.

Change-Id: Ic2558781ff9058d61235ea1371ebe36ca72192d5
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/default_theme/CMakeLists.txt b/default_theme/CMakeLists.txt
index 71d08e3..ef88a7f 100644 (file)
--- a/default_theme/CMakeLists.txt
+++ b/default_theme/CMakeLists.txt
@@ -1,7 +1,15 @@
 SET(MANIFESTDIR "${PREFIX}/share/packages")
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-manifest.xml DESTINATION ${MANIFESTDIR} RENAME ${DEFAULT_THEME_PKGID}.xml)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-manifest.xml DESTINATION ${PREFIX}/apps/${DEFAULT_THEME_PKGID})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin DESTINATION ${PREFIX}/apps/${DEFAULT_THEME_PKGID})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${PREFIX}/apps/${DEFAULT_THEME_PKGID})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/res DESTINATION ${PREFIX}/apps/${DEFAULT_THEME_PKGID})
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/dark/tizen-manifest.xml.in ${CMAKE_CURRENT_SOURCE_DIR}/dark/tizen-manifest.xml @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dark/tizen-manifest.xml DESTINATION ${MANIFESTDIR} RENAME ${DEFAULT_DARK_THEME_PKGID}.xml)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dark/tizen-manifest.xml DESTINATION ${PREFIX}/apps/${DEFAULT_DARK_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dark/bin DESTINATION ${PREFIX}/apps/${DEFAULT_DARK_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dark/res DESTINATION ${PREFIX}/apps/${DEFAULT_DARK_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dark/shared/res DESTINATION ${PREFIX}/apps/${DEFAULT_DARK_THEME_PKGID})
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/light/tizen-manifest.xml.in ${CMAKE_CURRENT_SOURCE_DIR}/light/tizen-manifest.xml @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/light/tizen-manifest.xml DESTINATION ${MANIFESTDIR} RENAME ${DEFAULT_LIGHT_THEME_PKGID}.xml)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/light/tizen-manifest.xml DESTINATION ${PREFIX}/apps/${DEFAULT_LIGHT_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/light/bin DESTINATION ${PREFIX}/apps/${DEFAULT_LIGHT_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/light/res DESTINATION ${PREFIX}/apps/${DEFAULT_LIGHT_THEME_PKGID})
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/light/shared/res DESTINATION ${PREFIX}/apps/${DEFAULT_LIGHT_THEME_PKGID})

diff --git a/default_theme/bin/dummy b/default_theme/dark/bin/dummy
similarity index 100%
rename from default_theme/bin/dummy
rename to default_theme/dark/bin/dummy

diff --git a/default_theme/res/theme.json b/default_theme/dark/res/theme.json
similarity index 100%
rename from default_theme/res/theme.json
rename to default_theme/dark/res/theme.json

diff --git a/default_theme/shared/res/icon/icon.png b/default_theme/dark/shared/res/icon/icon.png
similarity index 100%
rename from default_theme/shared/res/icon/icon.png
rename to default_theme/dark/shared/res/icon/icon.png

diff --git a/default_theme/dark/tizen-manifest.xml.in b/default_theme/dark/tizen-manifest.xml.in
new file mode 100644 (file)
index 0000000..5b414f6
--- /dev/null
+++ b/default_theme/dark/tizen-manifest.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="6.0" package="@DEFAULT_DARK_THEME_PKGID@" version="1.0.0">
+    <profile name="mobile"/>
+    <ui-application appid="@DEFAULT_DARK_THEME_PKGID@" exec="dummy" multiple="false" nodisplay="true" taskmanage="false" type="capp">
+        <label>DefaultDarkTheme</label>
+        <metadata key="http://tizen.org/metadata/theme/auto_file_key"/>
+        <metadata key="http://tizen.org/metadata/theme" value="theme.json"/>
+    </ui-application>
+</manifest>

diff --git a/default_theme/light/bin/dummy b/default_theme/light/bin/dummy
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/default_theme/light/res/theme.json b/default_theme/light/res/theme.json
new file mode 100644 (file)
index 0000000..1397150
--- /dev/null
+++ b/default_theme/light/res/theme.json
@@ -0,0 +1,28 @@
+{
+    "version": "1.0.0",
+    "tool_version": "1.00.38.820793",
+    "header": {
+        "title": "Test theme",
+        "description": "Theme package for testing",
+        "profile" : "mobile",
+        "resolution": [
+            "720x1280"
+        ]
+    },
+    "preview": ["test_preview.png"],
+    "theme": {
+        "home": {
+            "wallpaper":"home_wallpaper.png",
+            "appicon": {
+                "org.tizen.browser":"test_theme_browser.png",
+                "org.tizen.calculator":"test_theme_calculator.png",
+                "org.tizen.calendar":"test_theme_calendar.png",
+                "org.tizen.clock":"test_theme_clock.png",
+                "org.tizen.contact":"test_theme_contact.png"
+            }
+        },
+        "keyboard": {
+            "keypad_bg_color":"#D88AE8"
+        }
+    }
+}
\ No newline at end of file

diff --git a/default_theme/light/shared/res/icon/icon.png b/default_theme/light/shared/res/icon/icon.png
new file mode 100644 (file)
index 0000000..9765b1b
Binary files /dev/null and b/default_theme/light/shared/res/icon/icon.png differ

diff --git a/default_theme/tizen-manifest.xml b/default_theme/light/tizen-manifest.xml.in
similarity index 66%
rename from default_theme/tizen-manifest.xml
rename to default_theme/light/tizen-manifest.xml.in
index 28f45f7..a01c4a2 100644 (file)
--- a/default_theme/tizen-manifest.xml
+++ b/default_theme/light/tizen-manifest.xml.in
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="6.0" package="org.tizen.defaulttheme" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="6.0" package="@DEFAULT_LIGHT_THEME_PKGID@" version="1.0.0">
     <profile name="mobile"/>
-    <ui-application appid="org.tizen.defaulttheme" exec="dummy" multiple="false" nodisplay="true" taskmanage="false" type="capp">
-        <label>DefaultTheme</label>
+    <ui-application appid="@DEFAULT_LIGHT_THEME_PKGID@" exec="dummy" multiple="false" nodisplay="true" taskmanage="false" type="capp">
+        <label>DefaultLightTheme</label>
         <metadata key="http://tizen.org/metadata/theme/default"/>
         <metadata key="http://tizen.org/metadata/theme/auto_file_key"/>
         <metadata key="http://tizen.org/metadata/theme/auto_set"/>

diff --git a/packaging/tizen-theme-manager.spec b/packaging/tizen-theme-manager.spec
index 5609f0b..9ff4912 100644 (file)
--- a/packaging/tizen-theme-manager.spec
+++ b/packaging/tizen-theme-manager.spec
@@ -46,13 +46,21 @@ Requires: %{name} = %{version}
 The Tizen Theme Manager API provides functions to load theme info or
 set current theme.
 
-%define default_theme_pkgid org.tizen.default-theme
-%package -n %{default_theme_pkgid}
-Summary:  Sample default theme
+%define default_dark_theme_pkgid org.tizen.default-dark-theme
+%package -n %{default_dark_theme_pkgid}
+Summary:  Default dark theme
 Requires: %{name} = %{version}
 
-%description -n %{default_theme_pkgid}
-Sample default theme package
+%description -n %{default_dark_theme_pkgid}
+Default dark theme package
+
+%define default_light_theme_pkgid org.tizen.default-light-theme
+%package -n %{default_light_theme_pkgid}
+Summary:  Default light theme
+Requires: %{name} = %{version}
+
+%description -n %{default_light_theme_pkgid}
+Default light theme package
 
 %prep
 %setup -q
@@ -72,7 +80,8 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
          -DUNITDIR=%{_unitdir} \
          -DFULLVER=%{version} \
          -DMAJORVER=${MAJORVER} \
-         -DDEFAULT_THEME_PKGID=%{default_theme_pkgid}
+         -DDEFAULT_DARK_THEME_PKGID=%{default_dark_theme_pkgid} \
+         -DDEFAULT_LIGHT_THEME_PKGID=%{default_light_theme_pkgid}
 
 %__make %{?_smp_mflags}
 
@@ -167,14 +176,20 @@ Simple string key-val dictionary ADT gcov objects
 %endif
 
 #Signing
-%define tizen_sign_base %{_prefix}/apps/%{default_theme_pkgid}
+%define tizen_sign_base %{_prefix}/apps/%{default_dark_theme_pkgid};%{_prefix}/apps/%{default_light_theme_pkgid}
 %define tizen_sign 1
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 %define tizen_sign_level platform
 
-%files -n %{default_theme_pkgid}
+%files -n %{default_dark_theme_pkgid}
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_prefix}/apps/%{default_dark_theme_pkgid}/*
+%{_datadir}/packages/%{default_dark_theme_pkgid}.xml
+
+%files -n %{default_light_theme_pkgid}
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
-%{_prefix}/apps/%{default_theme_pkgid}/*
-%{_datadir}/packages/%{default_theme_pkgid}.xml
+%{_prefix}/apps/%{default_light_theme_pkgid}/*
+%{_datadir}/packages/%{default_light_theme_pkgid}.xml