Skip to content

Commit f140257

Browse files
swift-kimswift-kim
authored
Minor refactoring (#138)
* Minor refactoring * Make the clipboard namespace private to platform_channel.cc * Minor formatting * Remove unused import from platform/common/BUILD.gn
1 parent eafde6a commit f140257

File tree

10 files changed

+58
-101
lines changed

10 files changed

+58
-101
lines changed

‎shell/platform/common/BUILD.gn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# found in the LICENSE file.
44

55
import("//flutter/common/config.gni")
6-
import("//flutter/shell/platform/config.gni")
76
import("//flutter/shell/platform/tizen/config.gni")
87
import("//flutter/testing/testing.gni")
98

‎shell/platform/tizen/channels/localization_channel_stub.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
namespace flutter {
88

9-
LocalizationChannel::LocalizationChannel(FlutterTizenEngine* engine) {
10-
engine_ = nullptr;
11-
}
9+
LocalizationChannel::LocalizationChannel(FlutterTizenEngine* engine) {}
1210

1311
LocalizationChannel::~LocalizationChannel() {}
1412

‎shell/platform/tizen/channels/platform_channel.cc‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,54 @@ class FeedbackManager {
162162

163163
} // namespace
164164

165+
// Clipboard constants and variables
166+
namespace clipboard {
167+
168+
// naive implementation using std::string as a container of internal clipboard
169+
// data
170+
std::string string_clipboard = "";
171+
172+
static constexpr char kTextKey[] = "text";
173+
static constexpr char kTextPlainFormat[] = "text/plain";
174+
static constexpr char kUnknownClipboardFormatError[] =
175+
"Unknown clipboard format error";
176+
static constexpr char kUnknownClipboardError[] =
177+
"Unknown error during clipboard data retrieval";
178+
179+
void GetData(const MethodCall<rapidjson::Document>& call,
180+
std::unique_ptr<MethodResult<rapidjson::Document>> result) {
181+
const rapidjson::Value& format = call.arguments()[0];
182+
183+
// https://api.flutter.dev/flutter/services/Clipboard/kTextPlain-constant.html
184+
// API supports only kTextPlain format
185+
if (strcmp(format.GetString(), kTextPlainFormat) != 0) {
186+
result->Error(kUnknownClipboardFormatError,
187+
"Clipboard API only supports text.");
188+
return;
189+
}
190+
191+
rapidjson::Document document;
192+
document.SetObject();
193+
rapidjson::Document::AllocatorType& allocator = document.GetAllocator();
194+
document.AddMember(rapidjson::Value(kTextKey, allocator),
195+
rapidjson::Value(string_clipboard, allocator), allocator);
196+
result->Success(document);
197+
}
198+
199+
void SetData(const MethodCall<rapidjson::Document>& call,
200+
std::unique_ptr<MethodResult<rapidjson::Document>> result) {
201+
const rapidjson::Value& document = *call.arguments();
202+
rapidjson::Value::ConstMemberIterator itr = document.FindMember(kTextKey);
203+
if (itr == document.MemberEnd()) {
204+
result->Error(kUnknownClipboardError, "Invalid message format");
205+
return;
206+
}
207+
string_clipboard = itr->value.GetString();
208+
result->Success();
209+
}
210+
211+
} // namespace clipboard
212+
165213
PlatformChannel::PlatformChannel(BinaryMessenger* messenger,
166214
TizenRenderer* renderer)
167215
: channel_(std::make_unique<MethodChannel<rapidjson::Document>>(
@@ -287,52 +335,4 @@ void PlatformChannel::HandleMethodCall(
287335
}
288336
}
289337

290-
// Clipboard constants and variables
291-
namespace clipboard {
292-
293-
// naive implementation using std::string as a container of internal clipboard
294-
// data
295-
std::string string_clipboard = "";
296-
297-
static constexpr char kTextKey[] = "text";
298-
static constexpr char kTextPlainFormat[] = "text/plain";
299-
static constexpr char kUnknownClipboardFormatError[] =
300-
"Unknown clipboard format error";
301-
static constexpr char kUnknownClipboardError[] =
302-
"Unknown error during clipboard data retrieval";
303-
304-
void GetData(const MethodCall<rapidjson::Document>& call,
305-
std::unique_ptr<MethodResult<rapidjson::Document>> result) {
306-
const rapidjson::Value& format = call.arguments()[0];
307-
308-
// https://api.flutter.dev/flutter/services/Clipboard/kTextPlain-constant.html
309-
// API supports only kTextPlain format
310-
if (strcmp(format.GetString(), kTextPlainFormat) != 0) {
311-
result->Error(kUnknownClipboardFormatError,
312-
"Clipboard API only supports text.");
313-
return;
314-
}
315-
316-
rapidjson::Document document;
317-
document.SetObject();
318-
rapidjson::Document::AllocatorType& allocator = document.GetAllocator();
319-
document.AddMember(rapidjson::Value(kTextKey, allocator),
320-
rapidjson::Value(string_clipboard, allocator), allocator);
321-
result->Success(document);
322-
}
323-
324-
void SetData(const MethodCall<rapidjson::Document>& call,
325-
std::unique_ptr<MethodResult<rapidjson::Document>> result) {
326-
const rapidjson::Value& document = *call.arguments();
327-
rapidjson::Value::ConstMemberIterator itr = document.FindMember(kTextKey);
328-
if (itr == document.MemberEnd()) {
329-
result->Error(kUnknownClipboardError, "Invalid message format");
330-
return;
331-
}
332-
string_clipboard = itr->value.GetString();
333-
result->Success();
334-
}
335-
336-
} // namespace clipboard
337-
338338
} // namespace flutter

‎shell/platform/tizen/channels/platform_channel.h‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class PlatformChannel {
2020
virtual ~PlatformChannel();
2121

2222
private:
23+
#ifndef __X64_SHELL__
2324
void HandleMethodCall(
2425
const MethodCall<rapidjson::Document>& call,
2526
std::unique_ptr<MethodResult<rapidjson::Document>> result);
@@ -29,18 +30,9 @@ class PlatformChannel {
2930
// A reference to the renderer object managed by FlutterTizenEngine.
3031
// This can be nullptr if the engine is running in headless mode.
3132
TizenRenderer* renderer_;
33+
#endif
3234
};
3335

34-
namespace clipboard {
35-
36-
void GetData(const MethodCall<rapidjson::Document>& call,
37-
std::unique_ptr<MethodResult<rapidjson::Document>> result);
38-
39-
void SetData(const MethodCall<rapidjson::Document>& call,
40-
std::unique_ptr<MethodResult<rapidjson::Document>> result);
41-
42-
} // namespace clipboard
43-
4436
} // namespace flutter
4537

4638
#endif // EMBEDDER_PLATFORM_CHANNEL_H_

‎shell/platform/tizen/channels/platform_channel_stub.cc‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,8 @@
77
namespace flutter {
88

99
PlatformChannel::PlatformChannel(BinaryMessenger* messenger,
10-
TizenRenderer* renderer) {
11-
renderer_ = nullptr;
12-
}
10+
TizenRenderer* renderer) {}
1311

1412
PlatformChannel::~PlatformChannel() {}
1513

16-
void PlatformChannel::HandleMethodCall(
17-
const MethodCall<rapidjson::Document>& call,
18-
std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
19-
20-
namespace clipboard {
21-
22-
void GetData(const MethodCall<rapidjson::Document>& call,
23-
std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
24-
25-
void SetData(const MethodCall<rapidjson::Document>& call,
26-
std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
27-
28-
} // namespace clipboard
29-
3014
} // namespace flutter

‎shell/platform/tizen/channels/settings_channel.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
#ifndef __X64_SHELL__
99
#include <system/system_settings.h>
10-
#else
11-
typedef enum {
12-
SYSTEM_SETTINGS_KEY_MAX,
13-
} system_settings_key_e;
1410
#endif
1511

1612
#include <memory>
@@ -27,11 +23,13 @@ class SettingsChannel {
2723
virtual ~SettingsChannel();
2824

2925
private:
26+
#ifndef __X64_SHELL__
3027
static void OnSettingsChangedCallback(system_settings_key_e key,
3128
void* user_data);
3229
void SendSettingsEvent();
3330

3431
std::unique_ptr<BasicMessageChannel<rapidjson::Document>> channel_;
32+
#endif
3533
};
3634

3735
} // namespace flutter

‎shell/platform/tizen/channels/settings_channel_stub.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ SettingsChannel::SettingsChannel(BinaryMessenger* messenger) {}
1010

1111
SettingsChannel::~SettingsChannel() {}
1212

13-
void SettingsChannel::SendSettingsEvent() {}
14-
15-
void SettingsChannel::OnSettingsChangedCallback(system_settings_key_e key,
16-
void* user_data) {}
17-
1813
} // namespace flutter

‎shell/platform/tizen/key_event_handler.cc‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
#ifndef __X64_SHELL__
88
#include <app.h>
9-
#else
10-
11-
namespace {
12-
13-
void ui_app_exit(void) {
14-
exit(0);
15-
}
16-
17-
}; // namespace
189
#endif
1910

2011
#include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
@@ -73,7 +64,9 @@ Eina_Bool KeyEventHandler::OnKey(void* data, int type, void* event) {
7364
engine->navigation_channel->PopRoute();
7465
}
7566
} else if (keyname == kExitKey && !is_down) {
67+
#ifndef __X64_SHELL__
7668
ui_app_exit();
69+
#endif
7770
}
7871
});
7972
}

‎shell/platform/tizen/key_event_handler.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
#ifndef EMBEDDER_KEY_EVENT_HANDLER_H_
66
#define EMBEDDER_KEY_EVENT_HANDLER_H_
77

8+
#include <Ecore_Input.h>
89
#ifdef __X64_SHELL__
910
#include <Efl_Core.h>
1011
#endif
1112

12-
#include <Ecore_Input.h>
13-
1413
#include <vector>
1514

1615
namespace flutter {

‎shell/platform/tizen/touch_event_handler.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
#ifndef EMBEDDER_TOUCH_EVENT_HANDLER_H_
66
#define EMBEDDER_TOUCH_EVENT_HANDLER_H_
77

8+
#include <Ecore_Input.h>
89
#ifdef __X64_SHELL__
910
#include <Efl_Core.h>
1011
#endif
1112

12-
#include <Ecore_Input.h>
13-
1413
#include <vector>
1514

1615
#include "flutter/shell/platform/embedder/embedder.h"

0 commit comments

Comments
 (0)