Code clean-up && Apply review's comment

Signed-off-by: MuHong Byun <[email protected]>

Author: bwikbs

shell/platform/tizen/BUILD.gn

@@ -69,13 +69,13 @@ _public_headers = [
 # builder, we have to add them manually.
 config("tizen_rootstrap_include_dirs") {
   local_prefix = "$custom_sysroot/usr"
-  include_dirs = []
+
   if (enable_desktop_embeddings) {
-    local_prefix = "$custom_sysroot/usr/local"
     defines = [ "__X64_SHELL__" ]
-    include_dirs += [ local_prefix + "/include/eldbus-1" ]
+    local_prefix += "/local"
   }
-  include_dirs += [
+
+  include_dirs = [
     local_prefix + "/include",
     local_prefix + "/include/appfw",
     local_prefix + "/include/base",
@@ -95,8 +95,10 @@ config("tizen_rootstrap_include_dirs") {
     local_prefix + "/include/feedback",
     local_prefix + "/include/system",
     local_prefix + "/include/wayland-extension",
+  ]
 
-    # For Evas_GL.
+  # Contain headers that the Evas_GL renderer depends on.
+  include_dirs += [
     local_prefix + "/include/ecore-con-1",
     local_prefix + "/include/ecore-file-1",
     local_prefix + "/include/edje-1",
@@ -108,6 +110,11 @@ config("tizen_rootstrap_include_dirs") {
     local_prefix + "/include/ethumb-client-1",
     local_prefix + "/include/evas-1",
   ]
+
+  if (enable_desktop_embeddings) {
+    include_dirs += [ local_prefix + "/include/eldbus-1" ]
+  }
+
   lib_dirs = [ local_prefix + "/lib" ]
 }
 
@@ -127,7 +134,9 @@ template("embedder_for_profile") {
     public = _public_headers
 
     sources = _flutter_tizen_source
+
     libs = _libs_minimum
+
     if (!enable_desktop_embeddings) {
       libs += [
         "base-utils-i18n",
@@ -146,17 +155,7 @@ template("embedder_for_profile") {
 
     defines = invoker.defines
 
-    if (use_evas_gl_renderer) {
-      sources += [ "tizen_renderer_evas_gl.cc" ]
-
-      libs += [
-        "ecore_evas",
-        "elementary",
-        "evas",
-      ]
-
-      defines += [ "TIZEN_RENDERER_EVAS_GL" ]
-    } else if (enable_desktop_embeddings) {
+    if (use_evas_gl_renderer || enable_desktop_embeddings) {
       sources += [ "tizen_renderer_evas_gl.cc" ]
 
       libs += [
@@ -171,6 +170,7 @@ template("embedder_for_profile") {
         "tizen_renderer_ecore_wl2.cc",
         "tizen_vsync_waiter.cc",
       ]
+
       if (!enable_desktop_embeddings) {
         libs += [ "ecore_wl2" ]
       }
@@ -197,6 +197,7 @@ template("embedder_for_profile") {
       "//flutter/shell/platform/common/client_wrapper:client_wrapper",
       "//third_party/rapidjson",
     ]
+
     if (enable_desktop_embeddings) {
       deps +=
           [ "//flutter/shell/platform/embedder:embedder_as_internal_library" ]
@@ -228,21 +229,27 @@ test_fixtures("flutter_tizen_fixtures") {
 
 executable("flutter_tizen_unittests") {
   testonly = true
+
   public = _public_headers
+
   sources = _flutter_tizen_source
+
   sources += [
     "flutter_tizen_engine_test.cc",
     "testing/mock_engine.cc",
     "tizen_renderer_evas_gl.cc",
   ]
+
   libs = _libs_minimum
+
   libs += [
     "ecore_evas",
     "elementary",
     "evas",
   ]
 
   defines = [ "TIZEN_RENDERER_EVAS_GL" ]
+
   cflags_cc = [
     "-Wno-newline-eof",
     "-Wno-macro-redefined",
@@ -254,7 +261,9 @@ executable("flutter_tizen_unittests") {
     ":tizen_rootstrap_include_dirs",
     "//flutter/shell/platform/common:desktop_library_implementation",
   ]
+
   public_deps = [ "//third_party/googletest:gtest" ]
+
   deps = [
     ":flutter_tizen_fixtures",
     "//flutter/runtime:libdart",
@@ -271,28 +280,37 @@ executable("flutter_tizen_unittests") {
 
 executable("flutter_tizen_shell") {
   public = _public_headers
+
   sources = _flutter_tizen_source
+
   sources += [ "tizen_renderer_evas_gl.cc" ]
+
   sources += [ "flutter_tizen_shell.cc" ]
+
   libs = _libs_minimum
+
   libs += [
     "ecore_evas",
     "elementary",
     "evas",
   ]
 
   defines = [ "TIZEN_RENDERER_EVAS_GL" ]
+
   cflags_cc = [
     "-Wno-newline-eof",
     "-Wno-macro-redefined",
   ]
 
   public_configs = [ "//flutter:config" ]
+
   configs += [
     ":tizen_rootstrap_include_dirs",
     "//flutter/shell/platform/common:desktop_library_implementation",
   ]
+
   public_deps = [ ":flutter_engine" ]
+
   deps = [
     "//flutter/runtime:libdart",
     "//flutter/shell/platform/common:common_cpp",

shell/platform/tizen/channels/localization_channel.cc

@@ -4,8 +4,57 @@
 
 #include "localization_channel.h"
 #ifndef __X64_SHELL__
-
 #include <utils_i18n.h>
+#else
+typedef enum {
+  I18N_ERROR_NONE, /**< No error, no warning */
+  I18N_ERROR_NOT_SUPPORTED,
+} i18n_error_code_e;
+
+int i18n_ulocale_set_default(const char* locale_id) {
+  return I18N_ERROR_NONE;
+}
+
+int i18n_ulocale_get_default(const char** locale) {
+  *locale = "en_US.UTF-8";
+  return I18N_ERROR_NONE;
+}
+
+int i18n_ulocale_get_language(const char* locale_id,
+                              char* language,
+                              int32_t language_capacity,
+                              int32_t* buf_size_language) {
+  return I18N_ERROR_NOT_SUPPORTED;
+}
+
+const char* i18n_ulocale_get_available(int32_t n) {
+  return "en_US.UTF-8";
+}
+
+int32_t i18n_ulocale_get_country(const char* locale_id,
+                                 char* country,
+                                 int32_t country_capacity,
+                                 int* error) {
+  return 0;
+}
+
+int32_t i18n_ulocale_count_available(void) {
+  return 0;
+}
+
+int32_t i18n_ulocale_get_script(const char* locale_id,
+                                char* script,
+                                int32_t script_capacity) {
+  return 0;
+}
+
+int32_t i18n_ulocale_get_variant(const char* locale_id,
+                                 char* variant,
+                                 int32_t variant_capacity) {
+  return 0;
+}
+
+#endif
 #include <vector>
 
 #include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
@@ -148,7 +197,7 @@ FlutterLocale* LocalizationChannel::GetFlutterLocale(const char* locale) {
     country[bufSize] = '\0';
   }
 
-  // set script code, script code is an optional field
+  // set script code, script code ./unis an optional field
   bufSize = i18n_ulocale_get_script(locale, buffer, capacity);
   if (bufSize > 0) {
     script = new char[bufSize + 1];
@@ -201,34 +250,3 @@ void LocalizationChannel::DestroyFlutterLocale(FlutterLocale* flutter_locale) {
   }
 }
 }  // namespace flutter
-#else
-#include <vector>
-
-#include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
-#include "flutter/shell/platform/tizen/tizen_log.h"
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
-
-namespace flutter {
-LocalizationChannel::LocalizationChannel(FlutterTizenEngine* engine)
-    : engine_(engine) {
-  if (!engine_) {
-    engine_ = nullptr;
-  }
-}
-
-LocalizationChannel::~LocalizationChannel() {}
-
-void LocalizationChannel::SendLocales() {}
-
-void LocalizationChannel::SendPlatformResolvedLocale() {}
-
-FlutterLocale* LocalizationChannel::GetFlutterLocale(const char* locale) {
-  FlutterLocale* flutter_locale = new FlutterLocale;
-  flutter_locale->struct_size = sizeof(FlutterLocale);
-  return flutter_locale;
-}
-
-void LocalizationChannel::DestroyFlutterLocale(FlutterLocale* flutter_locale) {}
-}  // namespace flutter
-#endif

shell/platform/tizen/channels/platform_channel.cc

@@ -3,10 +3,66 @@
 // found in the LICENSE file.
 
 #include "platform_channel.h"
-#ifndef __X64_SHELL__
 
+#ifndef __X64_SHELL__
 #include <app.h>
 #include <feedback.h>
+#else
+
+namespace {
+
+typedef enum {
+  FEEDBACK_PATTERN_NONE = -1,
+  FEEDBACK_PATTERN_TAP = 0, /**< Feedback pattern when general touch */
+  FEEDBACK_PATTERN_SIP,     /**< Feedback pattern when touch text key */
+  FEEDBACK_PATTERN_GENERAL =
+      33, /**< Feedback pattern when alert general event */
+  FEEDBACK_PATTERN_VIBRATION_ON =
+      55, /**< Feedback pattern when turn on vibration mode */
+  FEEDBACK_PATTERN_SILENT_OFF, /**< Feedback pattern when turn off silent mode
+                                */
+} feedback_pattern_e;
+
+typedef enum {
+  FEEDBACK_TYPE_NONE,  /**< Feedback type none */
+  FEEDBACK_TYPE_SOUND, /**< Feedback type for sound */
+
+  FEEDBACK_TYPE_VIBRATION, /**< Feedback type for vibration */
+  FEEDBACK_TYPE_END,
+} feedback_type_e;
+
+typedef enum {
+  FEEDBACK_ERROR_NONE,             /**< Successful */
+  FEEDBACK_ERROR_OPERATION_FAILED, /**< Operation failed */
+
+  FEEDBACK_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
+  FEEDBACK_ERROR_NOT_SUPPORTED,     /**< Not supported in this device */
+  FEEDBACK_ERROR_PERMISSION_DENIED, /**< Permission denied */
+  FEEDBACK_ERROR_NOT_INITIALIZED,   /**< Not initialized */
+} feedback_error_e;
+
+int feedback_initialize(void) {
+  return 0;
+}
+
+int feedback_play_type(feedback_type_e type, feedback_pattern_e pattern) {
+  return 0;
+}
+
+int feedback_deinitialize(void) {
+  return 0;
+}
+
+void ui_app_exit(void) {
+  exit(0);
+}
+
+char* get_error_message(int err_code) {
+  return (char*)"NOT SUPPORTED";
+}
+
+};  // namespace
+#endif
 
 #include <map>
 
@@ -337,43 +393,3 @@ void SetData(const MethodCall<rapidjson::Document>& call,
 }  // namespace clipboard
 
 }  // namespace flutter
-
-#else
-#include <map>
-
-#include "flutter/shell/platform/common/json_method_codec.h"
-#include "flutter/shell/platform/tizen/tizen_log.h"
-
-namespace flutter {
-
-namespace {
-constexpr char kChannelName[] = "flutter/platform";
-}
-
-PlatformChannel::PlatformChannel(BinaryMessenger* messenger,
-                                 TizenRenderer* renderer)
-    : channel_(std::make_unique<MethodChannel<rapidjson::Document>>(
-          messenger,
-          kChannelName,
-          &JsonMethodCodec::GetInstance())),
-      renderer_(renderer) {
-  channel_->SetMethodCallHandler(
-      [this](const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result) {
-        HandleMethodCall(call, std::move(result));
-      });
-}
-
-PlatformChannel::~PlatformChannel() {
-  if (renderer_) {
-    renderer_ = nullptr;
-  }
-}
-
-void PlatformChannel::HandleMethodCall(
-    const MethodCall<rapidjson::Document>& call,
-    std::unique_ptr<MethodResult<rapidjson::Document>> result) {
-  result->NotImplemented();
-}
-}  // namespace flutter
-#endif