Merge remote-tracking branch 'origin/main' into binding-store

Author: stephencelis

Examples/Standups/Dependencies/DataManager.swift

@@ -42,8 +42,8 @@ extension DataManager {
   }
 
   static let failToWrite = Self(
-    load: { url in Data() },
-    save: { data, url in
+    load: { _ in Data() },
+    save: { _, _ in
       struct SaveError: Error {}
       throw SaveError()
     }
@@ -54,6 +54,6 @@ extension DataManager {
       struct LoadError: Error {}
       throw LoadError()
     },
-    save: { newData, url in }
+    save: { _, _ in }
   )
 }

Examples/Standups/README.md

@@ -12,7 +12,7 @@ The inspiration for this application comes Apple's [Scrumdinger][scrumdinger] tu
 > that shows the time remaining in the meeting and creates a transcript that users can refer to
 > later.
 
-The Scrumdinger app is one of Apple's most interesting code samples as it deals with many real world
+The Scrumdinger app is one of Apple's most interesting code samples as it deals with many real
 world problems that one faces in application development. It shows off many types of navigation,
 it deals with complex effects such as timers and speech recognition, and it persists application
 data to disk.
@@ -34,10 +34,10 @@ modern, best practices for SwiftUI development. We faithfully recreate the Scrum
 some key additions:
 
  1. Identifiers are made type safe using our [Tagged library][tagged-gh]. This prevents us from
-    writing non-sensical code, such as comparing a `Standup.ID` to a `Attendee.ID`.
+    writing nonsensical code, such as comparing a `Standup.ID` to a `Attendee.ID`.
  2. Instead of using bare arrays in feature logic we use an "identified" array from our
     [IdentifiedCollections][identified-collections-gh] library. This allows you to read and modify
-    elements of the collection via their ID rather than positional index, which can be error prone
+    elements of the collection via their ID rather than positional index, which can be error-prone
     and lead to bugs or crashes.
  3. _All_ navigation is driven off of state, including sheets, drill-downs and alerts. This makes
     it possible to deep link into any screen of the app by just constructing a piece of state and
@@ -61,4 +61,4 @@ some key additions:
 [scrumdinger-dl]: https://docs-assets.developer.apple.com/published/1ea2eec121b90031e354288912a76357/TranscribingSpeechToText.zip
 [tagged-gh]: http://github.com/pointfreeco/swift-tagged
 [identified-collections-gh]: http://github.com/pointfreeco/swift-identified-collections 
-[dependencies-gh]: http://github.com/pointfreeco/swift-dependencies 
+[dependencies-gh]: http://github.com/pointfreeco/swift-dependencies 

README.md

@@ -613,6 +613,7 @@ The following translations of this README have been contributed by members of th
 
 * [Arabic](https://gist.github.com/NorhanBoghdadi/1b98d55c02b683ddef7e05c2ebcccd47)
 * [French](https://gist.github.com/nikitamounier/0e93eb832cf389db12f9a69da030a2dc)
+* [Hindi](https://gist.github.com/akashsoni01/b358ee0b3b747167964ef6946123c88d)
 * [Indonesian](https://gist.github.com/wendyliga/792ea9ac5cc887f59de70a9e39cc7343)
 * [Italian](https://gist.github.com/Bellaposa/5114e6d4d55fdb1388e8186886d48958)
 * [Japanese](https://gist.github.com/kalupas226/bdf577e4a7066377ea0a8aaeebcad428)

Sources/ComposableArchitecture/Documentation.docc/Articles/StackBasedNavigation.md

@@ -7,7 +7,7 @@ model your domains, how to integrate features, how to test your features, and mo
 
 Stack-based navigation is the process of modeling navigation using collections of state. This style
 of navigation allows you to deep-link into any state of your application by simply constructing a
-flat collection of data, handing, handing it off to SwiftUI, and letting it take care of the rest.
+flat collection of data, handing it off to SwiftUI, and letting it take care of the rest.
 It also allows for complex and recursive navigation paths in your application.
 
   * [Basics](#Basics)
@@ -102,7 +102,7 @@ struct RootFeature: ReducerProtocol {
 
 That completes the steps to integrate the child and parent features together for a navigation stack.
 
-Next we must integrate the child and parent views together. This is done by construct a special
+Next we must integrate the child and parent views together. This is done by constructing a special
 version of SwiftUI's `NavigationStack` view that comes with this library, called 
 ``NavigationStackStore``. This view takes 3 arguments: a store focused in on ``StackState``
 and ``StackAction`` in your domain, a trailing view builder for the root view of the stack, and

Sources/ComposableArchitecture/Documentation.docc/Articles/WhatIsNavigation.md

@@ -273,7 +273,7 @@ few bugs in `NavigationStack`, but on average it is a lot more stable.
 
   * Stack-based navigation is not a concise tool. It makes it possible to expressive navigation
     paths that are completely non-sensical. For example, even though it only makes sense to navigate
-    to an edit screen from an edit screen, in a stack it would be possible to present the features
+    to an edit screen from a detail screen, in a stack it would be possible to present the features
     in the reverse order:
 
     ```swift

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/01-YourFirstPresentation/02-01-01-code-0000.swift

@@ -1,3 +1,4 @@
+import Foundation
 import ComposableArchitecture
 
 struct Contact: Equatable, Identifiable {
@@ -9,7 +10,7 @@ struct ContactsFeature: ReducerProtocol {
   struct State: Equatable {
     var contacts: IdentifiedArrayOf<Contact> = []
   }
-  enum Action {
+  enum Action: Equatable {
     case addButtonTapped
   }
   var body: some ReducerProtocolOf<Self> {

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/01-YourFirstPresentation/02-01-01-code-0003.swift

@@ -4,7 +4,7 @@ struct AddContactFeature: ReducerProtocol {
   struct State: Equatable {
     var contact: Contact
   }
-  enum Action {
+  enum Action: Equatable {
     case cancelButtonTapped
     case saveButtonTapped
     case setName(String)

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/01-YourFirstPresentation/02-01-02-code-0000.swift

@@ -2,7 +2,7 @@ struct ContactsFeature: ReducerProtocol {
   struct State: Equatable {
     var contacts: IdentifiedArrayOf<Contact> = []
   }
-  enum Action {
+  enum Action: Equatable {
     case addButtonTapped
   }
   var body: some ReducerProtocolOf<Self> {

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/01-YourFirstPresentation/02-01-02-code-0001.swift

@@ -3,7 +3,7 @@ struct ContactsFeature: ReducerProtocol {
     @PresentationState var addContact: AddContactFeature.State?
     var contacts: IdentifiedArrayOf<Contact> = []
   }
-  enum Action {
+  enum Action: Equatable {
     case addButtonTapped
   }
   var body: some ReducerProtocolOf<Self> {

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/01-YourFirstPresentation/02-01-02-code-0002.swift

@@ -3,7 +3,7 @@ struct ContactsFeature: ReducerProtocol {
     @PresentationState var addContact: AddContactFeature.State?
     var contacts: IdentifiedArrayOf<Contact> = []
   }
-  enum Action {
+  enum Action: Equatable {
     case addButtonTapped
     case addContact(PresentationAction<AddContactFeature.Action>)
   }