diff --git a/Chatto/Chatto.xcodeproj/project.pbxproj b/Chatto/Chatto.xcodeproj/project.pbxproj index 3d76448..498d6df 100644 --- a/Chatto/Chatto.xcodeproj/project.pbxproj +++ b/Chatto/Chatto.xcodeproj/project.pbxproj @@ -23,6 +23,7 @@ C36281EB1BF0F62F004D6BCE /* DummyChatItemPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36281EA1BF0F62F004D6BCE /* DummyChatItemPresenter.swift */; }; C36281ED1BF10086004D6BCE /* SerialTaskQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36281EC1BF10086004D6BCE /* SerialTaskQueue.swift */; }; C36281F21BF12A4B004D6BCE /* ChatCollectionViewLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36281F11BF12A4B004D6BCE /* ChatCollectionViewLayoutTests.swift */; }; + C38352D11CC6514B006C359C /* BaseChatViewController+AccessoryViewRevealer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38352D01CC6514B006C359C /* BaseChatViewController+AccessoryViewRevealer.swift */; }; C3C7C3971CAC4BAC00A49929 /* AccessoryViewRevealer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C7C3921CAC4BAC00A49929 /* AccessoryViewRevealer.swift */; }; C3C7C3981CAC4BAC00A49929 /* ChatCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C7C3931CAC4BAC00A49929 /* ChatCollectionViewLayout.swift */; }; C3C7C3991CAC4BAC00A49929 /* ChatDataSourceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C7C3941CAC4BAC00A49929 /* ChatDataSourceProtocol.swift */; }; @@ -64,6 +65,7 @@ C36281EA1BF0F62F004D6BCE /* DummyChatItemPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DummyChatItemPresenter.swift; sourceTree = ""; }; C36281EC1BF10086004D6BCE /* SerialTaskQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SerialTaskQueue.swift; sourceTree = ""; }; C36281F11BF12A4B004D6BCE /* ChatCollectionViewLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatCollectionViewLayoutTests.swift; sourceTree = ""; }; + C38352D01CC6514B006C359C /* BaseChatViewController+AccessoryViewRevealer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseChatViewController+AccessoryViewRevealer.swift"; sourceTree = ""; }; C3C7C3921CAC4BAC00A49929 /* AccessoryViewRevealer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessoryViewRevealer.swift; sourceTree = ""; }; C3C7C3931CAC4BAC00A49929 /* ChatCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatCollectionViewLayout.swift; sourceTree = ""; }; C3C7C3941CAC4BAC00A49929 /* ChatDataSourceProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatDataSourceProtocol.swift; sourceTree = ""; }; @@ -200,6 +202,7 @@ C36281E61BF0F196004D6BCE /* BaseChatViewController+Scrolling.swift */, C36281E41BF0F0F0004D6BCE /* BaseChatViewController+Changes.swift */, C3E904B11BE0509E00C662A2 /* BaseChatViewController+Presenters.swift */, + C38352D01CC6514B006C359C /* BaseChatViewController+AccessoryViewRevealer.swift */, ); path = ChatController; sourceTree = ""; @@ -340,6 +343,7 @@ C36281ED1BF10086004D6BCE /* SerialTaskQueue.swift in Sources */, C321DDAE1BE9649F00DE88CC /* ChatItemProtocolDefinitions.swift in Sources */, C36281E51BF0F0F0004D6BCE /* BaseChatViewController+Changes.swift in Sources */, + C38352D11CC6514B006C359C /* BaseChatViewController+AccessoryViewRevealer.swift in Sources */, C342D0BD1C638681008A4605 /* ChatItemCompanion.swift in Sources */, C36281E71BF0F196004D6BCE /* BaseChatViewController+Scrolling.swift in Sources */, C36281EB1BF0F62F004D6BCE /* DummyChatItemPresenter.swift in Sources */, diff --git a/Chatto/Source/ChatController/BaseChatViewController+AccessoryViewRevealer.swift b/Chatto/Source/ChatController/BaseChatViewController+AccessoryViewRevealer.swift new file mode 100644 index 0000000..7a8e4e4 --- /dev/null +++ b/Chatto/Source/ChatController/BaseChatViewController+AccessoryViewRevealer.swift @@ -0,0 +1,45 @@ +/* + 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. + */ + +import Foundation + +public extension BaseChatViewController { // Accessory view revealer + + public final var accessoryViewRevealerIsEnabled: Bool { + get { + return self.accessoryViewRevealer.isEnabled + } set { + self.accessoryViewRevealer.isEnabled = newValue + } + } + + public final var accessoryViewRevealerConfig: AccessoryViewRevealerConfig { + get { + return self.accessoryViewRevealer.config + } set { + self.accessoryViewRevealer.config = newValue + } + } + +} diff --git a/Chatto/Source/ChatController/BaseChatViewController.swift b/Chatto/Source/ChatController/BaseChatViewController.swift index a3c77a9..0175e47 100644 --- a/Chatto/Source/ChatController/BaseChatViewController.swift +++ b/Chatto/Source/ChatController/BaseChatViewController.swift @@ -29,12 +29,12 @@ public class BaseChatViewController: UIViewController, UICollectionViewDataSourc public typealias ChatItemCompanionCollection = ReadOnlyOrderedDictionary public struct Constants { - var updatesAnimationDuration: NSTimeInterval = 0.33 - var defaultContentInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0) - var defaultScrollIndicatorInsets = UIEdgeInsetsZero - var preferredMaxMessageCount: Int? = 500 // It not nil, will ask data source to reduce number of messages when limit is reached. @see ChatDataSourceDelegateProtocol - var preferredMaxMessageCountAdjustment: Int = 400 // When the above happens, will ask to adjust with this value. It may be wise for this to be smaller to reduce number of adjustments - var autoloadingFractionalThreshold: CGFloat = 0.05 // in [0, 1] + public var updatesAnimationDuration: NSTimeInterval = 0.33 + public var defaultContentInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0) + public var defaultScrollIndicatorInsets = UIEdgeInsetsZero + public var preferredMaxMessageCount: Int? = 500 // It not nil, will ask data source to reduce number of messages when limit is reached. @see ChatDataSourceDelegateProtocol + public var preferredMaxMessageCountAdjustment: Int = 400 // When the above happens, will ask to adjust with this value. It may be wise for this to be smaller to reduce number of adjustments + public var autoloadingFractionalThreshold: CGFloat = 0.05 // in [0, 1] } public var constants = Constants() @@ -228,7 +228,6 @@ public class BaseChatViewController: UIViewController, UICollectionViewDataSourc var layoutModel = ChatCollectionViewLayoutModel.createModel(0, itemsLayoutData: []) - // MARK: Subclass overrides public func createPresenterFactory() -> ChatItemPresenterFactoryProtocol { diff --git a/Chatto/Source/ChatController/Collaborators/AccessoryViewRevealer.swift b/Chatto/Source/ChatController/Collaborators/AccessoryViewRevealer.swift index 57dc229..e6dc9d1 100644 --- a/Chatto/Source/ChatController/Collaborators/AccessoryViewRevealer.swift +++ b/Chatto/Source/ChatController/Collaborators/AccessoryViewRevealer.swift @@ -29,6 +29,24 @@ public protocol AccessoryViewRevealable { func preferredOffsetToRevealAccessoryView() -> CGFloat? // This allows to sync size in case cells have different sizes for the accessory view. Nil -> no restriction } +public struct AccessoryViewRevealerConfig { + public let angleThresholdInRads: CGFloat + public let translationTransform: (rawTranslation: CGFloat) -> CGFloat + public init(angleThresholdInRads: CGFloat, translationTransform: (rawTranslation: CGFloat) -> CGFloat) { + self.angleThresholdInRads = angleThresholdInRads + self.translationTransform = translationTransform + } + + public static func defaultConfig() -> AccessoryViewRevealerConfig { + return self.init( + angleThresholdInRads: 0.0872665, // ~5 degrees + translationTransform: { (rawTranslation) -> CGFloat in + let threshold: CGFloat = 30 + return max(0, rawTranslation - threshold) / 2 + }) + } +} + class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate { private let panRecognizer: UIPanGestureRecognizer = UIPanGestureRecognizer() @@ -42,6 +60,19 @@ class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate { self.panRecognizer.delegate = self } + deinit { + self.panRecognizer.delegate = nil + self.collectionView.removeGestureRecognizer(self.panRecognizer) + } + + var isEnabled: Bool = true { + didSet { + self.panRecognizer.enabled = self.isEnabled + } + } + + var config = AccessoryViewRevealerConfig.defaultConfig() + @objc private func handlePan(panRecognizer: UIPanGestureRecognizer) { switch panRecognizer.state { @@ -49,7 +80,7 @@ class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate { break case .Changed: let translation = panRecognizer.translationInView(self.collectionView) - self.revealAccessoryView(atOffset: -translation.x) + self.revealAccessoryView(atOffset: self.config.translationTransform(rawTranslation: -translation.x)) case .Ended, .Cancelled, .Failed: self.revealAccessoryView(atOffset: 0) default: @@ -69,8 +100,7 @@ class AccessoryViewRevealer: NSObject, UIGestureRecognizerDelegate { let translation = self.panRecognizer.translationInView(self.collectionView) let x = CGFloat.abs(translation.x), y = CGFloat.abs(translation.y) let angleRads = atan2(y, x) - let threshold: CGFloat = 0.0872665 // ~5 degrees - return angleRads < threshold + return angleRads <= self.config.angleThresholdInRads } private func revealAccessoryView(atOffset offset: CGFloat) { diff --git a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj index a7c55e5..c9755e9 100644 --- a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj @@ -43,19 +43,6 @@ isa PBXBuildFile - 03BF667D5939483E4E5945367089E0C2 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - CollectionChanges.swift - sourceTree - <group> - 05D1CAD0D5CBB45864EAC60301938537 fileRef @@ -112,49 +99,6 @@ - 0AF498F8FC3F25D4B5CE90DF60A69D9A - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ChatItemPresenterFactory.swift - sourceTree - <group> - - 0BD52D486C5AD803E34D7116042BA856 - - buildActionMask - 2147483647 - files - - 5E8147BF590C9058FA4BA5F2090BE09F - 1DA99DE43368C5A796E79479ABA28B57 - 821D4C1292667D8EA499E37E04194374 - CC8E0A8FB1732EFDECD00A3526588545 - 78A2413040BE11610CA1BE161FCF907C - E578EC4425B067782E44C43ABB5ED5E8 - 3607214AF8885ED259891A101A208618 - 6FF99B33AACE1A87B9B737F4105D0067 - 313974712AF9627915DC51686E1A37F7 - 64B82471A99ED3970735118E0BE2F2BA - 96E0591DD59E6CD36305915C2F69EB9D - B3B172B96F42041EC9990B2A51522999 - CBE5A160229F05FB1E51CF525A0ED91F - F7DF8B2A7DFEEF650782C412D7EDEDC7 - 2AC7BACC1DC13BB4BE94683510A4F879 - F741204A250A56B65AE5B12BB663FB7D - 7B1CC69A2C762280BD2A252F16742349 - 7E028F34459BC0B41204E7B6C34E4459 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - 0CE0C32F2E53D253FBD890532AA9201C includeInIndex @@ -188,6 +132,19 @@ sourceTree <group> + 1134CCABB280903B07C7FD089896A6DE + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + DummyChatItemPresenter.swift + sourceTree + <group> + 1281E83BEA9A48C95D01A3CFFB17E893 fileRef @@ -202,6 +159,13 @@ + 1293F88DD2651FCAFE9468D3172AE4CD + + fileRef + 41A9B2AAC21030F2945A94BC7CBD1423 + isa + PBXBuildFile + 1450F7E23B95E33D58368BB36C594CCF includeInIndex @@ -235,19 +199,6 @@ sourceTree <group> - 16D402E0C1E4858589629658A4B8E8F1 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - KeyboardTracker.swift - sourceTree - <group> - 199D1EF8C02C9C07EBC73C74F5459049 fileRef @@ -262,13 +213,6 @@ isa PBXBuildFile - 1B689C6777FCD12A316E29D4A6107EDE - - fileRef - 9CE13526223A899F54C1E16E05F8946F - isa - PBXBuildFile - 1B6E23E0663DEEE23A97522C52BACBCF fileRef @@ -298,10 +242,31 @@ sourceTree <group> - 1DA99DE43368C5A796E79479ABA28B57 + 1D35CD1FB5F37129DBDA12F090B96E83 fileRef - 860B88C642CB5673CC3512AB56DA6754 + 42D8BFA51D1A4D7997DDA3DAEEC7BB3A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 1F37559E206D6C470C05DE543316AB97 + + fileRef + 826512851733EFA0000BAA2070956375 + isa + PBXBuildFile + + 21DB05B897E7323EE654A1FD79B44B3A + + fileRef + 36C43008BB069478668679256AAB705E isa PBXBuildFile @@ -348,19 +313,6 @@ sourceTree <group> - 26FD214151E9C789FD88C728585A9FAE - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ChatItemCompanion.swift - sourceTree - <group> - 27449A35693D02324A2015928388559F buildActionMask @@ -452,13 +404,6 @@ isa PBXBuildFile - 2AC7BACC1DC13BB4BE94683510A4F879 - - fileRef - B0B1D4638787FAF7A2588E09E3A9DB11 - isa - PBXBuildFile - 2BCC458FDD5F692BBB2BFC64BB5701FC includeInIndex @@ -493,31 +438,6 @@ isa XCConfigurationList - 2EC8B4A026D2880115D1BCDE75693AC6 - - buildConfigurationList - 801D8234FFD50876E732C3A3136DC1C7 - buildPhases - - 0BD52D486C5AD803E34D7116042BA856 - 33BE4C6E47787200E144381A1B47B40B - 45C2575C59DCD6373A8D6D806E0416E7 - - buildRules - - dependencies - - isa - PBXNativeTarget - name - Chatto - productName - Chatto - productReference - 58294E0D6B459AFD04DEA87154A8368F - productType - com.apple.product-type.framework - 2FC91F230E6B87767585794C423F4732 includeInIndex @@ -531,13 +451,6 @@ sourceTree <group> - 313974712AF9627915DC51686E1A37F7 - - fileRef - 8EBFFC7152EC56221AC6305D0E2CB299 - isa - PBXBuildFile - 31A4C2E8EED4E2085BB5E8A7F1D9FBBB baseConfigurationReference @@ -609,20 +522,6 @@ sourceTree <group> - 3331B9D88AA53044DB8000802A6E86FA - - fileRef - 70652AF72A4518C05BDB514DED70D915 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 3333BED070BA5CD346B481AB6022E549 includeInIndex @@ -636,24 +535,24 @@ sourceTree <group> - 33BE4C6E47787200E144381A1B47B40B + 34CEDFF3E3BB11D57B4EC1A0090729F1 - buildActionMask - 2147483647 - files - - 1B689C6777FCD12A316E29D4A6107EDE - + includeInIndex + 1 isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatViewController+Changes.swift + sourceTree + <group> 34EB44D72143D7B39261756AA1BA58FE children - B2814487DA2430177DFBBB668D295890 + 742D6CA01A399A17E78C035260FBAB44 isa PBXGroup @@ -688,13 +587,6 @@ isa PBXBuildFile - 3607214AF8885ED259891A101A208618 - - fileRef - AC08C9420F11BD32BDD52C1E9BD21F28 - isa - PBXBuildFile - 36440BE9E9EA3F580694F74AC894187D baseConfigurationReference @@ -751,6 +643,19 @@ name Release + 36C43008BB069478668679256AAB705E + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatViewController+Scrolling.swift + sourceTree + <group> + 37FAE4CA5C70625D5AE777B5D3CC5429 fileRef @@ -783,10 +688,30 @@ proxyType 1 remoteGlobalIDString - 2EC8B4A026D2880115D1BCDE75693AC6 + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B remoteInfo Chatto + 3AB11E8EAF8141F7F0A1E2D93FC4F37F + + fileRef + 84AE77E2DC8C81FA8C4ABB08CEF0A2C4 + isa + PBXBuildFile + + 3B6A6DCB4EB2ADDA0031AAD703858420 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatViewController.swift + sourceTree + <group> + 3B77DF0407B5045913BE644699EA992E fileRef @@ -821,6 +746,13 @@ isa PBXBuildFile + 3E5F80B3946FE51C0A596ACBFB3616D0 + + fileRef + 5FDBD530402089BF4D7367FDF816900A + isa + PBXBuildFile + 3F635F51C46E8B20880BB7EF933DD874 buildConfigurations @@ -923,33 +855,6 @@ isa PBXBuildFile - 45C2575C59DCD6373A8D6D806E0416E7 - - buildActionMask - 2147483647 - files - - AAD09E6E37A454F0FA9B2177EA312A6F - 3331B9D88AA53044DB8000802A6E86FA - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 476A7160858AC63C7FB36E7E91D90F2A - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - AccessoryViewRevealer.swift - sourceTree - <group> - 480D85CCE10ACF23367AB556C48F3FB4 isa @@ -957,7 +862,7 @@ name Chatto target - 2EC8B4A026D2880115D1BCDE75693AC6 + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B targetProxy 4EE8DDA26FBDE4C7E6738F7506377ECB @@ -1010,7 +915,7 @@ proxyType 1 remoteGlobalIDString - 2EC8B4A026D2880115D1BCDE75693AC6 + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B remoteInfo Chatto @@ -1052,6 +957,69 @@ runOnlyForDeploymentPostprocessing 0 + 52BDC89734D9784BA1D0AE1A98E2B208 + + fileRef + 9CE13526223A899F54C1E16E05F8946F + isa + PBXBuildFile + + 54F982CA2A3E04C25EDC9D07AFE38963 + + baseConfigurationReference + A65DE185A12E70BE17EFA373F195C9E6 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + CURRENT_PROJECT_VERSION + 1 + DEFINES_MODULE + YES + DYLIB_COMPATIBILITY_VERSION + 1 + DYLIB_CURRENT_VERSION + 1 + DYLIB_INSTALL_NAME_BASE + @rpath + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/Chatto/Chatto-prefix.pch + INFOPLIST_FILE + Target Support Files/Chatto/Info.plist + INSTALL_PATH + $(LOCAL_LIBRARY_DIR)/Frameworks + IPHONEOS_DEPLOYMENT_TARGET + 8.0 + LD_RUNPATH_SEARCH_PATHS + + $(inherited) + @executable_path/Frameworks + @loader_path/Frameworks + + MODULEMAP_FILE + Target Support Files/Chatto/Chatto.modulemap + MTL_ENABLE_DEBUG_INFO + NO + PRODUCT_NAME + Chatto + SDKROOT + iphoneos + SKIP_INSTALL + YES + TARGETED_DEVICE_FAMILY + 1,2 + VERSIONING_SYSTEM + apple-generic + VERSION_INFO_PREFIX + + + isa + XCBuildConfiguration + name + Release + 55E5D25CDC38D77982FC101EC37B29E0 includeInIndex @@ -1065,6 +1033,20 @@ sourceTree <group> + 5809D53211E7E89C360BDC8ADD71F239 + + fileRef + 583960CE463732577E956CF9184EA67C + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + 58294E0D6B459AFD04DEA87154A8368F explicitFileType @@ -1080,6 +1062,19 @@ sourceTree BUILT_PRODUCTS_DIR + 583960CE463732577E956CF9184EA67C + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + Chatto.h + sourceTree + <group> + 5902D05B5BB1C50C7F4680DD211F6AA5 includeInIndex @@ -1100,19 +1095,6 @@ isa PBXBuildFile - 5A4AFF731D10BF16E0C7015088054180 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ChatItemProtocolDefinitions.swift - sourceTree - <group> - 5A4BF7E99DD1960EA3ACDCE6F29D58BB includeInIndex @@ -1153,13 +1135,6 @@ sourceTree <group> - 5E8147BF590C9058FA4BA5F2090BE09F - - fileRef - 476A7160858AC63C7FB36E7E91D90F2A - isa - PBXBuildFile - 5EB60CC19EC06054D693A3635FC065C8 includeInIndex @@ -1173,6 +1148,44 @@ sourceTree <group> + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B + + buildConfigurationList + C08B36FEF025774BA6A8025807C0202B + buildPhases + + C6E29A0F9636168E4180EAF3DE38601F + 9F9B6E881AF2FBB5F1C86A62B2061E34 + 9235796AEBFDF2F516BE440356DFCE55 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + Chatto + productName + Chatto + productReference + 58294E0D6B459AFD04DEA87154A8368F + productType + com.apple.product-type.framework + + 5FDBD530402089BF4D7367FDF816900A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + AccessoryViewRevealer.swift + sourceTree + <group> + 61D6137D2971DA44FD75884C7175E485 fileRef @@ -1180,6 +1193,13 @@ isa PBXBuildFile + 62D8C0CB89828AD119F644183CC62724 + + fileRef + E038B19AB22B520CB80E7DFFCB3503E7 + isa + PBXBuildFile + 637A06D57DDDE2353B5A90D3F0897A6C includeInIndex @@ -1193,6 +1213,19 @@ sourceTree <group> + 63D0F3AFD08F58E45D7E3DB9D93A417A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatViewController+Presenters.swift + sourceTree + <group> + 64098046251F40CFE18AABFF28F8AF30 includeInIndex @@ -1220,13 +1253,6 @@ isa PBXBuildFile - 64B82471A99ED3970735118E0BE2F2BA - - fileRef - 26FD214151E9C789FD88C728585A9FAE - isa - PBXBuildFile - 659E3A6A1BC77CD2033B4E15551A6EB0 buildActionMask @@ -1298,7 +1324,7 @@ name Chatto target - 2EC8B4A026D2880115D1BCDE75693AC6 + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B targetProxy 3A4012010BE69B97E46A5FB84F2302AC @@ -1348,12 +1374,18 @@ sourceTree <group> - 6FF99B33AACE1A87B9B737F4105D0067 + 6EEA3F083FED1C2E5AB7983A3C052C90 - fileRef - 86E961B39AC22E8615EBBA9D7D1190F4 + includeInIndex + 1 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + sourcecode.swift + path + ChatItemPresenterFactory.swift + sourceTree + <group> 7019E99B21789BA603247FD118DFB1AF @@ -1368,19 +1400,6 @@ sourceTree <group> - 70652AF72A4518C05BDB514DED70D915 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Chatto.h - sourceTree - <group> - 70D77E6C8B815EBD66FF9CE04922FDF1 buildActionMask @@ -1408,18 +1427,12 @@ isa PBXBuildFile - 735CC6D5D0C35054B87A54FC38B6A70A + 73403F366D44EBBCBFED3406C608205F - includeInIndex - 1 + fileRef + 916C85EA530CBCCB8F724A71FA02F680 isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - BaseChatViewController+Scrolling.swift - sourceTree - <group> + PBXBuildFile 73D0E435C33C19717B04811C0F73600E @@ -1434,6 +1447,19 @@ sourceTree <group> + 73D6E31E7B64CE20AB148334F9924167 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + KeyboardTracker.swift + sourceTree + <group> + 7425B8D500305534670F81940E2A50E4 fileRef @@ -1441,6 +1467,25 @@ isa PBXBuildFile + 742D6CA01A399A17E78C035260FBAB44 + + children + + 583960CE463732577E956CF9184EA67C + 84AE77E2DC8C81FA8C4ABB08CEF0A2C4 + ADD5EF621D4C97159780FBA704E1E7EE + 80E8B3FFDB227A27832B4096E95169D8 + AEFF9D5C30902A421C4BC13E21B200C8 + + isa + PBXGroup + name + Source + path + Source + sourceTree + <group> + 7468334D2E29C3979DE993CD32ACC1CC children @@ -1530,13 +1575,6 @@ isa PBXBuildFile - 78A2413040BE11610CA1BE161FCF907C - - fileRef - 735CC6D5D0C35054B87A54FC38B6A70A - isa - PBXBuildFile - 79A9DEDC89FE8336BF5FEDAAF75BF7FC includeInIndex @@ -1548,13 +1586,6 @@ sourceTree <group> - 7B1CC69A2C762280BD2A252F16742349 - - fileRef - DC834CF3838F666D31108DAC160A2058 - isa - PBXBuildFile - 7B25C629ADCBF309A6CC76BE734D5A5B children @@ -1655,13 +1686,6 @@ sourceTree BUILT_PRODUCTS_DIR - 7E028F34459BC0B41204E7B6C34E4459 - - fileRef - C7AA3A48C41CBE49EA66948B12930B23 - isa - PBXBuildFile - 7F5203F70424BF8FE0A443C488977D78 children @@ -1677,26 +1701,36 @@ sourceTree <group> - 801D8234FFD50876E732C3A3136DC1C7 + 80E8B3FFDB227A27832B4096E95169D8 - buildConfigurations + children - 8E2BD49D784F62B074A25BFF247CCF27 - B6170BEAD7BD7FBC8CE54D1BA4D87938 + C09AD9E0C73B2D8A414CFEFF5030462C + A49DCE4C65CC6D9879C5A6613B44B209 + A99420248122F768351E4721BD2AA923 + 1134CCABB280903B07C7FD089896A6DE - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXGroup + name + Chat Items + path + Chat Items + sourceTree + <group> - 821D4C1292667D8EA499E37E04194374 + 826512851733EFA0000BAA2070956375 - fileRef - A174A6D8C52AC86FFECC6E72F351B00D + includeInIndex + 1 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + sourcecode.swift + path + ChatCollectionViewLayout.swift + sourceTree + <group> 82B4130D6842ED151D75732401A98763 @@ -1719,6 +1753,19 @@ isa PBXBuildFile + 84AE77E2DC8C81FA8C4ABB08CEF0A2C4 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + ReadOnlyOrderedDictionary.swift + sourceTree + <group> + 8544C25F17FD6BA40AE7191260F8B89D includeInIndex @@ -1732,32 +1779,6 @@ sourceTree <group> - 860B88C642CB5673CC3512AB56DA6754 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - BaseChatItemPresenter.swift - sourceTree - <group> - - 86E961B39AC22E8615EBBA9D7D1190F4 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ChatCollectionViewLayout.swift - sourceTree - <group> - 870F4A500CDEAF64BFF454F96E97472D fileRef @@ -1824,84 +1845,25 @@ sourceTree <group> - 8B10834F6EEA12B0F9FE4C36671B7F75 + 8ABD110D929C9E20294B44F845BFB922 - children - - 476A7160858AC63C7FB36E7E91D90F2A - AC08C9420F11BD32BDD52C1E9BD21F28 - 86E961B39AC22E8615EBBA9D7D1190F4 - 8EBFFC7152EC56221AC6305D0E2CB299 - 0AF498F8FC3F25D4B5CE90DF60A69D9A - 03BF667D5939483E4E5945367089E0C2 - 16D402E0C1E4858589629658A4B8E8F1 - + includeInIndex + 1 isa - PBXGroup - name - Collaborators + PBXFileReference + lastKnownFileType + sourcecode.swift path - Collaborators + BaseChatViewControllerView.swift sourceTree <group> - 8E2BD49D784F62B074A25BFF247CCF27 + 8AF84B9A19DF824F0F7905B1F0296E7B - baseConfigurationReference - A65DE185A12E70BE17EFA373F195C9E6 - buildSettings - - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - CURRENT_PROJECT_VERSION - 1 - DEFINES_MODULE - YES - DYLIB_COMPATIBILITY_VERSION - 1 - DYLIB_CURRENT_VERSION - 1 - DYLIB_INSTALL_NAME_BASE - @rpath - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Chatto/Chatto-prefix.pch - INFOPLIST_FILE - Target Support Files/Chatto/Info.plist - INSTALL_PATH - $(LOCAL_LIBRARY_DIR)/Frameworks - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - LD_RUNPATH_SEARCH_PATHS - - $(inherited) - @executable_path/Frameworks - @loader_path/Frameworks - - MODULEMAP_FILE - Target Support Files/Chatto/Chatto.modulemap - MTL_ENABLE_DEBUG_INFO - YES - PRODUCT_NAME - Chatto - SDKROOT - iphoneos - SKIP_INSTALL - YES - SWIFT_OPTIMIZATION_LEVEL - -Onone - TARGETED_DEVICE_FAMILY - 1,2 - VERSIONING_SYSTEM - apple-generic - VERSION_INFO_PREFIX - - + fileRef + 1134CCABB280903B07C7FD089896A6DE isa - XCBuildConfiguration - name - Debug + PBXBuildFile 8E65A33D9FA1F316C1341BF93AE89E42 @@ -1925,19 +1887,6 @@ sourceTree <group> - 8EBFFC7152EC56221AC6305D0E2CB299 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ChatDataSourceProtocol.swift - sourceTree - <group> - 8EC43B69E82C5189AEBB02FDBF6D4F99 children @@ -1955,6 +1904,33 @@ sourceTree <group> + 916C85EA530CBCCB8F724A71FA02F680 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + ChatDataSourceProtocol.swift + sourceTree + <group> + + 9235796AEBFDF2F516BE440356DFCE55 + + buildActionMask + 2147483647 + files + + 1D35CD1FB5F37129DBDA12F090B96E83 + 5809D53211E7E89C360BDC8ADD71F239 + + isa + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 + 930B77B0B215490568CD3228FA91E67A buildActionMask @@ -1972,6 +1948,13 @@ runOnlyForDeploymentPostprocessing 0 + 934FFA57A2BE6C4767F2D458E6526E5F + + fileRef + 63D0F3AFD08F58E45D7E3DB9D93A417A + isa + PBXBuildFile + 9486F27E9C712C62F6856EC5E1DFD468 children @@ -1994,12 +1977,18 @@ isa PBXBuildFile - 96E0591DD59E6CD36305915C2F69EB9D + 95A5C1509EF905BC37064FCA49C1F370 - fileRef - 0AF498F8FC3F25D4B5CE90DF60A69D9A + includeInIndex + 1 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + sourcecode.swift + path + CollectionChanges.swift + sourceTree + <group> 977577C045EDA9D9D1F46E2598D19FC7 @@ -2042,19 +2031,6 @@ sourceTree <group> - 997C627D222D2F301743179CED7C9082 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - BaseChatViewController+Presenters.swift - sourceTree - <group> - 99CF1DE7C434899AC0FF56172A90C7B7 children @@ -2144,6 +2120,77 @@ isa PBXBuildFile + 9F9B6E881AF2FBB5F1C86A62B2061E34 + + buildActionMask + 2147483647 + files + + 52BDC89734D9784BA1D0AE1A98E2B208 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + A078EF430A965910B5BFDBE760000938 + + baseConfigurationReference + A65DE185A12E70BE17EFA373F195C9E6 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + CURRENT_PROJECT_VERSION + 1 + DEFINES_MODULE + YES + DYLIB_COMPATIBILITY_VERSION + 1 + DYLIB_CURRENT_VERSION + 1 + DYLIB_INSTALL_NAME_BASE + @rpath + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_PREFIX_HEADER + Target Support Files/Chatto/Chatto-prefix.pch + INFOPLIST_FILE + Target Support Files/Chatto/Info.plist + INSTALL_PATH + $(LOCAL_LIBRARY_DIR)/Frameworks + IPHONEOS_DEPLOYMENT_TARGET + 8.0 + LD_RUNPATH_SEARCH_PATHS + + $(inherited) + @executable_path/Frameworks + @loader_path/Frameworks + + MODULEMAP_FILE + Target Support Files/Chatto/Chatto.modulemap + MTL_ENABLE_DEBUG_INFO + YES + PRODUCT_NAME + Chatto + SDKROOT + iphoneos + SKIP_INSTALL + YES + SWIFT_OPTIMIZATION_LEVEL + -Onone + TARGETED_DEVICE_FAMILY + 1,2 + VERSIONING_SYSTEM + apple-generic + VERSION_INFO_PREFIX + + + isa + XCBuildConfiguration + name + Debug + A090C4E7541E04C60FEC74B26A1983D8 includeInIndex @@ -2157,19 +2204,6 @@ sourceTree <group> - A174A6D8C52AC86FFECC6E72F351B00D - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - BaseChatViewController+Changes.swift - sourceTree - <group> - A210C8B9CA993A2C831727CE2515A3DE includeInIndex @@ -2198,6 +2232,26 @@ sourceTree <group> + A430569895988B417CA4BDCBB0A01F82 + + fileRef + 3B6A6DCB4EB2ADDA0031AAD703858420 + isa + PBXBuildFile + + A49DCE4C65CC6D9879C5A6613B44B209 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + ChatItemCompanion.swift + sourceTree + <group> + A518D2A6B2CC93AD5FC6EF88205E08E8 children @@ -2340,21 +2394,7 @@ sourceTree <group> - AAD09E6E37A454F0FA9B2177EA312A6F - - fileRef - 42D8BFA51D1A4D7997DDA3DAEEC7BB3A - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - AC08C9420F11BD32BDD52C1E9BD21F28 + A99420248122F768351E4721BD2AA923 includeInIndex 1 @@ -2363,7 +2403,7 @@ lastKnownFileType sourcecode.swift path - BaseChatViewControllerView.swift + ChatItemProtocolDefinitions.swift sourceTree <group> @@ -2374,6 +2414,39 @@ isa PBXBuildFile + ADD5EF621D4C97159780FBA704E1E7EE + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + SerialTaskQueue.swift + sourceTree + <group> + + AEFF9D5C30902A421C4BC13E21B200C8 + + children + + 3B6A6DCB4EB2ADDA0031AAD703858420 + E038B19AB22B520CB80E7DFFCB3503E7 + 34CEDFF3E3BB11D57B4EC1A0090729F1 + 63D0F3AFD08F58E45D7E3DB9D93A417A + 36C43008BB069478668679256AAB705E + EC880546BD2224DA1E3592DE7DD266BA + + isa + PBXGroup + name + ChatController + path + ChatController + sourceTree + <group> + AF3827E052F4369A86F32B555BFE2E80 includeInIndex @@ -2456,19 +2529,6 @@ sourceTree <group> - B0B1D4638787FAF7A2588E09E3A9DB11 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - DummyChatItemPresenter.swift - sourceTree - <group> - B18551F56C3606529F48FBC1CA6F986E fileRef @@ -2476,47 +2536,10 @@ isa PBXBuildFile - B23157617A821DA6B2147017712DD6BC - - children - - 860B88C642CB5673CC3512AB56DA6754 - 26FD214151E9C789FD88C728585A9FAE - 5A4AFF731D10BF16E0C7015088054180 - B0B1D4638787FAF7A2588E09E3A9DB11 - - isa - PBXGroup - name - Chat Items - path - Chat Items - sourceTree - <group> - - B2814487DA2430177DFBBB668D295890 - - children - - 70652AF72A4518C05BDB514DED70D915 - DC834CF3838F666D31108DAC160A2058 - C7AA3A48C41CBE49EA66948B12930B23 - B23157617A821DA6B2147017712DD6BC - C2A30F4A52AB14498E479963E0357877 - - isa - PBXGroup - name - Source - path - Source - sourceTree - <group> - - B3B172B96F42041EC9990B2A51522999 + B48B02953333C95136DDA71CA56C9271 fileRef - 5A4AFF731D10BF16E0C7015088054180 + C09AD9E0C73B2D8A414CFEFF5030462C isa PBXBuildFile @@ -2534,62 +2557,6 @@ - B6170BEAD7BD7FBC8CE54D1BA4D87938 - - baseConfigurationReference - A65DE185A12E70BE17EFA373F195C9E6 - buildSettings - - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - CURRENT_PROJECT_VERSION - 1 - DEFINES_MODULE - YES - DYLIB_COMPATIBILITY_VERSION - 1 - DYLIB_CURRENT_VERSION - 1 - DYLIB_INSTALL_NAME_BASE - @rpath - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Chatto/Chatto-prefix.pch - INFOPLIST_FILE - Target Support Files/Chatto/Info.plist - INSTALL_PATH - $(LOCAL_LIBRARY_DIR)/Frameworks - IPHONEOS_DEPLOYMENT_TARGET - 8.0 - LD_RUNPATH_SEARCH_PATHS - - $(inherited) - @executable_path/Frameworks - @loader_path/Frameworks - - MODULEMAP_FILE - Target Support Files/Chatto/Chatto.modulemap - MTL_ENABLE_DEBUG_INFO - NO - PRODUCT_NAME - Chatto - SDKROOT - iphoneos - SKIP_INSTALL - YES - TARGETED_DEVICE_FAMILY - 1,2 - VERSIONING_SYSTEM - apple-generic - VERSION_INFO_PREFIX - - - isa - XCBuildConfiguration - name - Release - B6570F04FDD5CC8C2BC932E82306D690 includeInIndex @@ -2616,6 +2583,13 @@ sourceTree <group> + B7E8E79188BA84E1E762C4DE0D543EFC + + fileRef + ADD5EF621D4C97159780FBA704E1E7EE + isa + PBXBuildFile + BA6428E9F66FD5A23C0A2E06ED26CD2F includeInIndex @@ -2708,6 +2682,33 @@ isa PBXBuildFile + C08B36FEF025774BA6A8025807C0202B + + buildConfigurations + + A078EF430A965910B5BFDBE760000938 + 54F982CA2A3E04C25EDC9D07AFE38963 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + C09AD9E0C73B2D8A414CFEFF5030462C + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatItemPresenter.swift + sourceTree + <group> + C0DD853662D710EB24A3F60FF45FE3F6 fileRef @@ -2756,25 +2757,6 @@ sourceTree <group> - C2A30F4A52AB14498E479963E0357877 - - children - - C5C7250AEE8C396A1459FAA7D5469313 - A174A6D8C52AC86FFECC6E72F351B00D - 997C627D222D2F301743179CED7C9082 - 735CC6D5D0C35054B87A54FC38B6A70A - 8B10834F6EEA12B0F9FE4C36671B7F75 - - isa - PBXGroup - name - ChatController - path - ChatController - sourceTree - <group> - C322C204C7D59AB4720A2CAD6C38078B children @@ -2804,31 +2786,36 @@ isa PBXBuildFile - C5C7250AEE8C396A1459FAA7D5469313 + C6E29A0F9636168E4180EAF3DE38601F - includeInIndex - 1 + buildActionMask + 2147483647 + files + + 3E5F80B3946FE51C0A596ACBFB3616D0 + B48B02953333C95136DDA71CA56C9271 + 62D8C0CB89828AD119F644183CC62724 + D7772C94698115F97FB01A06009D3A33 + 934FFA57A2BE6C4767F2D458E6526E5F + 21DB05B897E7323EE654A1FD79B44B3A + A430569895988B417CA4BDCBB0A01F82 + CB45B378A02452BF55E421E6F1E5A767 + 1F37559E206D6C470C05DE543316AB97 + 73403F366D44EBBCBFED3406C608205F + FAC11312B558B6BEE0283108DFCA3F9C + D4124FD097F30F0209CE7B9DC152F11F + FF617A66DF56CFD5A7F3CD5304CD4AB9 + 1293F88DD2651FCAFE9468D3172AE4CD + F438D6015DC57DA1095E60F73CCA5593 + 8AF84B9A19DF824F0F7905B1F0296E7B + EFF30D10A961BF864CDA109C126EA611 + 3AB11E8EAF8141F7F0A1E2D93FC4F37F + B7E8E79188BA84E1E762C4DE0D543EFC + isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - BaseChatViewController.swift - sourceTree - <group> - - C7AA3A48C41CBE49EA66948B12930B23 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - SerialTaskQueue.swift - sourceTree - <group> + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 C83ACF1B40483EBCF1AADBA5B8C938D0 @@ -2850,6 +2837,13 @@ sourceTree <group> + CB45B378A02452BF55E421E6F1E5A767 + + fileRef + 8ABD110D929C9E20294B44F845BFB922 + isa + PBXBuildFile + CBA0556F9682A8263E184A5F4851B9AD includeInIndex @@ -2876,13 +2870,6 @@ sourceTree <group> - CBE5A160229F05FB1E51CF525A0ED91F - - fileRef - 41A9B2AAC21030F2945A94BC7CBD1423 - isa - PBXBuildFile - CC27B0AA8783E403851467DA308D736D children @@ -2915,13 +2902,6 @@ sourceTree <group> - CC8E0A8FB1732EFDECD00A3526588545 - - fileRef - 997C627D222D2F301743179CED7C9082 - isa - PBXBuildFile - CCECC6BEBDCA29F005882EBE7E4A6CFA includeInIndex @@ -3097,6 +3077,13 @@ sourceTree <group> + D4124FD097F30F0209CE7B9DC152F11F + + fileRef + 6EEA3F083FED1C2E5AB7983A3C052C90 + isa + PBXBuildFile + D41D8CD98F00B204E9800998ECF8427E attributes @@ -3132,7 +3119,7 @@ targets - 2EC8B4A026D2880115D1BCDE75693AC6 + 5F5B5F6ED63BBEB605BA2AC86BAB8A3B 7DD08A69500CBF4A4EFFEEE3FF9E3C54 AF6C60699C45E376AB593B5FA984954E @@ -3150,6 +3137,13 @@ sourceTree <group> + D7772C94698115F97FB01A06009D3A33 + + fileRef + 34CEDFF3E3BB11D57B4EC1A0090729F1 + isa + PBXBuildFile + D92F80EFA905D1D2B49E78A544CA770E includeInIndex @@ -3196,19 +3190,6 @@ isa PBXBuildFile - DC834CF3838F666D31108DAC160A2058 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.swift - path - ReadOnlyOrderedDictionary.swift - sourceTree - <group> - DCE277310A043383EC97FC45344064D9 baseConfigurationReference @@ -3320,6 +3301,19 @@ isa PBXBuildFile + E038B19AB22B520CB80E7DFFCB3503E7 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.swift + path + BaseChatViewController+AccessoryViewRevealer.swift + sourceTree + <group> + E166EAE657932B27CB37E9CBB9280FAF children @@ -3357,13 +3351,6 @@ sourceTree <group> - E578EC4425B067782E44C43ABB5ED5E8 - - fileRef - C5C7250AEE8C396A1459FAA7D5469313 - isa - PBXBuildFile - E625D698677F51C1049B239AD65C4F60 buildActionMask @@ -3424,6 +3411,27 @@ isa PBXBuildFile + EC880546BD2224DA1E3592DE7DD266BA + + children + + 5FDBD530402089BF4D7367FDF816900A + 8ABD110D929C9E20294B44F845BFB922 + 826512851733EFA0000BAA2070956375 + 916C85EA530CBCCB8F724A71FA02F680 + 6EEA3F083FED1C2E5AB7983A3C052C90 + 95A5C1509EF905BC37064FCA49C1F370 + 73D6E31E7B64CE20AB148334F9924167 + + isa + PBXGroup + name + Collaborators + path + Collaborators + sourceTree + <group> + EDF609BF0B29652FAA7CF6F1FD36CA11 fileRef @@ -3463,6 +3471,13 @@ sourceTree <group> + EFF30D10A961BF864CDA109C126EA611 + + fileRef + 73D6E31E7B64CE20AB148334F9924167 + isa + PBXBuildFile + F16CAF022D5603843128A2381A0B6887 includeInIndex @@ -3483,6 +3498,13 @@ isa PBXBuildFile + F438D6015DC57DA1095E60F73CCA5593 + + fileRef + 95A5C1509EF905BC37064FCA49C1F370 + isa + PBXBuildFile + F4549EAD309CDA9A0C8B82AC7F9381D1 includeInIndex @@ -3514,20 +3536,6 @@ sourceTree <group> - F741204A250A56B65AE5B12BB663FB7D - - fileRef - 16D402E0C1E4858589629658A4B8E8F1 - isa - PBXBuildFile - - F7DF8B2A7DFEEF650782C412D7EDEDC7 - - fileRef - 03BF667D5939483E4E5945367089E0C2 - isa - PBXBuildFile - F93CB38288BE1395DD91DC6169A268EE includeInIndex @@ -3541,6 +3549,13 @@ sourceTree <group> + FAC11312B558B6BEE0283108DFCA3F9C + + fileRef + A49DCE4C65CC6D9879C5A6613B44B209 + isa + PBXBuildFile + FB45FFD90572718D82AB9092B750F0CA buildSettings @@ -3640,6 +3655,13 @@ isa PBXBuildFile + FF617A66DF56CFD5A7F3CD5304CD4AB9 + + fileRef + A99420248122F768351E4721BD2AA923 + isa + PBXBuildFile + rootObject D41D8CD98F00B204E9800998ECF8427E diff --git a/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Chatto.xcscheme b/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Chatto.xcscheme index 32e3d5c..119cb6a 100644 --- a/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Chatto.xcscheme +++ b/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Chatto.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES"> diff --git a/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ChattoAdditions.xcscheme b/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ChattoAdditions.xcscheme index 9eebb32..ddb82a8 100644 --- a/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ChattoAdditions.xcscheme +++ b/ChattoApp/Pods/Pods.xcodeproj/xcshareddata/xcschemes/ChattoAdditions.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES">