-
Notifications
You must be signed in to change notification settings - Fork 593
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #772 from badoo/unify-tree
Unify tree
- Loading branch information
Showing
17 changed files
with
921 additions
and
918 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 0 additions & 37 deletions
37
ChattoAdditions/sources/Chat Items/Composable/ContainerViewProtocols.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,11 @@ | ||
|
|
||
| import UIKit | ||
|
|
||
| // MARK: - Single | ||
|
|
||
| public protocol SingleContainerViewProtocol { | ||
| func add(child view: UIView) | ||
| } | ||
|
|
||
| public struct DefaultSingleViewComposition<View: SingleContainerViewProtocol>: SingleViewComposition { | ||
| init() {} | ||
| public func add(child: UIView, to parent: View) { | ||
| parent.add(child: child) | ||
| } | ||
| } | ||
|
|
||
| extension ViewAssembler { | ||
| public mutating func register<Key: BindingKeyProtocol>(child: AnyBindingKey, parent: Key) | ||
| where Key.View: SingleContainerViewProtocol { | ||
| self.register(viewComposition: DefaultSingleViewComposition(), key: child, to: parent) | ||
| } | ||
|
|
||
| public mutating func register<Child: BindingKeyProtocol, Parent: BindingKeyProtocol>(child: Child, parent: Parent) | ||
| where Parent.View: SingleContainerViewProtocol { | ||
| self.register(child: .init(child), parent: parent) | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Multiple | ||
|
|
||
| public protocol MultipleContainerViewProtocol { | ||
| func add(children: [UIView]) | ||
| } | ||
|
|
||
| public struct DefaultMultipleViewComposition<View: MultipleContainerViewProtocol>: MultipleViewComposition { | ||
| init() {} | ||
| public func add(children: [UIView], to parent: View) { | ||
| parent.add(children: children) | ||
| } | ||
| } | ||
|
|
||
| extension ViewAssembler { | ||
| public mutating func register<Key: BindingKeyProtocol>(children: [AnyBindingKey], parent: Key) | ||
| where Key.View: MultipleContainerViewProtocol { | ||
| self.register(viewComposition: DefaultMultipleViewComposition(), keys: children, to: parent) | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
ChattoAdditions/sources/Chat Items/Composable/MessageViewHierarchy.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // | ||
| // The MIT License (MIT) | ||
| // | ||
| // Copyright (c) 2015-present Badoo Trading Limited. | ||
| // | ||
| // 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. | ||
|
|
||
|
|
||
| public struct MessageViewHierarchy { | ||
|
|
||
| // MARK: - Type Declarations | ||
|
|
||
| public enum Children { | ||
| case no | ||
| case single(AnyBindingKey) | ||
| case multiple([AnyBindingKey]) | ||
| } | ||
|
|
||
| enum AddError: Error { | ||
| case alreadyRegistered | ||
| } | ||
|
|
||
| // MARK: - Private properties | ||
|
|
||
| private var registeredChildren: [AnyBindingKey: Children] = [:] | ||
|
|
||
| // MARK: - Instantiation | ||
|
|
||
| public init(root: AnyBindingKey) { | ||
| self.root = root | ||
| } | ||
|
|
||
| // MARK: - Public API | ||
|
|
||
| // MARK: Registration | ||
|
|
||
| public mutating func add<ParentKey: BindingKeyProtocol>(child: AnyBindingKey, to parent: ParentKey) throws where ParentKey.View: SingleContainerViewProtocol { | ||
| try self.register(children: .single(child), to: parent) | ||
| } | ||
|
|
||
| public mutating func add<ParentKey: BindingKeyProtocol>(children: [AnyBindingKey], to parent: ParentKey) throws where ParentKey.View: MultipleContainerViewProtocol { | ||
| try self.register(children: .multiple(children), to: parent) | ||
| } | ||
|
|
||
| // MARK: Fetching | ||
|
|
||
| public let root: AnyBindingKey | ||
|
|
||
| public func children(of parent: AnyBindingKey) throws -> Children { | ||
| self.registeredChildren[parent] ?? .no | ||
| } | ||
|
|
||
| public func allRegistrations() -> [AnyBindingKey: Children] { self.registeredChildren } | ||
|
|
||
| // MARK: - Private methods | ||
|
|
||
| private mutating func register<ParentKey: BindingKeyProtocol>(children: Children, to parent: ParentKey) throws { | ||
| let erasedParent = AnyBindingKey(parent) | ||
| guard self.registeredChildren[erasedParent] == nil else { throw AddError.alreadyRegistered } | ||
| self.registeredChildren[erasedParent] = children | ||
| } | ||
| } | ||
|
|
||
| // Convenience | ||
| extension MessageViewHierarchy { | ||
|
|
||
| public mutating func add<ChildKey: BindingKeyProtocol, ParentKey: BindingKeyProtocol>(child: ChildKey, to parent: ParentKey) throws where ParentKey.View: SingleContainerViewProtocol { | ||
| try self.add(child: .init(child), to: parent) | ||
| } | ||
|
|
||
| public init<Key: BindingKeyProtocol>(root: Key) { | ||
| self.init(root: .init(root)) | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.