Reduce dependencies

README.md

@@ -41,11 +41,7 @@ Sample iOS app written the way I write iOS apps because I cannot share the app I
 
 - [RxSwift](https://github.com/ReactiveX/RxSwift) - Reactive Programming in Swift
 - [RxSwiftExt](https://github.com/RxSwiftCommunity/RxSwiftExt) - A collection of Rx operators & tools not found in the core RxSwift distribution
-- [Swinject](https://github.com/Swinject/Swinject) - Dependency injection framework for Swift
-- [Reusable](https://github.com/AliSoftware/Reusable) - A Swift mixin for reusing views easily and in a type-safe way
-- [Nuke](https://github.com/kean/Nuke) - A powerful image loading and caching system
 - [FeedKit](https://github.com/nmdias/FeedKit) - An RSS, Atom and JSON Feed parser written in Swift
-- [NotificationBanner](https://github.com/Daltron/NotificationBanner) - The easiest way to display highly customizable in app notification banners in iOS
 - [SwiftLint](https://github.com/realm/SwiftLint) - A tool to enforce Swift style and conventions
 
 ## Author

Sources/iOSSampleApp.xcodeproj/xcshareddata/xcschemes/iOSSampleApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1630"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Sources/iOSSampleApp/AppDelegate.swift

@@ -6,19 +6,18 @@
 //  Copyright © 2017 Igor Kulman. All rights reserved.
 //
 
-import Swinject
 import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
-    internal let container = Container()
+    private var container: Container!
 
     private var appCoordinator: AppCoordinator!
 
     func application(_: UIApplication, willFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
-        setupDependencies()
+        container = Container()
 
         return true
     }

Sources/iOSSampleApp/Container.swift

@@ -0,0 +1,72 @@
+//
+//  AppContainer.swift
+//  iOSSampleApp
+//
+//  Created by Igor Kulman on 27.05.2025.
+//  Copyright © 2025 Igor Kulman. All rights reserved.
+//
+
+import Foundation
+import OSLog
+
+final class Container {
+
+    init() {
+        Logger.appFlow.debug("Registering dependencies")
+        #if DEBUG
+        if ProcessInfo().arguments.contains("testMode") {
+            Logger.appFlow.debug("Running in UI tests, deleting selected source to start clean")
+            settingsService.selectedSource = nil
+        }
+        #endif
+    }
+
+    // MARK: - Services
+
+    lazy var dataService: DataService = RssDataService()
+    lazy var settingsService: SettingsService = UserDefaultsSettingsService()
+
+    // MARK: - ViewModels
+
+    func makeSourceSelectionViewModell() -> SourceSelectionViewModel {
+        SourceSelectionViewModel(settingsService: settingsService)
+    }
+
+    func makeCustomSourceViewModel() -> CustomSourceViewModel {
+        CustomSourceViewModel()
+    }
+
+    func makeFeedViewModel() -> FeedViewModel {
+        FeedViewModel(dataService: dataService, settingsService: settingsService)
+    }
+
+    func makeLibrariesViewModel() -> LibrariesViewModel {
+        LibrariesViewModel()
+    }
+
+    func makeAboutViewModel() -> AboutViewModel {
+        AboutViewModel()
+    }
+
+    // MARK: - ViewControllers
+
+    func makeSourceSelectionViewController() -> SourceSelectionViewController {
+        SourceSelectionViewController(viewModel: makeSourceSelectionViewModell())
+    }
+
+    func makeCustomSourceViewController() -> CustomSourceViewController {
+        CustomSourceViewController(viewModel: makeCustomSourceViewModel())
+    }
+
+    func makeFeedViewController() -> FeedViewController {
+        FeedViewController(viewModel: makeFeedViewModel())
+    }
+
+    func makeLibrariesViewController() -> LibrariesViewController {
+        LibrariesViewController(viewModel: makeLibrariesViewModel())
+    }
+
+    func makeAboutViewController() -> AboutViewController {
+        AboutViewController(viewModel: makeAboutViewModel())
+    }
+}

Sources/iOSSampleApp/Data/Licenses.plist

@@ -2,62 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <array>
-	<dict>
-		<key>license</key>
-		<string>MIT License</string>
-		<key>text</key>
-		<string>The MIT License (MIT)
-
-Copyright (c) 2016 AliSoftware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</string>
-		<key>title</key>
-		<string>Reusable</string>
-	</dict>
-	<dict>
-		<key>license</key>
-		<string>MIT License</string>
-		<key>text</key>
-		<string>Copyright (c) 2017-2023 Daltron &lt;daltonhint4@gmail.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-</string>
-		<key>title</key>
-		<string>NotificationBanner</string>
-	</dict>
 	<dict>
 		<key>license</key>
 		<string>MIT License</string>
@@ -66,11 +10,11 @@ THE SOFTWARE.
 **Copyright © 2015 Krunoslav Zaher, Shai Mishali**
 **All rights reserved.**
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </string>
 		<key>title</key>
 		<string>RxSwift</string>
@@ -82,7 +26,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 		<string>Copyright (c) 2016-latest RxSwiftCommunity https://github.com/RxSwiftCommunity
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+of this software and associated documentation files (the &quot;Software&quot;), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -91,7 +35,7 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
@@ -108,95 +52,10 @@ THE SOFTWARE.
 		<key>text</key>
 		<string>The MIT License (MIT)
 
-Copyright (c) 2015 Swinject Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</string>
-		<key>title</key>
-		<string>Swinject</string>
-	</dict>
-	<dict>
-		<key>license</key>
-		<string>MIT License</string>
-		<key>text</key>
-		<string>Copyright (c) 2016 Swinject Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-</string>
-		<key>title</key>
-		<string>SwinjectAutoregistration</string>
-	</dict>
-	<dict>
-		<key>license</key>
-		<string>MIT License</string>
-		<key>text</key>
-		<string>The MIT License (MIT)
-
-Copyright (c) 2015-2024 Alexander Grebenyuk
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-</string>
-		<key>title</key>
-		<string>Nuke</string>
-	</dict>
-	<dict>
-		<key>license</key>
-		<string>MIT License</string>
-		<key>text</key>
-		<string>The MIT License (MIT)
-
 Copyright (c) 2016 - 2018 Nuno Manuel Dias
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
+of this software and associated documentation files (the &quot;Software&quot;), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -205,7 +64,7 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

Sources/iOSSampleApp/Scenarios/About/Cells/AboutCell.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Reusable
 import UIKit
 
 final class AboutCell: UITableViewCell, Reusable {

Sources/iOSSampleApp/Scenarios/About/Cells/LibraryCell.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Reusable
 import UIKit
 
 final class LibraryCell: UITableViewCell, Reusable {

Sources/iOSSampleApp/Scenarios/About/Coordinators/AboutCoordinator.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import SafariServices
-import Swinject
 import UIKit
 
 protocol AboutCoordinatorDelegate: AnyObject {
@@ -23,7 +22,7 @@ final class AboutCoordinator: NavigationCoordinator {
     // MARK: - Properties
 
     let navigationController: UINavigationController
-    let container: Container
+    private let container: Container
     weak var delegate: AboutCoordinatorDelegate?
 
     init(container: Container, navigationController: UINavigationController) {
@@ -37,7 +36,7 @@ final class AboutCoordinator: NavigationCoordinator {
      Starts the Abotu flow by showing the basic info and additional menu items
      */
     func start() {
-        let aboutViewController = container.resolve(AboutViewController.self)! &> {
+        let aboutViewController = container.makeAboutViewController() &> {
             $0.delegate = self
         }
         navigationController.setBackButton()
@@ -48,7 +47,7 @@ final class AboutCoordinator: NavigationCoordinator {
      Shows the list of open source libraries used by the app
      */
     private func showLibraries() {
-        let librariesViewController = container.resolve(LibrariesViewController.self)!
+        let librariesViewController = container.makeLibrariesViewController()
         navigationController.pushViewController(librariesViewController, animated: true)
     }
 

Sources/iOSSampleApp/Scenarios/Common/Coordinators/AppCoordinator.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import OSLog
-import Swinject
 import UIKit
 
 enum AppChildCoordinator {
@@ -24,7 +23,7 @@ final class AppCoordinator: Coordinator {
     // MARK: - Properties
 
     private let window: UIWindow
-    let container: Container
+    private let container: Container
     private var childCoordinators = [AppChildCoordinator: Coordinator]()
     private let settingsService: SettingsService
     private let navigationController: UINavigationController
@@ -46,7 +45,7 @@ final class AppCoordinator: Coordinator {
             $0.navigationBar.scrollEdgeAppearance = $0.navigationBar.standardAppearance
         }
 
-        settingsService = self.container.resolve(SettingsService.self)!
+        settingsService = container.settingsService
 
         self.window.rootViewController = navigationController
     }