Release v0.5.0

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -9,7 +9,7 @@
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
-               title = "Run Script"
+               title = "Generate build phase file lists"
                scriptText = "cd $SOURCE_ROOT&#10;${SOURCE_ROOT}/swiftlint/swiftlint_helper.sh&#10;">
                <EnvironmentBuildable>
                   <BuildableReference

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

@@ -72,10 +72,10 @@
 "background.dark" = "Dark";
 "background.black" = "Black";
 "advanced" = "Advanced";
-"fast.loading.system" = "Fast loading";
-"fast.loading.system.warning" = "After activiting this option some of last news may not load, also amount of likes and comments can be wrong";
+"fast.loading.system" = "Fast loading news";
+"fast.loading.system.warning" = "After activiting this option latest news may not load and show wrong amount of comments, and likes may not appear in articles";
 "comments.show.likes" = "Show likes";
-"comments.show.likes.warning" = "After activiting this option you may see increase of internet traffic from this app, also likes may update with some delay";
+"comments.show.likes.warning" = "After activiting this option with \"Fast loading article\" you may see increase in traffic usage";
 "account" = "Account";
 "sign.out" = "Sign Out";
 "about.app" = "About App";

ForPDA.xcodeproj/xcshareddata/xcschemes/ForPDA.xcscheme

@@ -72,10 +72,10 @@
 "background.dark" = "Темный";
 "background.black" = "Черный";
 "advanced" = "Продвинутые";
-"fast.loading.system" = "Быстрая загрузка";
-"fast.loading.system.warning" = "При активации этой функции последние статьи могут не отображаться, а также количество лайков и комментариев может не соответствовать реальности";
+"fast.loading.system" = "Быстрая загрузка новостей";
+"fast.loading.system.warning" = "При активации этой функции статьи могут обновляться с задержкой, отображать неверное количество комментариев, а лайки в статьях не отображаться";
 "comments.show.likes" = "Отображать лайки";
-"comments.show.likes.warning" = "При активации этой функции может быть увеличеный расход трафика в приложении, также лайки могут отображаться с задержкой";
+"comments.show.likes.warning" = "При активации этой функции вместе с \"Быстрая загрузка новостей\" может быть увеличенный расход трафика";
 "account" = "Аккаунт";
 "sign.out" = "Выйти";
 "about.app" = "О приложении";

ForPDA/Resources/en.lproj/Localizable.strings

@@ -17,6 +17,7 @@ import RouteComposer
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     @Injected(\.settingsService) private var settingsService
+    @Injected(\.cookiesService) private var cookiesService
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
@@ -27,13 +28,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         return true
     }
-
-    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
-    }
-
-    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) { }
-
 }
 
 // MARK: - Configuration
