diff --git a/Other Projects/2048 Game/SwiftUI2048/AppDelegate.swift b/Other Projects/2048 Game/SwiftUI2048/AppDelegate.swift index 781b8fa..8cfeec7 100755 --- a/Other Projects/2048 Game/SwiftUI2048/AppDelegate.swift +++ b/Other Projects/2048 Game/SwiftUI2048/AppDelegate.swift @@ -38,14 +38,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate { gameLogic.newGame() } - override func buildCommands(with builder: UICommandBuilder) { + override func buildMenu(with builder: UIMenuBuilder) { builder.remove(menu: .edit) builder.remove(menu: .format) builder.remove(menu: .view) builder.replaceChildren(ofMenu: .file) { oldChildren in var newChildren = oldChildren - let newGameItem = UIMutableKeyCommand(input: "N", + let newGameItem = UIKeyCommand(input: "N", modifierFlags: .command, action: #selector(newGame(_:))) newGameItem.title = "New Game" diff --git a/Other Projects/2048 Game/SwiftUI2048/Models/GameLogic.swift b/Other Projects/2048 Game/SwiftUI2048/Models/GameLogic.swift index 1b1995d..c1fb464 100755 --- a/Other Projects/2048 Game/SwiftUI2048/Models/GameLogic.swift +++ b/Other Projects/2048 Game/SwiftUI2048/Models/GameLogic.swift @@ -21,7 +21,7 @@ final class GameLogic : BindableObject { typealias BlockMatrixType = BlockMatrix - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() fileprivate var _blockMatrix: BlockMatrixType! var blockMatrix: BlockMatrixType { @@ -42,12 +42,12 @@ final class GameLogic : BindableObject { _blockMatrix = BlockMatrixType() generateNewBlocks() - didChange.send(self) + willChange.send(self) } func move(_ direction: Direction) { defer { - didChange.send(self) + willChange.send(self) } var moved = false @@ -136,7 +136,7 @@ final class GameLogic : BindableObject { // Don't forget to sync data. defer { - didChange.send(self) + willChange.send(self) } // Place the first block. diff --git a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/HikeView.swift b/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/HikeView.swift index f4c02cc..b9964c7 100755 --- a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/HikeView.swift +++ b/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/HikeView.swift @@ -14,7 +14,7 @@ struct HikeView: View { var transition: AnyTransition { let insertion = AnyTransition.move(edge: .trailing) .combined(with: .opacity) - let removal = AnyTransition.scale() + let removal = AnyTransition.scale(scale: 0.0) .combined(with: .opacity) return .asymmetric(insertion: insertion, removal: removal) } diff --git a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..2fcfc3a 100755 --- a/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Animating Views And Transitions/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,17 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/FoundationExtensions.swift b/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/FoundationExtensions.swift index 72073c6..d744cac 100755 --- a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/FoundationExtensions.swift +++ b/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/FoundationExtensions.swift @@ -40,7 +40,7 @@ extension Publisher { extension Publisher { static func empty() -> AnyPublisher { - return Publishers.Empty() + return Empty() .eraseToAnyPublisher() } @@ -51,7 +51,7 @@ extension Publisher { } static func fail(_ error: Failure) -> AnyPublisher { - return Publishers.Fail(error: error) + return Fail(error: error) .eraseToAnyPublisher() } } diff --git a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserViewModel.swift b/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserViewModel.swift index 0b71bb6..1594c4f 100755 --- a/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserViewModel.swift +++ b/Other Projects/Combine using GitHub API/SwiftUI-Combine-Example/SearchUserViewModel.swift @@ -2,17 +2,17 @@ import SwiftUI import Combine final class SearchUserViewModel: BindableObject { - var didChange = PassthroughSubject() + var willChange = PassthroughSubject() private(set) var users = [User]() { didSet { - didChange.send(self) + willChange.send(self) } } private(set) var userImages = [User: UIImage]() { didSet { - didChange.send(self) + willChange.send(self) } } diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeView.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeView.swift index f4c02cc..b9964c7 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeView.swift +++ b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/HikeView.swift @@ -14,7 +14,7 @@ struct HikeView: View { var transition: AnyTransition { let insertion = AnyTransition.move(edge: .trailing) .combined(with: .opacity) - let removal = AnyTransition.scale() + let removal = AnyTransition.scale(scale: 0.0) .combined(with: .opacity) return .asymmetric(insertion: insertion, removal: removal) } diff --git a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..2fcfc3a 100755 --- a/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Composing Complex Interfaces/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,17 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift b/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift index f2fe47d..4504e19 100644 --- a/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift +++ b/Other Projects/Currency-SwiftUI/Currency-SwiftUI/UserData.swift @@ -52,26 +52,26 @@ struct UserDefaultValue { } final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() @UserDefaultValue(key: "allCurrencies", defaultValue: defaultCurrencies) var allCurrencies: [Currency] { didSet { - didChange.send(self) + willChange.send(self) } } @UserDefaultValue(key: "baseCurrency", defaultValue: defaultCurrencies[0]) var baseCurrency: Currency { didSet { - didChange.send(self) + willChange.send(self) } } @UserDefaultValue(key: "userCurrency", defaultValue: defaultCurrencies) var userCurrency: [Currency] { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..2fcfc3a 100755 --- a/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Drawing Paths And Shapes/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,17 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Example To-Do App/SwiftUITodo/UserData.swift b/Other Projects/Example To-Do App/SwiftUITodo/UserData.swift index 368e996..ee95b21 100755 --- a/Other Projects/Example To-Do App/SwiftUITodo/UserData.swift +++ b/Other Projects/Example To-Do App/SwiftUITodo/UserData.swift @@ -15,12 +15,12 @@ private let defaultTasks: [Task] = [ ] final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() @UserDefaultValue(key: "Tasks", defaultValue: defaultTasks) var tasks: [Task] { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Flux/SwiftUI-Flux/Store.swift b/Other Projects/Flux/SwiftUI-Flux/Store.swift index e425b2f..ed67948 100755 --- a/Other Projects/Flux/SwiftUI-Flux/Store.swift +++ b/Other Projects/Flux/SwiftUI-Flux/Store.swift @@ -4,7 +4,7 @@ import Combine final class Store: BindableObject { typealias Reducer = (State, Action) -> State - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var state: State { lock.lock() @@ -29,6 +29,6 @@ final class Store: BindableObject { lock.unlock() - didChange.send(newState) + willChange.send(newState) } } diff --git a/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/Extension/Publisher.Extension.swift b/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/Extension/Publisher.Extension.swift index 4ea80f8..0d3db76 100644 --- a/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/Extension/Publisher.Extension.swift +++ b/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/Extension/Publisher.Extension.swift @@ -19,7 +19,7 @@ extension Publisher { extension Publisher { static func empty() -> AnyPublisher { - return Publishers.Empty() + return Empty() .eraseToAnyPublisher() } @@ -30,7 +30,7 @@ extension Publisher { } static func fail(_ error: Failure) -> AnyPublisher { - return Publishers.Fail(error: error) + return Fail(error: error) .eraseToAnyPublisher() } } diff --git a/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/View/RepositoryListViewModel.swift b/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/View/RepositoryListViewModel.swift index 21a709a..403a8f6 100755 --- a/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/View/RepositoryListViewModel.swift +++ b/Other Projects/GitHub Search/GitHubSearchWithSwiftUI/View/RepositoryListViewModel.swift @@ -13,7 +13,7 @@ import SwiftUI final class RepositoryListViewModel: BindableObject { typealias SearchRepositories = (String) -> AnyPublisher, Never> - let didChange: AnyPublisher + let willChange: AnyPublisher private let _didChange = PassthroughSubject() private let _searchWithQuery = PassthroughSubject() @@ -34,7 +34,7 @@ final class RepositoryListViewModel: BindableObject { init(searchRepositories: @escaping SearchRepositories = RepositoryAPI.search, mainScheduler: S) { - self.didChange = _didChange.eraseToAnyPublisher() + self.willChange = _didChange.eraseToAnyPublisher() let response = _searchWithQuery .filter { !$0.isEmpty } diff --git a/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..2fcfc3a 100755 --- a/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Handling User Input/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,17 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeView.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeView.swift index f4c02cc..b9964c7 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeView.swift +++ b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/HikeView.swift @@ -14,7 +14,7 @@ struct HikeView: View { var transition: AnyTransition { let insertion = AnyTransition.move(edge: .trailing) .combined(with: .opacity) - let removal = AnyTransition.scale() + let removal = AnyTransition.scale(scale: 0.0) .combined(with: .opacity) return .asymmetric(insertion: insertion, removal: removal) } diff --git a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..2fcfc3a 100755 --- a/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Interfacing With UIKit/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,17 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift b/Other Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift index 1b14469..3dfa453 100755 --- a/Other Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift +++ b/Other Projects/Movie/MovieSwift/MovieSwift/flux/state/AppState.swift @@ -11,7 +11,7 @@ import SwiftUI import Combine final class AppState: BindableObject { - var didChange = PassthroughSubject() + var willChange = PassthroughSubject() var moviesState: MoviesState @@ -22,7 +22,7 @@ final class AppState: BindableObject { func dispatch(action: Action) { moviesState = MoviesStateReducer().reduce(state: moviesState, action: action) DispatchQueue.main.async { - self.didChange.send(self) + self.willChange.send(self) } } } diff --git a/Other Projects/SwiftUI + Redux/SwiftUIDemo/flux/states/AppState.swift b/Other Projects/SwiftUI + Redux/SwiftUIDemo/flux/states/AppState.swift index edbc377..48c5f04 100755 --- a/Other Projects/SwiftUI + Redux/SwiftUIDemo/flux/states/AppState.swift +++ b/Other Projects/SwiftUI + Redux/SwiftUIDemo/flux/states/AppState.swift @@ -11,7 +11,7 @@ import SwiftUI import Combine final class AppState: BindableObject { - var didChange = PassthroughSubject() + var willChange = PassthroughSubject() var usersState: UsersState @@ -21,7 +21,7 @@ final class AppState: BindableObject { func dispatch(action: Action) { usersState = UserStateReducer().reduce(state: usersState, action: action) - didChange.send(self) + willChange.send(self) } } diff --git a/Other Projects/Time Travel/SwiftUITimeTravel/TimeTravelView/Store.swift b/Other Projects/Time Travel/SwiftUITimeTravel/TimeTravelView/Store.swift index 4fd94d5..c2bb509 100755 --- a/Other Projects/Time Travel/SwiftUITimeTravel/TimeTravelView/Store.swift +++ b/Other Projects/Time Travel/SwiftUITimeTravel/TimeTravelView/Store.swift @@ -6,7 +6,7 @@ public final class Store: BindableObject where StateType: StateMachin private let initialState: StateType private var subsequentStates: [StateType] = [] - public let didChange = PassthroughSubject() + public let willChange = PassthroughSubject() public init(state: StateType) { initialState = state @@ -23,7 +23,7 @@ public final class Store: BindableObject where StateType: StateMachin var currentStateIndex: Int = 0 { didSet { withAnimation { - didChange.send(()) + willChange.send(()) } } } diff --git a/Other Projects/UINote/SwiftUINote/Models/UserData.swift b/Other Projects/UINote/SwiftUINote/Models/UserData.swift index e2b09d8..5033cf2 100755 --- a/Other Projects/UINote/SwiftUINote/Models/UserData.swift +++ b/Other Projects/UINote/SwiftUINote/Models/UserData.swift @@ -10,11 +10,11 @@ import SwiftUI import Combine final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var notes = NoteData.shared.notes { didSet { - didChange.send(self) + willChange.send(self) NoteData.shared.notes = notes } } diff --git a/Other Projects/WWDCPlayer/WWDCPlayer/Model/UserData.swift b/Other Projects/WWDCPlayer/WWDCPlayer/Model/UserData.swift index 3ff20ee..76c8a20 100755 --- a/Other Projects/WWDCPlayer/WWDCPlayer/Model/UserData.swift +++ b/Other Projects/WWDCPlayer/WWDCPlayer/Model/UserData.swift @@ -9,23 +9,23 @@ import SwiftUI import Combine final class UserData: BindableObject { - let didChange = PassthroughSubject() + let willChange = PassthroughSubject() var showFavoriteOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var videos = videoList { didSet { - didChange.send(self) + willChange.send(self) } } var currentVideo = videoList[0] { didSet { - didChange.send(self) + willChange.send(self) } } } diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeView.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeView.swift index f4c02cc..b9964c7 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeView.swift +++ b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/HikeView.swift @@ -14,7 +14,7 @@ struct HikeView: View { var transition: AnyTransition { let insertion = AnyTransition.move(edge: .trailing) .combined(with: .opacity) - let removal = AnyTransition.scale() + let removal = AnyTransition.scale(scale: 0.0) .combined(with: .opacity) return .asymmetric(insertion: insertion, removal: removal) } diff --git a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Models/UserData.swift b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Models/UserData.swift index db31fb0..8d6fc5c 100755 --- a/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Models/UserData.swift +++ b/Other Projects/Working With UIControls/Complete/Landmarks/Landmarks/Models/UserData.swift @@ -9,17 +9,18 @@ import Combine import SwiftUI final class UserData: BindableObject { - let didChange = PassthroughSubject() + + let willChange = PassthroughSubject() var showFavoritesOnly = false { didSet { - didChange.send(self) + willChange.send(self) } } var landmarks = landmarkData { didSet { - didChange.send(self) + willChange.send(self) } } }