Remove dacap/clip

xfangfang · Oct 17, 2024 · 2b5be54 · 2b5be54
1 parent 8b068db
commit 2b5be54
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,6 +25,3 @@
 [submodule "library/MemoryModule"]
 	path = library/MemoryModule
 	url = https://github.com/fancycode/MemoryModule.git
-[submodule "library/clip"]
-	path = library/clip
-	url = https://github.com/dacap/clip.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -244,8 +244,6 @@ if (PLATFORM_DESKTOP)
                 "${CMAKE_CURRENT_SOURCE_DIR}/scripts/linux/${PACKAGE_NAME}.appdata.xml"
                 "${CMAKE_CURRENT_SOURCE_DIR}/scripts/linux/${PACKAGE_NAME}.desktop")
     endif ()
-
-    list(APPEND APP_PLATFORM_LIB clip)
 elseif (PLATFORM_IOS)
     ios_bundle(
             "${CMAKE_CURRENT_SOURCE_DIR}/library/borealis/demo/ios/tvos/Splash.storyboard"

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -81,14 +81,6 @@ set(BUILD_SHARED_LIBS OFF)
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 add_subdirectory(lunasvg EXCLUDE_FROM_ALL)
 
-# add dacap
-if (PLATFORM_DESKTOP)
-    set(CLIP_EXAMPLES OFF)
-    set(CLIP_TESTS OFF)
-    add_subdirectory(clip EXCLUDE_FROM_ALL)
-    target_include_directories(clip PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-endif ()
-
 # add mongoose
 if (USE_SYSTEM_MONGOOSE)
     find_library(MONGOOSE_LIBRARY NAMES mongoose REQUIRED)

diff --git a/library/borealis b/library/borealis
diff --git a/library/clip b/library/clip
diff --git a/wiliwili/source/activity/setting_activity.cpp b/wiliwili/source/activity/setting_activity.cpp
@@ -633,7 +633,7 @@ void SettingActivity::onContentAvailable() {
             ProgramConfig::instance().setSettingItem(SettingItem::HTTP_PROXY, httpProxy);
             ProgramConfig::instance().setProxy(httpProxy);
         },
-        "http://127.0.0.1:7890", "wiliwili/setting/app/network/proxy_hint"_i18n, 64);
+        "wiliwili/setting/app/network/proxy_hint"_i18n, "wiliwili/setting/app/network/proxy_hint"_i18n, 64);
 
 /// Hardware decode
 #ifdef PS4

diff --git a/wiliwili/source/api/analytics.cpp b/wiliwili/source/api/analytics.cpp
@@ -64,7 +64,7 @@ void Analytics::send() {
     cpr::PostCallback(
         [](const cpr::Response& r) {
             if (r.status_code != 204) {
-                brls::Logger::error("report event error: {}", r.status_code);
+                brls::Logger::error("report event error: {} {}", r.status_code, r.error.message);
             }
         },
         cpr::Parameters{

diff --git a/wiliwili/source/fragment/share_dialog.cpp b/wiliwili/source/fragment/share_dialog.cpp
@@ -6,10 +6,6 @@
 #include <borealis/views/dialog.hpp>
 #include <cpr/cpr.h>
 
-#if defined(__APPLE__) || defined(__linux__) || defined(_WIN32)
-#include <clip/clip.h>
-#endif
-
 #include "fragment/share_dialog.hpp"
 #include "view/qr_image.hpp"
 #include "view/button_close.hpp"
@@ -26,7 +22,7 @@ ShareBox::ShareBox() {
 #if defined(__APPLE__) || defined(__linux__) || defined(_WIN32)
     this->registerClickAction([this](...) {
         if (this->action == "clipboard") {
-            clip::set_text(this->link);
+            brls::Application::getPlatform()->pasteToClipboard(this->link);
             this->eventClipboard.fire();
         } else {
             brls::Application::getPlatform()->openBrowser(this->link);

diff --git a/wiliwili/source/utils/gesture_helper.cpp b/wiliwili/source/utils/gesture_helper.cpp
@@ -13,7 +13,7 @@
 #define MAX_DELTA_MOVEMENT 24
 
 // Time in ms to recognize long press
-#define LONG_TIME_MS 200  // 200ms
+#define LONG_TIME_MS 250  // 250ms
 #define LONG_TIME_US (LONG_TIME_MS * 1000)
 
 OsdGestureRecognizer::OsdGestureRecognizer(const OsdGestureEvent::Callback& respond) {

diff --git a/wiliwili/source/utils/version_helper.cpp b/wiliwili/source/utils/version_helper.cpp
@@ -97,7 +97,7 @@ void APPVersion::checkUpdate(int delay, bool showUpToDateDialog) {
                         return;
                     }
                     if (r.status_code != 200 || r.text.empty()) {
-                        brls::Logger::error("Cannot check update: {} {}", r.status_code, r.reason);
+                        brls::Logger::error("Cannot check update: {} {}", r.status_code, r.error.message);
                         if (showUpToDateDialog) {
                             auto msg = r.reason;
                             brls::sync([msg]() { brls::Application::notify(msg); });
+1 −0		library/include/borealis/core/application.hpp
+4 −0		library/include/borealis/core/input.hpp
+11 −0		library/include/borealis/core/platform.hpp
+8 −6		library/include/borealis/platforms/glfw/glfw_platform.hpp
+8 −6		library/include/borealis/platforms/sdl/sdl_platform.hpp
+2 −0		library/include/borealis/views/edit_text_dialog.hpp
+1 −3		library/lib/core/application.cpp
+20 −3		library/lib/platforms/glfw/glfw_ime.cpp
+15 −2		library/lib/platforms/glfw/glfw_input.cpp
+15 −1		library/lib/platforms/glfw/glfw_platform.cpp
+7 −0		library/lib/platforms/sdl/sdl_ime.cpp
+24 −22		library/lib/platforms/sdl/sdl_input.cpp
+13 −0		library/lib/platforms/sdl/sdl_platform.cpp
+21 −0		library/lib/views/edit_text_dialog.cpp