From b4067ff79297b66813897db313814a892b51e646 Mon Sep 17 00:00:00 2001 From: mini-min <2alswo7@khu.ac.kr> Date: Wed, 6 Nov 2024 13:25:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20#229=20-=20Pasteboard=EB=A1=9C=20?= =?UTF-8?q?=EC=A7=84=EC=9E=85=20=EC=8B=9C=20=EC=B2=AB=20=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=20=ED=99=9C=EC=84=B1=ED=99=94=20=EC=95=88=EB=90=98=EB=8D=98=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddLink/LinkEmbed/View/AddLinkViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift b/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift index 910115c8..c7107f5d 100644 --- a/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift +++ b/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift @@ -69,10 +69,11 @@ extension AddLinkViewController { delegate = forDelegate } - // 클립보드 붙여넣기 Alert -> 붙여넣기 허용 클릭 후 자동 링크 임베드를 위한 함수 + /// 클립보드 붙여넣기 Alert -> 붙여넣기 허용 클릭 후 자동 링크 임베드를 위한 함수 func embedURL(url: String) { addLinkView.linkEmbedTextField.becomeFirstResponder() - addLinkView.linkEmbedTextField.text = url + addLinkView.linkEmbedTextField.text = url // 텍스트필드에 text 채우기 + viewModel.inputs.embedLinkText(url) // 관리중 ViewModel에도 String 수정 -> UI 반영 } } From 35dc0e53b97cf5c99a1866f24c6202d55cf97fb3 Mon Sep 17 00:00:00 2001 From: mini-min <2alswo7@khu.ac.kr> Date: Thu, 7 Nov 2024 21:41:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20#229=20-=20=EB=B0=B1=EA=B7=B8?= =?UTF-8?q?=EB=9D=BC=EC=9A=B4=EB=93=9C=20UIPasteboard=20=EB=8F=99=EC=9E=91?= =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TOASTER-iOS/Application/SceneDelegate.swift | 9 +++------ .../AddLink/LinkEmbed/View/AddLinkViewController.swift | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/TOASTER-iOS/Application/SceneDelegate.swift b/TOASTER-iOS/Application/SceneDelegate.swift index 908dc812..c8179c4b 100644 --- a/TOASTER-iOS/Application/SceneDelegate.swift +++ b/TOASTER-iOS/Application/SceneDelegate.swift @@ -63,25 +63,22 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { let appDelegate = UIApplication.shared.delegate as! AppDelegate - if let pasteboardString = UIPasteboard.general.url { + if let pasteboardUrl = UIPasteboard.general.url { if appDelegate.isLogin { guard let rootVC = window?.rootViewController as? ToasterNavigationController else { return } let addLinkViewController = AddLinkViewController() rootVC.pushViewController(addLinkViewController, animated: true) - addLinkViewController.embedURL(url: UIPasteboard.general.string ?? "") + addLinkViewController.embedURL(url: pasteboardUrl.absoluteString) if let presentedVC = rootVC.presentedViewController { presentedVC.dismiss(animated: false) } } } - UIPasteboard.general.string = nil } func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. + UIPasteboard.general.url = nil } func scene(_ scene: UIScene, openURLContexts URLContexts: Set) { diff --git a/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift b/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift index c7107f5d..ea4a50b1 100644 --- a/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift +++ b/TOASTER-iOS/Present/AddLink/LinkEmbed/View/AddLinkViewController.swift @@ -74,6 +74,7 @@ extension AddLinkViewController { addLinkView.linkEmbedTextField.becomeFirstResponder() addLinkView.linkEmbedTextField.text = url // 텍스트필드에 text 채우기 viewModel.inputs.embedLinkText(url) // 관리중 ViewModel에도 String 수정 -> UI 반영 + UIPasteboard.general.url = nil } }