Merge pull request #17 from htmlprogrammist/develop

Release 2.3

Author: htmlprogrammist

Agenda.xcodeproj/project.pbxproj

@@ -9,6 +9,27 @@
 <key>orderHint</key>
 <integer>0</integer>
 </dict>
+<key>PlaygroundChart (Playground) 1.xcscheme</key>
+<dict>
+<key>isShown</key>
+<false/>
+<key>orderHint</key>
+<integer>2</integer>
+</dict>
+<key>PlaygroundChart (Playground) 2.xcscheme</key>
+<dict>
+<key>isShown</key>
+<false/>
+<key>orderHint</key>
+<integer>3</integer>
+</dict>
+<key>PlaygroundChart (Playground).xcscheme</key>
+<dict>
+<key>isShown</key>
+<false/>
+<key>orderHint</key>
+<integer>1</integer>
+</dict>
 </dict>
 <key>SuppressBuildableAutocreation</key>
 <dict>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>IDEDidComputeMac32BitWarning</key>
+<true/>
+</dict>
+</plist>

Agenda.xcodeproj/project.xcworkspace/xcuserdata/egbad.xcuserdatad/UserInterfaceState.xcuserstate

@@ -8,23 +8,36 @@
 import UIKit
 
 final class AppCoordinator {
- 
+ /// Service is used for using Core Data in the project
  public let coreDataManager = CoreDataManager(containerName: "Agenda")
+ /// View controllers to set in the tab bar controller
  public var viewControllers = [UIViewController]()
 
+ /// `UIWindow` of the application, provided from the SceneDelegate
  private let window: UIWindow
+ /// Root view controller of the application
  private let tabBarController = UITabBarController()
 
  init(window: UIWindow) {
  self.window = window
  }
 
+ /// This method setup tab bar controller with 3 modules and set root view controller for the `UIWindow`
  func start() {
  setupAgenda()
  setupHistory()
  setupSummary()
 
+ /// Setup tab bar appearence like in earlier versions of iOS, because in iOS 15 it does not look good
+ if #available(iOS 15.0, *) {
+ let appearance = UITabBarAppearance()
+ appearance.configureWithOpaqueBackground()
+ appearance.backgroundColor = .systemBackground
+ tabBarController.tabBar.standardAppearance = appearance
+ tabBarController.tabBar.scrollEdgeAppearance = appearance
+ }
  tabBarController.setViewControllers(viewControllers, animated: false)
+ 
  window.rootViewController = tabBarController
  window.makeKeyAndVisible()
  }
@@ -37,7 +50,6 @@ private extension AppCoordinator {
 
  let agendaViewController = createNavController(viewController: container.viewController, itemName: Labels.goals, itemImage: Icons.calendar)
  viewControllers.append(agendaViewController)
- subscribeToCoreDataManager(vc: container.viewController)
  }
 
  func setupHistory() {
@@ -46,27 +58,20 @@ private extension AppCoordinator {
 
  let historyViewController = createNavController(viewController: container.viewController, itemName: Labels.History.title, itemImage: Icons.history)
  viewControllers.append(historyViewController)
- subscribeToCoreDataManager(vc: container.viewController)
  }
 
  func setupSummary() {
  let context = SummaryContext(moduleOutput: nil, moduleDependency: coreDataManager)
  let container = SummaryContainer.assemble(with: context)
  let summaryViewController = createNavController(viewController: container.viewController, itemName: Labels.Summary.title, itemImage: Icons.summary)
  viewControllers.append(summaryViewController)
- subscribeToCoreDataManager(vc: container.viewController)
  }
 
+ /// Creates navigation controller and set tab bar item to it
  func createNavController(viewController: UIViewController, itemName: String, itemImage: UIImage) -> UINavigationController {
-
  let navController = UINavigationController(rootViewController: viewController)
  navController.tabBarItem = UITabBarItem(title: itemName, image: itemImage, tag: 0)
  navController.navigationBar.prefersLargeTitles = true
  return navController
  }
- 
- func subscribeToCoreDataManager(vc: UIViewController) {
- guard let vc = vc as? CoreDataManagerDelegate else { return }
- coreDataManager.viewControllers.append(vc)
- }
 }

Agenda.xcodeproj/xcuserdata/egbad.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -8,6 +8,7 @@
 import Foundation
 
 extension Date {
+ /// Format date with format `dd.MM.yyyy` to the provided template with the first capitalized letter
  func formatTo(_ template: String) -> String {
  let dateFormatter = DateFormatter()
  dateFormatter.dateFormat = "dd.MM.yyyy"

Agenda.xcworkspace/contents.xcworkspacedata

@@ -8,11 +8,11 @@
 import Foundation
 
 extension String {
- // For simplify localizing texts in the whole application
+ /// For simplify localizing texts in the whole application
  var localized: String {
  NSLocalizedString(self, comment: "")
  }
- 
+ /// Capitalizes first letter of the string
  func capitalizingFirstLetter() -> String {
  return prefix(1).uppercased() + self.lowercased().dropFirst()
  }