Merge pull request #4 from hoangtaiki/develop

Support Carthage and Swift Package Manager
hoangtaiki · Dec 6, 2018 · e3471a8 · e3471a8
2 parents ecb0e13 + 0b428e6
commit e3471a8
Show file tree

Hide file tree

Showing 20 changed files with 30,078 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,12 @@
 * Image for presenter
 * Example.md
 * Icon for Example app
+
 #### Update
 * Example: Reskin Facebook Messager style
 * Change constrait of UITableView from view to safeAreaLayoutGuide
 * Set table.contentInsetAdjustmentBehavior = .never
+
+## [1.1.0](https://github.com/hoangtaiki/ChatViewController/releases/tag/1.0.0) (2018-12-06)
+#### Add
+* Support Carthage and Swift Package Manager
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "hoangtaiki/PlaceholderUITextView"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "hoangtaiki/PlaceholderUITextView" "1.1.0"
diff --git a/ChatViewController.podspec b/ChatViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ChatViewController'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.license = 'MIT'
   s.summary = 'ChatViewController, ChatBar, ImagePicker like Slack Application.'
   s.homepage = 'https://github.com/hoangtaiki/ChatViewController'

diff --git a/ChatViewController.xcodeproj/project.pbxproj b/ChatViewController.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
 		4DBFF70B20AE8B2200D2799A /* LayoutConstraintSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF70A20AE8B2200D2799A /* LayoutConstraintSet.swift */; };
 		4DBFF70E20AEBDFE00D2799A /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF70D20AEBDFE00D2799A /* ChatViewController.swift */; };
 		4DBFF71720AED7E400D2799A /* ChatViewController+Subviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBFF71620AED7E400D2799A /* ChatViewController+Subviews.swift */; };
+		4DFEB7C421B8217400A3E66D /* PlaceholderUITextView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DFEB7C221B81FA100A3E66D /* PlaceholderUITextView.framework */; };
+		4DFEB7C821B906E600A3E66D /* ChatViewConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DFEB7C721B906E600A3E66D /* ChatViewConfiguration.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -80,13 +82,16 @@
 		4DBFF70A20AE8B2200D2799A /* LayoutConstraintSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutConstraintSet.swift; sourceTree = "<group>"; };
 		4DBFF70D20AEBDFE00D2799A /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
 		4DBFF71620AED7E400D2799A /* ChatViewController+Subviews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChatViewController+Subviews.swift"; sourceTree = "<group>"; };
+		4DFEB7C221B81FA100A3E66D /* PlaceholderUITextView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PlaceholderUITextView.framework; path = Carthage/Build/iOS/PlaceholderUITextView.framework; sourceTree = "<group>"; };
+		4DFEB7C721B906E600A3E66D /* ChatViewConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewConfiguration.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		4D2E8E5A20ADC1FF00DC178E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4DFEB7C421B8217400A3E66D /* PlaceholderUITextView.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -100,6 +105,7 @@
 				4D2E8E6F20ADCFF900DC178E /* Documentation */,
 				4D2E8E5F20ADC1FF00DC178E /* Products */,
 				4D2E8E6A20ADCFE800DC178E /* Source */,
+				4DFEB7C121B81FA000A3E66D /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -205,6 +211,7 @@
 		4DBFF70C20AEBD8300D2799A /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				4DFEB7C721B906E600A3E66D /* ChatViewConfiguration.swift */,
 				4D47558820CE25F0005B9493 /* ChatBarView.swift */,
 				4D47558620CE25F0005B9493 /* ChatButton.swift */,
 				4D47558720CE25F0005B9493 /* ChatStackView.swift */,
@@ -215,6 +222,14 @@
 			path = Core;
 			sourceTree = "<group>";
 		};
+		4DFEB7C121B81FA000A3E66D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				4DFEB7C221B81FA100A3E66D /* PlaceholderUITextView.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -325,6 +340,7 @@
 				4D4755AA20CE859C005B9493 /* PhotoDataManager.swift in Sources */,
 				4DBFF70E20AEBDFE00D2799A /* ChatViewController.swift in Sources */,
 				4D613927211D7A3E00ACB492 /* Utils.swift in Sources */,