@@ -68,28 +62,7 @@ extension AppDelegate {
 
     // MARK: Cookies
 
-    func configureCookies() {
-        // We need 3 cookies to authorize: anonymous, member_id, pass_hash
-        // There's also __fixmid cookie, but it lasts for a second and then removed
-        if let cookies = HTTPCookieStorage.shared.cookies, cookies.count < 3 {
-            // Getting saved cookies if present
-            if let cookiesData = settingsService.getCookiesAsData() {
-                // Decoding custom Cookie class since HTTPCookie doesn't support Codable
-                if let cookies = try? JSONDecoder().decode([Cookie].self, from: cookiesData) {
-                    // Force-casting Cookie to HTTPCookie and setting them for 4pda.to domain
-                    let mappedCookies = cookies.map { $0.httpCookie! }
-                    HTTPCookieStorage.shared.setCookies(mappedCookies, for: URL.fourpda, mainDocumentURL: nil)
-                    // WKWebView cookies are added in SceneDelegate
-                } else {
-                    // Deleting saved cookies in defaults if we can't decode them and logout
-                    settingsService.removeCookies()
-                    settingsService.removeUser()
-                }
-            } else {
-                // Deleting all cookies in case we don't have them saved to prevent different sources of truth and logout
-                settingsService.removeCookies()
-                settingsService.removeUser()
-            }
-        }
+    private func configureCookies() {
+        cookiesService.configureCookies()
     }
 }

ForPDA/Resources/ru.lproj/Localizable.strings

@@ -13,50 +13,62 @@ import WebKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     @Injected(\.settingsService) private var settingsService
+    @Injected(\.cookiesService) private var cookiesService
 
     var window: UIWindow?
 
-    var webView: WKWebView!
+    var webView: WKWebView = {
+        let config = WKWebViewConfiguration()
+        let webView = WKWebView(frame: .zero, configuration: config)
+        webView.tag = 666
+        return webView
+    }()
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         self.window = UIWindow(windowScene: windowScene)
 
         window?.rootViewController = UIViewController()
+        window?.addSubview(webView)
         window?.makeKeyAndVisible()
 
         overrideApplicationThemeStyle(with: settingsService.getAppTheme())
-        configureWKWebView()
-        
-        if let url = connectionOptions.urlContexts.first?.url {
+        cookiesService.syncCookies()
+        handleNavigation(to: connectionOptions.urlContexts.first?.url)
+    }
+}
+
+extension SceneDelegate {
+    
+    // MARK: - Navigation
+    
+    private func handleNavigation(to url: URL?) {
+        if let url {
             // Cold start deeplink
             handleDeeplinkUrl(url)
         } else {
-            try? DefaultRouter().navigate(to: RouteMap.tabBarScreen, with: nil)
+            // Handle all 'try?' on routers? (todo)
+            // Wrong link is not showing anything (todo)
+            let testLink = "" // format starts/ends with slash: /2023/../../....../
+            if testLink.isEmpty {
+                try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
+            } else {
+                // Testing purposes only
+                handleDeeplinkUrl(URL(string: "forpda://article\(testLink)")!)
+            }
         }
     }
 
     private func handleDeeplinkUrl(_ url: URL) {
         if url.absoluteString == "forpda://article//" {
-            // Если share в браузере не сработал, то открываем новости
-            // todo обработать нормально
+            // If share didn't work in browser, fallback to news (also bug with share inside app) (todo)
             try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
         } else {
+            settingsService.setIsDeeplinking(to: true)
             let id = url.absoluteString.components(separatedBy: "article/")[1]
-            let url = "https://4pda.to/\(id)"
+            let url = URL.fourpda.absoluteString + id
             let article = Article(url: url, info: nil)
-            try? DefaultRouter().navigate(to: RouteMap.articleScreen, with: article)
-        }
-    }
-    
-    private func configureWKWebView() {
-        let config = WKWebViewConfiguration()
-        webView = WKWebView(frame: .zero, configuration: config)
-        webView.tag = 666
-        window?.addSubview(webView)
-        
-        for cookie in HTTPCookieStorage.shared.cookies ?? [] {
-            WKWebsiteDataStore.default().httpCookieStore.setCookie(cookie)
+            try? DefaultRouter().navigate(to: RouteMap.newArticleScreen, with: article)
         }
     }
 
@@ -67,18 +79,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
-    func sceneDidDisconnect(_ scene: UIScene) { }
-
-    func sceneDidBecomeActive(_ scene: UIScene) { }
-
-    func sceneWillResignActive(_ scene: UIScene) { }
-
-    func sceneWillEnterForeground(_ scene: UIScene) { }
-
-    func sceneDidEnterBackground(_ scene: UIScene) { }
-}
-
-extension SceneDelegate {
+    // MARK: - Themes
+    
     func overrideApplicationThemeStyle(with theme: AppTheme) {
        window?.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: theme.ordinal())!
     }

ForPDA/Sources/Application/AppDelegate.swift

@@ -7,20 +7,25 @@
 
 import UIKit
 import RouteComposer
