wbrawner/twigs-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to new App struct

Browse source
This commit is contained in:
William Brawner 2021-10-28 18:08:09 -06:00
parent b8d1178a0e
commit 4b0fb507b4
4 changed files with 48 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Twigs/AppDelegate.swift
View file

@ -1,52 +0,0 @@
//
// AppDelegate.swift
// Budget
//
// Created by Billy Brawner on 9/25/19.
// Copyright © 2019 William Brawner. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
override var keyCommands: [UIKeyCommand]? {
return [
UIKeyCommand(title: "First Tab", action: #selector(handleKeyCommand(sender:)), input: "1", modifierFlags: .command, propertyList: 0),
UIKeyCommand(title: "Second Tab", action: #selector(handleKeyCommand(sender:)), input: "2", modifierFlags: .command, propertyList: 1),
UIKeyCommand(title: "Third Tab", action: #selector(handleKeyCommand(sender:)), input: "3", modifierFlags: .command, propertyList: 2),
UIKeyCommand(title: "Fourth Tab", action: #selector(handleKeyCommand(sender:)), input: "4", modifierFlags: .command, propertyList: 3),
UIKeyCommand(title: "Fifth Tab", action: #selector(handleKeyCommand(sender:)), input: "5", modifierFlags: .command, propertyList: 4),
]
}
@objc func handleKeyCommand(sender: UIKeyCommand) {
if let tabTag = sender.propertyList as? Int {
NotificationCenter.default.post(name: .init("switchTabs"), object: tabTag)
}
}
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
// MARK: UISceneSession Lifecycle
func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
// Called when a new scene session is being created.
// Use this method to select a configuration to create the new scene with.
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
}
func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
// Called when the user discards a scene session.
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
}
}

5
Twigs/Network/TwigsApiService.swift
View file

@ -211,11 +211,10 @@ class TwigsApiService {
class RequestHelper {
let decoder = JSONDecoder()
let baseUrl: String
var baseUrl: String = "https://twigs.wbrawner.com"
var token: String?
init(_ baseUrl: String) {
self.baseUrl = baseUrl
init() {
self.decoder.dateDecodingStrategy = .formatted(Date.iso8601DateFormatter)
}

91
Twigs/SceneDelegate.swift
View file

@ -1,91 +0,0 @@
//
// SceneDelegate.swift
// Budget
//
// Created by Billy Brawner on 9/25/19.
// Copyright © 2019 William Brawner. All rights reserved.
//
import UIKit
import SwiftUI
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
#if DEBUG
// Uncomment this for local development
// static let baseUrl = "http://localhost:8080"
static let baseUrl = "https://twigs.wbrawner.com"
#else
static let baseUrl = "https://twigs.wbrawner.com"
#endif
var window: UIWindow?
let dataStoreProvider: DataStoreProvider
override init() {
// TODO: Dependency injection?
let requestHelper = RequestHelper(SceneDelegate.baseUrl)
let cacheService = TwigsInMemoryCacheService()
let apiService = TwigsApiService(requestHelper)
let budgetRepository = NetworkBudgetRepository(apiService, cacheService: cacheService)
let categoryRepository = NetworkCategoryRepository(apiService, cacheService: cacheService)
let transactionRepository = NetworkTransactionRepository(apiService)
let userRepository = NetworkUserRepository(apiService)
dataStoreProvider = DataStoreProvider(
budgetRepository: budgetRepository,
categoryRepository: categoryRepository,
transactionRepository: transactionRepository,
userRepository: userRepository
)
super.init()
}
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
// This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
// Create the SwiftUI view that provides the window contents.
let contentView = ContentView()
.environmentObject(dataStoreProvider.authenticationDataStore())
.environmentObject(dataStoreProvider.budgetsDataStore())
.environmentObject(dataStoreProvider.categoryDataStore())
.environmentObject(dataStoreProvider.transactionDataStore())
.environmentObject(dataStoreProvider.userDataStore())
// Use a UIHostingController as window root view controller.
if let windowScene = scene as? UIWindowScene {
let window = UIWindow(windowScene: windowScene)
window.rootViewController = UIHostingController(rootView: contentView)
self.window = window
window.makeKeyAndVisible()
}
}
func sceneDidDisconnect(_ scene: UIScene) {
// Called as the scene is being released by the system.
// This occurs shortly after the scene enters the background, or when its session is discarded.
// Release any resources associated with this scene that can be re-created the next time the scene connects.
// The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead).
}
func sceneDidBecomeActive(_ scene: UIScene) {
// Called when the scene has moved from an inactive state to an active state.
// Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
}
func sceneWillResignActive(_ scene: UIScene) {
// Called when the scene will move from an active state to an inactive state.
// This may occur due to temporary interruptions (ex. an incoming phone call).
}
func sceneWillEnterForeground(_ scene: UIScene) {
// Called as the scene transitions from the background to the foreground.
// Use this method to undo the changes made on entering the background.
}
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.
}
}

46
Twigs/TwigsApp.swift Normal file
View file

@ -0,0 +1,46 @@
//
// TwigsApp.swift
// Twigs
//
// Created by William Brawner on 10/28/21.
// Copyright © 2021 William Brawner. All rights reserved.
//
import SwiftUI
@main
struct TwigsApp: App {
let requestHelper = RequestHelper()
let cacheService = TwigsInMemoryCacheService()
let apiService: TwigsApiService
let budgetRepository: BudgetRepository
let categoryRepository: CategoryRepository
let transactionRepository:TransactionRepository
let userRepository: UserRepository
let dataStoreProvider: DataStoreProvider
init() {
self.apiService = TwigsApiService(requestHelper)
self.budgetRepository = NetworkBudgetRepository(apiService, cacheService: cacheService)
self.categoryRepository = NetworkCategoryRepository(apiService, cacheService: cacheService)
self.transactionRepository = NetworkTransactionRepository(apiService)
self.userRepository = NetworkUserRepository(apiService)
self.dataStoreProvider = DataStoreProvider(
budgetRepository: budgetRepository,
categoryRepository: categoryRepository,
transactionRepository: transactionRepository,
userRepository: userRepository
)
}
var body: some Scene {
WindowGroup {
ContentView()
.environmentObject(dataStoreProvider.authenticationDataStore())
.environmentObject(dataStoreProvider.budgetsDataStore())
.environmentObject(dataStoreProvider.categoryDataStore())
.environmentObject(dataStoreProvider.transactionDataStore())
.environmentObject(dataStoreProvider.userDataStore())
}
}
}