Add Share/OpenInApp extensions, design changes, bug fixes

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -30,6 +30,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>OpenInForPDA.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
 		<key>Promises (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
@@ -56,14 +61,14 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Rx (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>8</integer>
 		</dict>
 		<key>Rx (Playground) 3.xcscheme</key>
 		<dict>
@@ -91,21 +96,31 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>3</integer>
+		</dict>
+		<key>ShareExtension.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>ShareForPDA.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
 		</dict>
 		<key>SnapKitPlayground (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>10</integer>
 		</dict>
 		<key>SnapKitPlayground (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>11</integer>
 		</dict>
 		<key>SnapKitPlayground (Playground) 3.xcscheme</key>
 		<dict>
@@ -133,21 +148,21 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>9</integer>
 		</dict>
 		<key>SwiftRichString (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 		<key>SwiftRichString (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>SwiftRichString (Playground) 3.xcscheme</key>
 		<dict>
@@ -175,7 +190,7 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Tools for plug-in “RswiftModifyXcodePackages”.xcscheme</key>
 		<dict>

ForPDA.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -7,9 +7,11 @@
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.subvert.forpda</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.forpda</string>
+				<string>forpda</string>
 			</array>
 		</dict>
 	</array>

ForPDA.xcodeproj/xcuserdata/subvert.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -92,3 +92,14 @@
 "captcha.uploading.failed" = "Captcha uploading failed";
 "login.failed.unknown.reasons" = "Something went wrong, try again later";
 "login" = "Log In";
+
+// Special // todo remove after 0.4
+"update03" = "Update 0.3";
+"update03.text" =
+"This update introduces two new options for opening articles in the app through Safari:
+                                                
+1) Press the Share button and select ForPDA from the list
+2) Go to Settings > Safari > Extensions > Open in ForPDA > On, after that Safari will offer to open articles in the app
+                                                
+P.S. Any issues with article rendering can be reported through a long tap on the news / menu in the upper right corner of the article / linked chat in the settings";
+"update03.enable.extension" = "Enable extension";

ForPDA/Info.plist

@@ -92,3 +92,14 @@
 "captcha.uploading.failed" = "Не получилось отправить капчу";
 "login.failed.unknown.reasons" = "Что-то пошло не так, попробуйте позже";
 "login" = "Войти";
+
+// Особое // todo убрать после 0.4
+"update03" = "Обновление 0.3";
+"update03.text" =
+"В этом обновлении появились две новые возможности открывать статьи в приложении через Safari:
+                        
+1) Нажать на кнопку Поделиться и выбрать в списке ForPDA
+2) Зайти в Настройки > Safari > Расширения > Open in ForPDA > Вкл, после чего Safari будет предлагать открывать приложение само
+                        
+P.S. Об ошибках отображения элементов в статьях можно сообщить через долгий тап в новостях / меню в верхнем правом углу статьи / чате указанном в настройках";
+"update03.enable.extension" = "Включить расширение";

ForPDA/Resources/en.lproj/Localizable.strings

@@ -27,8 +27,26 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         overrideApplicationThemeStyle(with: settingsService.getAppTheme())
         configureWKWebView()
-
-        try? DefaultRouter().navigate(to: RouteMap.tabBarScreen, with: nil)
+        
+        if let url = connectionOptions.urlContexts.first?.url {
+            // Cold start deeplink
+            handleDeeplinkUrl(url)
+        } else {
+            try? DefaultRouter().navigate(to: RouteMap.tabBarScreen, with: nil)
+        }
+    }
+    
+    private func handleDeeplinkUrl(_ url: URL) {
+        if url.absoluteString == "forpda://article//" {
+            // Если share в браузере не сработал, то открываем новости
+            // todo обработать нормально
+            try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
+        } else {
+            let id = url.absoluteString.components(separatedBy: "article/")[1]
+            let url = "https://4pda.to/\(id)"
+            let article = Article(url: url, info: nil)
+            try? DefaultRouter().navigate(to: RouteMap.articleScreen, with: article)
+        }
     }
 
     private func configureWKWebView() {
@@ -42,6 +60,13 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
+    // Opens on existing scene
+    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
+        if let url = URLContexts.first?.url {
+            handleDeeplinkUrl(url)
+        }
+    }
+    
     func sceneDidDisconnect(_ scene: UIScene) { }
 
     func sceneDidBecomeActive(_ scene: UIScene) { }

ForPDA/Resources/ru.lproj/Localizable.strings

@@ -9,6 +9,10 @@ import Foundation
 
 struct Article {
     let url: String
+    var info: ArticleInfo?
+}
+
+struct ArticleInfo {
     let title: String
     let description: String
     let imageUrl: String

ForPDA/Sources/Application/SceneDelegate.swift

@@ -43,6 +43,15 @@ final class ArticlePresenter: ArticlePresenterProtocol {
             guard let self else { return }
             switch result {
             case .success(let response):
+                // Deeplink case
+                if article.info == nil {
+                    let articleInfo = parsingService.parseArticleInfo(from: response)
+                    article.info = articleInfo
+                    DispatchQueue.main.async {
+                        self.view?.reconfigureHeader()
+                    }
+                }
+                
                 let elements = parsingService.parseArticle(from: response)
                 DispatchQueue.main.async {
                     self.view?.configureArticle(with: elements)

ForPDA/Sources/Models/Article.swift

@@ -14,6 +14,7 @@ import NukeExtensions
 
 protocol ArticleVCProtocol: AnyObject {
     func configureArticle(with elements: [ArticleElement])
+    func reconfigureHeader()
     func makeComments(from page: String)
     func showError()
 }
@@ -49,7 +50,7 @@ final class ArticleVC: PDAViewController<ArticleView> {
         } else {
             myView.removeComments()
             let elements = ArticleBuilder.makeDefaultArticle(
-                description: presenter.article.description,
+                description: presenter.article.info?.description ?? "Ошибка",
                 url: presenter.article.url
             )
             makeArticle(from: elements)
@@ -60,15 +61,18 @@ final class ArticleVC: PDAViewController<ArticleView> {
 
     private func configureNavigationTitle() {
         let label = MarqueeLabel(frame: .zero, rate: 30, fadeLength: 0)
-        label.text = presenter.article.title
+        label.text = presenter.article.info?.title
         label.fadeLength = 30
         navigationItem.titleView = label
     }
 
     private func configureView() {
-        NukeExtensions.loadImage(with: URL(string: presenter.article.imageUrl)!, into: myView.articleImage)
-        myView.titleLabel.text = presenter.article.title
-        myView.commentsLabel.text = R.string.localizable.comments(Int(presenter.article.commentAmount) ?? 0)
+        NukeExtensions.loadImage(with: URL(string: presenter.article.info?.imageUrl), into: myView.articleImage) { result in
+            // Добавляем оверлей если открываем не через deeplink (?)
+            if (try? result.get()) != nil { self.myView.articleImage.addoverlay() }
+        }
+        myView.titleLabel.text = presenter.article.info?.title
+        myView.commentsLabel.text = R.string.localizable.comments(Int(presenter.article.info?.commentAmount ?? "0") ?? 0)
     }
 
     private func configureMenu() {
@@ -149,7 +153,10 @@ final class ArticleVC: PDAViewController<ArticleView> {
             myView.stackView.addArrangedSubview(articleElement)
         }
 
-        myView.commentsContainer.isHidden = false
+        // todo Почему без mainactor не работает?
+        Task { @MainActor in
+            myView.commentsContainer.isHidden = false
+        }
         myView.stopLoading()
     }
 
@@ -173,20 +180,23 @@ final class ArticleVC: PDAViewController<ArticleView> {
 
 extension ArticleVC: ArticleVCProtocol {
 
+    func reconfigureHeader() {
+        configureNavigationTitle()
+        configureView()
+    }
+    
     func configureArticle(with elements: [ArticleElement]) {
-        DispatchQueue.main.async {
-            self.makeArticle(from: elements)
-        }
+        makeArticle(from: elements)
     }
 
     func showError() {
-        DispatchQueue.main.async {
-            let alert = UIAlertController(title: R.string.localizable.error(),
-                                          message: R.string.localizable.somethingWentWrong(),
-                                          preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: R.string.localizable.ok(), style: .default))
-            self.present(alert, animated: true)
-        }
+        let alert = UIAlertController(
+            title: R.string.localizable.error(),
+            message: R.string.localizable.somethingWentWrong(),
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: R.string.localizable.ok(), style: .default))
+        present(alert, animated: true)
     }
 }