Redesign theme event callback

Remove unloaded callback, rename loaded callback to changed callback.
When current theme changed, the changed callback will be invoked.

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

diff --git a/src/api/theme_loader.cc b/src/api/theme_loader.cc
index e2c483750a89bbcd4f3c077203d6ad9666f0a109..f0d2c643a2e33881d9c62bcc65ae5f8a38244625 100644 (file)
--- a/src/api/theme_loader.cc
+++ b/src/api/theme_loader.cc
@@ -43,23 +43,17 @@ namespace {
 
 class ThemeEventHandler : public IThemeEvent {
  public:
-  explicit ThemeEventHandler(theme_loader_loaded_cb loaded_cb,
-      theme_loader_unloaded_cb unloaded_cb, void* user_data)
-    : loaded_cb_(loaded_cb), unloaded_cb_(unloaded_cb), userdata_(user_data) {}
+  explicit ThemeEventHandler(theme_loader_changed_cb changed_cb,
+      void* user_data) : changed_cb_(changed_cb), userdata_(user_data) {}
   virtual ~ThemeEventHandler() = default;
-  void OnThemeLoaded(const ThemeInfo* theme,
+  void OnThemeChanged(const ThemeInfo* theme,
       const tizen_base::Bundle& args) override {
     std::shared_ptr<ThemeInfo> shared_info(new ThemeInfo(*theme));
-    loaded_cb_(static_cast<theme_h>(&shared_info), userdata_);
-  }
-
-  void OnThemeUnloaded(const std::string& id) override {
-    unloaded_cb_(id.c_str(), userdata_);
+    changed_cb_(static_cast<theme_h>(&shared_info), userdata_);
   }
 
  private:
-  theme_loader_loaded_cb loaded_cb_;
-  theme_loader_unloaded_cb unloaded_cb_;
+  theme_loader_changed_cb changed_cb_;
   void* userdata_;
 };
 
@@ -164,16 +158,15 @@ extern "C" EXPORT_API int theme_loader_query_id(theme_loader_h handle,
 }
 
 extern "C" EXPORT_API int theme_loader_add_event(theme_loader_h handle,
-    theme_loader_loaded_cb loaded, theme_loader_unloaded_cb unloaded,
-    void* user_data, theme_loader_event_h* event_h) {
-  if (handle == nullptr || loaded == nullptr ||
-      unloaded == nullptr || event_h == nullptr) {
+    theme_loader_changed_cb changed, void* user_data,
+    theme_loader_event_h* event_h) {
+  if (handle == nullptr || changed == nullptr || event_h == nullptr) {
     LOG(ERROR) << "Invalid parameter";
     return THEME_MANAGER_ERROR_INVALID_PARAMETER;
   }
 
   std::shared_ptr<IThemeEvent> event_handler(new ThemeEventHandler(
-      loaded, unloaded, user_data));
+      changed, user_data));
   if (event_handler.get() == nullptr) {
     LOG(ERROR) << "Out of memory";
     return THEME_MANAGER_ERROR_OUT_OF_MEMORY;

diff --git a/src/api/theme_loader.h b/src/api/theme_loader.h
index dd9fdc1ab37c5346bf813f207b28d4ef0e8191e4..68f6007a77ed1037b7cfb8fc2be06bbf5a25fade 100644 (file)
--- a/src/api/theme_loader.h
+++ b/src/api/theme_loader.h
@@ -33,32 +33,19 @@ extern "C" {
  */
 
 /**
- * @brief Called to get the loaded theme information.
+ * @brief Called to get the changed theme information.
  * @since_tizen 6.0
  * @remarks The @a handle should not be released
  * @remarks @handle is valid only inside this function. If you want to keep it,
- *         please use theme_clone().
- * @param[in] handle    The loaded theme information.
+ *          please use theme_clone().
+ * @param[in] handle    The changed theme information.
  * @param[in] user_data The user data passed from add event function.
  * @return @c 0 on success,
  *         otherwise a negative value.
  * @pre theme_loader_add_event() will invoke this callback.
  * @see theme_loader_add_event()
  */
-typedef int (*theme_loader_loaded_cb) (theme_h handle, void *user_data);
-
-/**
- * @brief Called to get the unloaded theme ID.
- * @since_tizen 6.0
- * @remarks The @a id can be used only in the callback. To use outside, make a copy.
- * @param[in] id        The ID of unloaded theme.
- * @param[in] user_data The user data passed from add event function.
- * @return @c 0 on success,
- *         otherwise a negative value.
- * @pre theme_loader_add_event() will invoke this callback.
- * @see theme_loader_add_event()
- */
-typedef int (*theme_loader_unloaded_cb) (const char *id, void *user_data);
+typedef int (*theme_loader_changed_cb) (theme_h handle, void *user_data);
 
 /**
  * @brief The theme loader handle.
@@ -99,11 +86,10 @@ int theme_loader_create(theme_loader_h *handle);
 int theme_loader_destroy(theme_loader_h handle);
 
 /**
- * @brief Registers a callback function to be invoked when the theme is being loaded or unloaded.
+ * @brief Registers a callback function to be invoked when the theme is being changed.
  * @since_tizen 6.0
  * @param[in] handle    The theme loader handle
- * @param[in] loaded    The callback function to be registered for theme load event
- * @param[in] unloaded  The callback function to be registered for theme unload event
+ * @param[in] changed   The callback function to be registered for theme changed event
  * @param[in] user_data The user data to be passed to the callback function
  * @param[out] event_h  The theme event handle
  * @return @c 0 on success,
@@ -114,8 +100,8 @@ int theme_loader_destroy(theme_loader_h handle);
  * @see theme_loader_remove_event()
 */
 int theme_loader_add_event(theme_loader_h handle,
-    theme_loader_loaded_cb loaded, theme_loader_unloaded_cb unloaded,
-    void *user_data, theme_loader_event_h* event_h);
+    theme_loader_changed_cb changed, void *user_data,
+    theme_loader_event_h* event_h);
 
 /**
  * @brief Unregisters a callback function.

diff --git a/src/theme/dbus/command.h b/src/theme/dbus/command.h
index 3e79b70092b2500c82709a42ea7227a8cd33377b..81926697c13f76e24546a91ee191d5e76e68ebfb 100644 (file)
--- a/src/theme/dbus/command.h
+++ b/src/theme/dbus/command.h
@@ -29,7 +29,6 @@ enum class Command : int {
   UPDATE,
   REMOVE,
   CHANGED,
-  REMOVED
 };
 
 extern const char kCmdDataKey[];

diff --git a/src/theme/loader/theme_event.h b/src/theme/loader/theme_event.h
index f1f37ce0a548dd8e5a7b0cc9f329a0682ac4c067..c0dbbb322f53a24e4a13e1d2262918c992e2a9a1 100644 (file)
--- a/src/theme/loader/theme_event.h
+++ b/src/theme/loader/theme_event.h
@@ -28,9 +28,8 @@ namespace loader {
 class IThemeEvent {
  public:
   virtual ~IThemeEvent() = default;
-  virtual void OnThemeLoaded(const ThemeInfo* info,
+  virtual void OnThemeChanged(const ThemeInfo* info,
       const tizen_base::Bundle& args) = 0;
-  virtual void OnThemeUnloaded(const std::string& id) = 0;
 };
 
 }  // namespace loader

diff --git a/src/theme/loader/theme_info_loader.cc b/src/theme/loader/theme_info_loader.cc
index 502318ea65314838c7d7d83fb5489bf3efa22a82..dc1bc3b86567eb9a732135525788a1b81d436b3b 100644 (file)
--- a/src/theme/loader/theme_info_loader.cc
+++ b/src/theme/loader/theme_info_loader.cc
@@ -34,19 +34,11 @@ tizen_base::Bundle ThemeInfoLoader::OnRequest(dbus::Command cmd,
       const ThemeInfo* info = new ThemeInfo(b);
       for (auto& listener : listeners_) {
         std::shared_ptr<IThemeEvent> ev = listener.second;
-        ev->OnThemeLoaded(info, args);
+        ev->OnThemeChanged(info, args);
       }
       delete info;
       break;
     }
-    case dbus::Command::REMOVED: {
-      std::string id = args.GetString(dbus::kCmdDataKey);
-      for (auto& listener : listeners_) {
-        std::shared_ptr<IThemeEvent> ev = listener.second;
-        ev->OnThemeUnloaded(id);
-      }
-      break;
-    }
     default: {
       LOG(ERROR) << "Invalid command type";
       break;
@@ -66,13 +58,6 @@ std::string ThemeInfoLoader::AddEvent(std::shared_ptr<IThemeEvent> ev) {
       dbus::RequestBroker::GetInst().RegisterRequestFilter(*changed_filter_);
   }
 
-  if (removed_filter_ == nullptr) {
-    removed_filter_ =
-        std::make_unique<dbus::RequestFilter>(dbus::Command::REMOVED,
-            shared_from_this(), false);
-    dbus::RequestBroker::GetInst().RegisterRequestFilter(*removed_filter_);
-  }
-
   std::size_t hash = std::hash<std::shared_ptr<IThemeEvent>>{}(ev);
   std::string key(std::to_string(hash));
   listeners_.insert(std::make_pair(key, std::move(ev)));

diff --git a/src/theme/loader/theme_info_loader.h b/src/theme/loader/theme_info_loader.h
index 6049cc4fb3e940af32ce0b5db516556eea2ee32f..92a3d023cb38248008e58977fae97444496dbe1c 100644 (file)
--- a/src/theme/loader/theme_info_loader.h
+++ b/src/theme/loader/theme_info_loader.h
@@ -49,7 +49,6 @@ class ThemeInfoLoader : public dbus::IRequestHandler,
 
   std::shared_ptr<ThemeInfo> cache_;
   std::unique_ptr<dbus::RequestFilter> changed_filter_;
-  std::unique_ptr<dbus::RequestFilter> removed_filter_;
   std::map<std::string, std::shared_ptr<IThemeEvent>> listeners_;
 };
 

diff --git a/test/unit_tests/test_request_broker.cc b/test/unit_tests/test_request_broker.cc
index 45e525f200f39c4c497e569856d3909f017b06b7..a7d4f07f0dbabdbe540aa0db8e16d61d9eab6833 100644 (file)
--- a/test/unit_tests/test_request_broker.cc
+++ b/test/unit_tests/test_request_broker.cc
@@ -53,7 +53,7 @@ static guint __g_dbus_connection_signal_subscribe_fake(
     gpointer user_data, GDestroyNotify noti) {
   tizen_base::Bundle b;
   GVariant* param = g_variant_new("(is)",
-      static_cast<int>(ttm::dbus::Command::REMOVED),
+      static_cast<int>(ttm::dbus::Command::CHANGED),
       reinterpret_cast<char*>(b.ToRaw().first.get()));
   callback(nullptr, nullptr, nullptr, nullptr, nullptr, param, user_data);
   return 1;

diff --git a/test/unit_tests/test_theme_info_loader.cc b/test/unit_tests/test_theme_info_loader.cc
index 5c8d5e18c4e22fb3df3117ff7b79059f1d543315..ed49a0284705d92178b0e53d64094cfd66b6e156 100644 (file)
--- a/test/unit_tests/test_theme_info_loader.cc
+++ b/test/unit_tests/test_theme_info_loader.cc
@@ -36,12 +36,9 @@ using ::testing::StrEq;
 
 class ThemeEvent : public IThemeEvent {
  public:
-  void OnThemeLoaded(const ThemeInfo* theme,
+  void OnThemeChanged(const ThemeInfo* theme,
       const tizen_base::Bundle& args) override {
   }
-
-  void OnThemeUnloaded(const std::string& id) override {
-  }
 };
 
 class Mocks : public ::testing::NiceMock<GioMock> {};