Merge pull request #6 from nhiroyasu/develop

v1.2.2
nhiroyasu · May 1, 2022 · 8e31a3f · 8e31a3f
2 parents 9c2dce8 + a646c18
commit 8e31a3f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 8 deletions.
diff --git a/slideover-for-macos.xcodeproj/project.pbxproj b/slideover-for-macos.xcodeproj/project.pbxproj
@@ -549,7 +549,7 @@
 				CODE_SIGN_ENTITLEMENTS = "slideover-for-macos/slideover_for_macos.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = 2CMV7D36JC;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -564,7 +564,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.2;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nhiro1109.${BUNDLE_ID_PREFIX}slideover-for-macos";
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -584,7 +584,7 @@
 				CODE_SIGN_ENTITLEMENTS = "slideover-for-macos/slideover_for_macos.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = 2CMV7D36JC;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -599,7 +599,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.2;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nhiro1109.slideover-for-macos";
 				PRODUCT_NAME = "${DISPLAY_NAME_PREFIX}${TARGET_NAME}";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/slideover-for-macos/AppDelegate.swift b/slideover-for-macos/AppDelegate.swift
@@ -14,6 +14,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var notificationManager: NotificationManager? {
         Injector.shared.buildSafe(NotificationManager.self)
     }
+    private var userSetting: UserSettingService? {
+        Injector.shared.buildSafe(UserSettingService.self)
+    }
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         // Insert code here to initialize your application
@@ -34,6 +37,19 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
         return true
     }
+
+    func application(_ application: NSApplication, open urls: [URL]) {
+        guard let url = urls.first else { return }
+        let components = NSURLComponents(url: url, resolvingAgainstBaseURL: false)
+        guard let urlItem = components?.queryItems?.first(where: { item in
+            item.name == "url"
+        }) else { return }
+        guard let targetUrl = urlItem.value else { return }
+        notificationManager?.push(name: .openUrl, param: targetUrl)
+        if var userSetting = userSetting {
+            userSetting.latestPage = URL(string: targetUrl)
+        }
+    }
 
     @IBAction func didTapReloadButton(_ sender: Any) {
         notificationManager?.push(name: .reload, param: nil)

diff --git a/slideover-for-macos/Info.plist b/slideover-for-macos/Info.plist
@@ -15,9 +15,14 @@
 			<string>com.nhiroyasu.slideoverformacos</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>slideoverformacos</string>
+				<string>debug-slideoverformacos</string>
 			</array>
 		</dict>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>
diff --git a/slideover-for-macos/Module/SlideOverWindow/SlideOverWindowUseCase.swift b/slideover-for-macos/Module/SlideOverWindow/SlideOverWindowUseCase.swift
@@ -45,6 +45,7 @@ class SlideOverWindowInteractor: SlideOverWindowUseCase {
     func setUp() {
         observeReloadNotification()
         observeClearCacheNotification()
+        observeUrlOpenUrlNotification()
         observeHelpNotification()
         observeMouseEvent()
         setWillMoveNotification()
@@ -184,4 +185,12 @@ extension SlideOverWindowInteractor {
             self?.presenter.loadWebPage(url: self?.helpUrl)
         }
     }
+
+    private func observeUrlOpenUrlNotification() {
+        notificationManager.observe(name: .openUrl) { [weak self] urlValue in
+            guard let urlStr = urlValue as? String,
+                  let url = URL(string: urlStr) else { return }
+            self?.presenter.loadWebPage(url: url)
+        }
+    }
 }
diff --git a/slideover-for-macos/Service/NotificationManager.swift b/slideover-for-macos/Service/NotificationManager.swift
@@ -3,6 +3,7 @@ import Foundation
 extension Notification.Name {
     static let reload = Notification.Name("reload")
     static let clearCache = Notification.Name("clearCache")
+    static let openUrl = Notification.Name("openUrl")
     static let openHelp = Notification.Name("openHelp")
 }
 

diff --git a/slideover-for-macos/UI/Util/SlideOverWebView.swift b/slideover-for-macos/UI/Util/SlideOverWebView.swift
@@ -19,7 +19,7 @@ class SlideOverWebView: WKWebView {
     override func willOpenMenu(_ menu: NSMenu, with event: NSEvent) {
         let menuTree: [MenuItemType] = [
             .separator,
-            .item(data: .init(title: NSLocalizedString("Copy Link", comment: ""), action: #selector(didTapCopyLink), keyEquivalent: "", image: nil, value: nil)),
+            .item(data: .init(title: NSLocalizedString("Copy Link This Page", comment: ""), action: #selector(didTapCopyLink), keyEquivalent: "", image: nil, value: nil)),
             .item(data: .init(title: NSLocalizedString("Open Browser", comment: ""), action: #selector(didTapOpenBrowser), keyEquivalent: "", image: nil, value: nil)),
             .separator,
             .subMenu(data: .init(title: NSLocalizedString("Window Layout", comment: ""), image: NSImage(systemSymbolName: "uiwindow.split.2x1", accessibilityDescription: nil), items: [

diff --git a/slideover-for-macos/ja.lproj/Localizable.strings b/slideover-for-macos/ja.lproj/Localizable.strings
@@ -1,5 +1,5 @@
-"Copy Link" = "リンクをコピー";
-"Open Browser" = "ブラウザで開く";
+"Copy Link This Page" = "このページのリンクをコピー";
+"Open Browser" = "このページをブラウザで開く";
 "Window Layout" = "画面配置";
 "Left" = "右端";
 "Right" = "左端";