Moving WebView into UI Module (#216)

AshampooSystems · Apr 4, 2019 · d5f1bed · d5f1bed
1 parent e801f43
commit d5f1bed
Show file tree

Hide file tree

Showing 23 changed files with 50 additions and 105 deletions.
diff --git a/examples/reddit/src/reddit.cpp b/examples/reddit/src/reddit.cpp
@@ -2,7 +2,6 @@
 #include <bdn/log.h>
 #include <bdn/net.h>
 #include <bdn/ui.h>
-#include <bdn/webview-module.h>
 #include <bdn/yogalayout.h>
 
 #include <nlohmann/json.hpp>
@@ -21,11 +20,8 @@ class RedditPost
   public:
     RedditPost() = default;
     RedditPost(const String &title_, const String &url_, const String &thumbnailUrl_)
-    {
-        title = title_;
-        url = url_;
-        thumbnailUrl = thumbnailUrl_;
-    }
+        : title(title_), url(url_), thumbnailUrl(thumbnailUrl_)
+    {}
 
     Property<String> title;
     Property<String> url;

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
@@ -53,7 +53,6 @@ add_subdirectory(net)
 add_subdirectory(ui)
 add_subdirectory(testing)
 add_subdirectory(layout)
-add_subdirectory(webview)
 
 if(BDN_INCLUDE_LOTTIE)
     add_subdirectory(lottieview)

diff --git a/framework/webview/include/bdn/WebView.h → framework/ui/include/bdn/WebView.h b/framework/webview/include/bdn/WebView.h → framework/ui/include/bdn/WebView.h
diff --git a/framework/ui/platforms/CMakeLists.txt b/framework/ui/platforms/CMakeLists.txt
@@ -1,10 +1,12 @@
 
 if(BDN_PLATFORM_OSX)
     add_subdirectory(mac)
-    target_link_libraries(ui INTERFACE ui_mac)
+    add_subdirectory(applecommon)
+    target_link_libraries(ui INTERFACE ui_mac ui_applecommon)
 elseif(BDN_PLATFORM_IOS)
     add_subdirectory(ios)
-    target_link_libraries(ui INTERFACE ui_ios)
+    add_subdirectory(applecommon)
+    target_link_libraries(ui INTERFACE ui_ios ui_applecommon)
 elseif(BDN_PLATFORM_ANDROID)
     add_subdirectory(android)
     target_link_libraries(ui INTERFACE ui_android)

diff --git a/...android/include/bdn/android/WebViewCore.h → ...android/include/bdn/android/WebViewCore.h b/...android/include/bdn/android/WebViewCore.h → ...android/include/bdn/android/WebViewCore.h
diff --git a/...oid/include/bdn/android/wrapper/WebView.h → ...oid/include/bdn/android/wrapper/WebView.h b/...oid/include/bdn/android/wrapper/WebView.h → ...oid/include/bdn/android/wrapper/WebView.h
diff --git a/.../java/io/boden/android/NativeWebView.java → .../java/io/boden/android/NativeWebView.java b/.../java/io/boden/android/NativeWebView.java → .../java/io/boden/android/NativeWebView.java
diff --git a/...io/boden/android/NativeWebViewClient.java → ...io/boden/android/NativeWebViewClient.java b/...io/boden/android/NativeWebViewClient.java → ...io/boden/android/NativeWebViewClient.java
diff --git a/...iew/platforms/android/src/WebViewCore.cpp → .../ui/platforms/android/src/WebViewCore.cpp b/...iew/platforms/android/src/WebViewCore.cpp → .../ui/platforms/android/src/WebViewCore.cpp
diff --git a/framework/ui/platforms/applecommon/CMakeLists.txt b/framework/ui/platforms/applecommon/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_platform_library(NAME applecommon SOURCE_FOLDER ${CMAKE_CURRENT_LIST_DIR} COMPONENT_NAME IOS-MAC PARENT_LIBRARY ui DONT_LINK_PARENT_LIBRARY)
+target_link_libraries(ui_applecommon PRIVATE ui)
diff --git a/framework/ui/platforms/applecommon/include/bdn/applecommon/WebViewNavigationController.hh b/framework/ui/platforms/applecommon/include/bdn/applecommon/WebViewNavigationController.hh
@@ -0,0 +1,10 @@
+#pragma once
+
+#import <WebKit/WebKit.h>
+
+#include "../../../include/bdn/WebView.h"
+
+@interface WebViewNavigationController : NSObject <WKNavigationDelegate>
+@property std::function<bool(bdn::WebView::RedirectRequest)> redirectHandler;
+//- initWithCore:(std::shared_ptr<bdn::mac::WebViewCore>)core;
+@end
diff --git a/framework/ui/platforms/applecommon/src/WebViewNavigationController.mm b/framework/ui/platforms/applecommon/src/WebViewNavigationController.mm
@@ -0,0 +1,32 @@
+#import <bdn/applecommon/WebViewNavigationController.hh>
+
+#include <bdn/foundationkit/stringUtil.hh>
+#include <bdn/log.h>
+
+@implementation WebViewNavigationController
+
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+    bdn::logstream() << "Navigation failed: " << bdn::fk::nsStringToString(error.localizedDescription);
+}
+
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+    bdn::logstream() << "Provisional navigation failed: " << bdn::fk::nsStringToString(error.localizedDescription);
+}
+
+- (void)webView:(WKWebView *)webView
+    decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
+                    decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    bdn::WebView::RedirectRequest request;
+    request.url = bdn::fk::nsStringToString(navigationAction.request.URL.absoluteString);
+
+    if (!self.redirectHandler || self.redirectHandler(request)) {
+        decisionHandler(WKNavigationActionPolicyAllow);
+    } else {
+        decisionHandler(WKNavigationActionPolicyCancel);
+    }
+}
+
+@end
diff --git a/...tforms/ios/include/bdn/ios/WebViewCore.hh → ...tforms/ios/include/bdn/ios/WebViewCore.hh b/...tforms/ios/include/bdn/ios/WebViewCore.hh → ...tforms/ios/include/bdn/ios/WebViewCore.hh
diff --git a/.../webview/platforms/ios/src/WebViewCore.mm → ...ework/ui/platforms/ios/src/WebViewCore.mm b/.../webview/platforms/ios/src/WebViewCore.mm → ...ework/ui/platforms/ios/src/WebViewCore.mm
diff --git a/...tforms/mac/include/bdn/mac/WebViewCore.hh → ...tforms/mac/include/bdn/mac/WebViewCore.hh b/...tforms/mac/include/bdn/mac/WebViewCore.hh → ...tforms/mac/include/bdn/mac/WebViewCore.hh
diff --git a/.../webview/platforms/mac/src/WebViewCore.mm → ...ework/ui/platforms/mac/src/WebViewCore.mm b/.../webview/platforms/mac/src/WebViewCore.mm → ...ework/ui/platforms/mac/src/WebViewCore.mm
diff --git a/framework/webview/src/WebView.cpp → framework/ui/src/WebView.cpp b/framework/webview/src/WebView.cpp → framework/ui/src/WebView.cpp
diff --git a/framework/webview/CMakeLists.txt b/framework/webview/CMakeLists.txt
diff --git a/framework/webview/install.cmake b/framework/webview/install.cmake
diff --git a/framework/webview/platforms/CMakeLists.txt b/framework/webview/platforms/CMakeLists.txt
diff --git a/framework/webview/platforms/android/CMakeLists.txt b/framework/webview/platforms/android/CMakeLists.txt
diff --git a/framework/webview/platforms/ios/CMakeLists.txt b/framework/webview/platforms/ios/CMakeLists.txt
diff --git a/framework/webview/platforms/mac/CMakeLists.txt b/framework/webview/platforms/mac/CMakeLists.txt