+import Factory
 
 final class LoginInterceptor<C>: RoutingInterceptor {
+    
+    @Injected(\.analyticsService) private var analytics
+    @Injected(\.settingsService) private var settings
 
     typealias Context = C
 
     func perform(with context: Context, completion: @escaping (_: RoutingResult) -> Void) {
-        guard SettingsService().getUser() == nil else {
+        guard settings.getUser() == nil else {
+            analytics.event(Event.Menu.profileOpen.rawValue)
             completion(.success)
             return
         }
 
-        let router = DefaultRouter()
         do {
-            try router.navigate(to: LoginConfiguration.loginScreen, with: nil, animated: true) { routingResult in
+            analytics.event(Event.Menu.loginOpen.rawValue)
+            try DefaultRouter().navigate(to: LoginConfiguration.loginScreen, with: nil, animated: true) { routingResult in
                 guard routingResult.isSuccessful,
                       let viewController = ClassFinder<LoginVC, Any?>().getViewController() else {
                     completion(.failure(RoutingError.compositionFailed(.init("LoginViewController was not found."))))

ForPDA/Sources/Application/SceneDelegate.swift

@@ -15,28 +15,20 @@ protocol RouteMapProtocol {
 
 struct RouteMap: RouteMapProtocol {
 
-    // MARK: - [TabBar]
-        
-    static var tabBarScreen: DestinationStep<PDATabBarController, Any?> {
-        StepAssembly(
-            finder: ClassFinder(), // В чем разница с <PDATabBarController, Any?>(options: .current, startingPoint: .root)?
-            factory: CompleteFactoryAssembly(factory: PDATabBarControllerFactory<PDATabBarController, Any?>())
-                .with(createNewsWithNavigationFactory(), using: PDATabBarController.add())
-                .with(createForumWithNavigationFactory(), using: PDATabBarController.add())
-                .with(createMenuWithNavigationFactory(), using: PDATabBarController.add())
-                .assemble())
-        .using(GeneralAction.replaceRoot())
-        .from(GeneralStep.root())
-        .assemble()
-    }
-    
     // MARK: - [News]
 
     static var newsScreen: DestinationStep<NewsVC, Any?> {
         StepAssembly(
-            finder: ClassFinder<NewsVC, Any?>(),
-            factory: NilFactory())
-        .from(tabBarScreen)
+            finder: ClassFinder(),
+            factory: NewsFactory()
+        )
+        .using(PDANavigationController.push())
+        .from(SingleContainerStep(
+            finder: NilFinder(),
+            factory: NavigationControllerFactory<PDANavigationController, Any?>())
+        )
+        .using(GeneralAction.replaceRoot())
+        .from(GeneralStep.root())
         .assemble()
     }
 
@@ -51,22 +43,23 @@ struct RouteMap: RouteMapProtocol {
         .assemble()
     }
 
-    // MARK: - [Forum]
-    
-    static var forumScreen: DestinationStep<ForumVC, Any?> {
-        StepAssembly(finder: ClassFinder<ForumVC, Any?>(),
-                     factory: NilFactory())
-        .from(tabBarScreen)
+    static var newArticleScreen: DestinationStep<NewArticleVC, Article> {
+        StepAssembly(
+            finder: ClassFinder<NewArticleVC, Article>(),
+            factory: NewArticleFactory())
+        .using(UINavigationController.push())
+        .from(newsScreen.expectingContainer())
         .assemble()
     }
 
     // MARK: - [Menu]
 
     static var menuScreen: DestinationStep<MenuVC, Any?> {
         StepAssembly(
-            finder: ClassFinder<MenuVC, Any?>(),
-            factory: NilFactory())
-        .from(tabBarScreen)
+            finder: ClassFinder(),
+            factory: MenuFactory())
+        .using(UINavigationController.push())
+        .from(newsScreen.expectingContainer())
         .assemble()
     }
 
@@ -79,7 +72,6 @@ struct RouteMap: RouteMapProtocol {
         .adding(LoginInterceptor())
         .using(UINavigationController.push())
         .from(menuScreen.expectingContainer())
-//        .from(GeneralStep.custom(using: ClassFinder<UINavigationController, Any?>()))
         .assemble()
     }
 
@@ -115,29 +107,3 @@ struct LoginConfiguration {
 //        .assemble()
 //    }
 }
-
-// MARK: - NavCon Factories
-
-extension RouteMap {
-    
-    static func createNewsWithNavigationFactory() -> CompleteFactory<NavigationControllerFactory<UINavigationController, Any?>> {
-        return CompleteFactoryAssembly(
-            factory: NavigationControllerFactory())
-        .with(NewsFactory(), using: UINavigationController.pushAsRoot())
-        .assemble()
-    }
-    
-    static func createForumWithNavigationFactory() -> CompleteFactory<NavigationControllerFactory<UINavigationController, Any?>> {
-        return CompleteFactoryAssembly(
-            factory: NavigationControllerFactory())
-        .with(ForumFactory(), using: UINavigationController.pushAsRoot())
-        .assemble()
-    }
-    
-    static func createMenuWithNavigationFactory() -> CompleteFactory<NavigationControllerFactory<UINavigationController, Any?>> {
-        return CompleteFactoryAssembly(
-            factory: NavigationControllerFactory())
-        .with(MenuFactory(), using: UINavigationController.pushAsRoot())
-        .assemble()
-    }
-}

ForPDA/Sources/Coordinator/LoginInterceptor.swift

@@ -9,5 +9,5 @@ import Foundation
 
 extension NSNotification.Name {
     static let userDidChange = Self(rawValue: "userDidChange")
-    static let darkThemeBackgroundColorDidChange = Self(rawValue: "darkThemeBackgroundColorDidChange")
+    static let nightModeBackgroundColorDidChange = Self(rawValue: "nightModeBackgroundColorDidChange")
 }