+				4DFEB7C821B906E600A3E66D /* ChatViewConfiguration.swift in Sources */,
 				4D4755C320CF6316005B9493 /* NSMutableAttributedString+Extensions.swift in Sources */,
 				4DBFF71720AED7E400D2799A /* ChatViewController+Subviews.swift in Sources */,
 			);
@@ -464,6 +480,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -492,6 +512,10 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (

diff --git a/ChatViewController.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ChatViewController.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/...proj/project.xcworkspace/xcuserdata/hoangtaiki.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/hoangtaiki.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ChatViewController.xcodeproj/xcshareddata/xcschemes/ChatViewController.xcscheme b/ChatViewController.xcodeproj/xcshareddata/xcschemes/ChatViewController.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4D2E8E5D20ADC1FF00DC178E"
+               BuildableName = "ChatViewController.framework"
+               BlueprintName = "ChatViewController"
+               ReferencedContainer = "container:ChatViewController.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4D2E8E5D20ADC1FF00DC178E"
+            BuildableName = "ChatViewController.framework"
+            BlueprintName = "ChatViewController"
+            ReferencedContainer = "container:ChatViewController.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4D2E8E5D20ADC1FF00DC178E"
+            BuildableName = "ChatViewController.framework"
+            BlueprintName = "ChatViewController"
+            ReferencedContainer = "container:ChatViewController.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...Controller.xcodeproj/xcuserdata/hoangtaiki.xcuserdatad/xcschemes/xcschememanagement.plist b/...Controller.xcodeproj/xcuserdata/hoangtaiki.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -15,5 +15,13 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>4D2E8E5D20ADC1FF00DC178E</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/Documentation/Usage.md b/Documentation/Usage.md
@@ -58,13 +58,13 @@ Currently, we support two style for ImagePicker. First one is Slack style and se
 
 ### Slack style
 
-<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/images/slack-image-picker-one-row.jpg" width="33%">
-<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/images/slack-image-picker-two-rows.jpg" width="33%">
+<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/Images/slack-image-picker-one-row.jpg" width="33%">
+<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/Images/slack-image-picker-two-rows.jpg" width="33%">
 
 One or two rows depend on device and user turn on/off `predictive mode` for keyboard. To understand more clearly about how we implement it, see the [Image Picker](AdvancedUsage.md#image-picker) 
 
 ### Action Sheet style
-<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/images/action-sheet-image-picker.jpg" width="33%">
+<img src="https://github.com/hoangtaiki/ChatViewController/blob/master/Images/action-sheet-image-picker.jpg" width="33%">
 
 Action Sheet is the simplest way to pick an image.
 

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ChatViewController (0.0.1):
+  - ChatViewController (1.0.0):
     - PlaceholderUITextView
   - Kingfisher (4.10.1)
   - ObjectMapper (3.4.1)
@@ -24,7 +24,7 @@ EXTERNAL SOURCES:
     :path: ".."
 
 SPEC CHECKSUMS:
-  ChatViewController: eadb3260a69fbb21cf5019e33982aef5cd6076cc
+  ChatViewController: ce15bb2de6f5dd5e19f5cc2ec2ed45e25a7a0aea
   Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0
   ObjectMapper: 5311bd50ca732930959e7ca1a2de43ab823a5ced
   PlaceholderUITextView: c199eb40f4a55d8be4d67492d6ed1ef67b8d8811

diff --git a/...OS Example.xcodeproj/xcuserdata/hoangtaiki.xcuserdatad/xcschemes/xcschememanagement.plist b/...OS Example.xcodeproj/xcuserdata/hoangtaiki.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -6,8 +6,10 @@
 	<dict>
 		<key>iOS Example.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<true/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/Images/action-sheet-image-picker.jpg b/Images/action-sheet-image-picker.jpg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		github "hoangtaiki/PlaceholderUITextView" "1.1.0"