diff --git a/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj b/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj index ad766eb..8f4905c 100644 --- a/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj +++ b/Example/MessageDisplayExample/MessageDisplayExample.xcodeproj/project.pbxproj @@ -108,7 +108,6 @@ 74180D7D1910864400A35C82 /* Fav_Cell_Loc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 74180D7C1910864400A35C82 /* Fav_Cell_Loc@2x.png */; }; 744FBDC81915EE7400FB4A65 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 744FBDC61915EE7400FB4A65 /* Default-568h@2x.png */; }; 744FBDC91915EE7400FB4A65 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 744FBDC71915EE7400FB4A65 /* Default@2x.png */; }; - 744FBDCD1915FF3A00FB4A65 /* MessageDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 744FBDCC1915FF3A00FB4A65 /* MessageDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7475BA33190D4B7B001DD9B1 /* TableViewBackgroundImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7475BA32190D4B7B001DD9B1 /* TableViewBackgroundImage@2x.png */; }; 748245051908C730008EC388 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748245041908C730008EC388 /* Foundation.framework */; }; 748245071908C730008EC388 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748245061908C730008EC388 /* CoreGraphics.framework */; }; @@ -250,7 +249,6 @@ 74180D7C1910864400A35C82 /* Fav_Cell_Loc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Fav_Cell_Loc@2x.png"; sourceTree = ""; }; 744FBDC61915EE7400FB4A65 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 744FBDC71915EE7400FB4A65 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - 744FBDCC1915FF3A00FB4A65 /* MessageDisplayKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageDisplayKit.h; sourceTree = ""; }; 7475BA32190D4B7B001DD9B1 /* TableViewBackgroundImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "TableViewBackgroundImage@2x.png"; sourceTree = ""; }; 748245011908C730008EC388 /* MessageDisplayExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MessageDisplayExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 748245041908C730008EC388 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -569,7 +567,6 @@ 7482454D190902DA008EC388 /* Classes */ = { isa = PBXGroup; children = ( - 744FBDCC1915FF3A00FB4A65 /* MessageDisplayKit.h */, 7482457819091BA2008EC388 /* Macro */, 748245941909F1F0008EC388 /* Common */, 7482454E190902DA008EC388 /* Categorys */, @@ -794,7 +791,6 @@ 740660C31914DC2300E1CE95 /* XHEmotionCollectionViewCell.h in Headers */, 740660C81914DC4700E1CE95 /* XHEmotionCollectionViewFlowLayout.h in Headers */, 740660B91914D22A00E1CE95 /* XHEmotionManagerView.h in Headers */, - 744FBDCD1915FF3A00FB4A65 /* MessageDisplayKit.h in Headers */, 740660D2191507F800E1CE95 /* XHEmotionSectionBar.h in Headers */, 740660BE1914D65600E1CE95 /* XHEmotion.h in Headers */, 74065FB419123DDB00E1CE95 /* XHShareMenuView.h in Headers */, diff --git a/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch b/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch index d3222cc..fce1dc4 100644 --- a/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch +++ b/Example/MessageDisplayExample/MessageDisplayExample/MessageDisplayExample-Prefix.pch @@ -14,5 +14,5 @@ #import #import - #import "MessageDisplayKit.h" + #import "XHMessageTableViewController.h" #endif diff --git a/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch b/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch index fcc22de..c392119 100644 --- a/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch +++ b/Example/MessageDisplayExample/MessageDisplayFramework/MessageDisplayFramework-Prefix.pch @@ -7,5 +7,4 @@ #ifdef __OBJC__ #import #import - #import "MessageDisplayKit.h" #endif diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample-Prefix.pch b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample-Prefix.pch index 8e111ce..0b9a075 100644 --- a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample-Prefix.pch +++ b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample-Prefix.pch @@ -13,5 +13,5 @@ #ifdef __OBJC__ #import #import - #import + #import #endif diff --git a/MessageDisplayKit/Classes/Common/XHMessageAvatorFactory.m b/MessageDisplayKit/Classes/Common/XHMessageAvatorFactory.m index f4b565c..4518e5d 100644 --- a/MessageDisplayKit/Classes/Common/XHMessageAvatorFactory.m +++ b/MessageDisplayKit/Classes/Common/XHMessageAvatorFactory.m @@ -7,6 +7,7 @@ // #import "XHMessageAvatorFactory.h" +#import "UIImage+XHRounded.h" @implementation XHMessageAvatorFactory diff --git a/MessageDisplayKit/Classes/Common/XHMessageBubbleFactory.m b/MessageDisplayKit/Classes/Common/XHMessageBubbleFactory.m index 7cf894c..16f1893 100644 --- a/MessageDisplayKit/Classes/Common/XHMessageBubbleFactory.m +++ b/MessageDisplayKit/Classes/Common/XHMessageBubbleFactory.m @@ -7,6 +7,7 @@ // #import "XHMessageBubbleFactory.h" +#import "XHMacro.h" @implementation XHMessageBubbleFactory diff --git a/MessageDisplayKit/Classes/Common/XHMessageVoiceFactory.h b/MessageDisplayKit/Classes/Common/XHMessageVoiceFactory.h index 7d36c95..5c32f0e 100644 --- a/MessageDisplayKit/Classes/Common/XHMessageVoiceFactory.h +++ b/MessageDisplayKit/Classes/Common/XHMessageVoiceFactory.h @@ -7,6 +7,7 @@ // #import +#import "XHMessageBubbleFactory.h" @interface XHMessageVoiceFactory : NSObject diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.h b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.h index 5eaec6f..e63dfa2 100644 --- a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.h +++ b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController.h @@ -8,6 +8,25 @@ #import +// Model +#import "XHMessage.h" + +// Views +#import "XHMessageTableView.h" +#import "XHMessageTableViewCell.h" +#import "XHMessageInputView.h" +#import "XHShareMenuView.h" +#import "XHEmotionManagerView.h" + +// Factory +#import "XHMessageBubbleFactory.h" + +// Helper +#import "XHPhotographyHelper.h" + +// Categorys +#import "UIScrollView+XHkeyboardControl.h" + @protocol XHMessageTableViewControllerDelegate @optional diff --git a/MessageDisplayKit/Classes/MessageDisplayKit.h b/MessageDisplayKit/Classes/MessageDisplayKit.h deleted file mode 100644 index e0d23c3..0000000 --- a/MessageDisplayKit/Classes/MessageDisplayKit.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// MessageDisplayKit.h -// MessageDisplayExample -// -// Created by qtone-1 on 14-4-24. -// Copyright (c) 2014年 曾宪华 开发团队(http://iyilunba.com ) 本人QQ:543413507 本人QQ群（142557668）. All rights reserved. -// - -#ifndef MessageDisplayExample_MessageDisplayKit_h -#define MessageDisplayExample_MessageDisplayKit_h - -#import "XHMacro.h" - -#import "XHFoundationCommon.h" - -#import "UIImage+XHAnimatedFaceGif.h" -#import "UIImage+XHRounded.h" -#import "NSString+MessageInputView.h" -#import "UIScrollView+XHkeyboardControl.h" - -#import "XHMessageAvatorFactory.h" -#import "XHMessageBubbleFactory.h" -#import "XHMessageVoiceFactory.h" - -#import "XHPhotographyHelper.h" - -#import "XHMessage.h" -#import "XHShareMenuItem.h" -#import "XHEmotion.h" -#import "XHEmotionManager.h" - -#import "XHMessageTableView.h" -#import "XHMessageTableViewCell.h" -#import "XHMessageInputView.h" -#import "XHShareMenuView.h" -#import "XHEmotionManagerView.h" - -#import "XHMessageTableViewController.h" - -#endif diff --git a/MessageDisplayKit/Classes/Models/XHMessageModel.h b/MessageDisplayKit/Classes/Models/XHMessageModel.h index cfcf000..66db282 100644 --- a/MessageDisplayKit/Classes/Models/XHMessageModel.h +++ b/MessageDisplayKit/Classes/Models/XHMessageModel.h @@ -7,6 +7,7 @@ // #import +#import "XHMessageBubbleFactory.h" @class XHMessage; diff --git a/MessageDisplayKit/Classes/Views/XHEmotionCollectionViewFlowLayout.h b/MessageDisplayKit/Classes/Views/XHEmotionCollectionViewFlowLayout.h index fbaf360..b126fb8 100644 --- a/MessageDisplayKit/Classes/Views/XHEmotionCollectionViewFlowLayout.h +++ b/MessageDisplayKit/Classes/Views/XHEmotionCollectionViewFlowLayout.h @@ -7,6 +7,7 @@ // #import +#import "XHEmotionManager.h" @interface XHEmotionCollectionViewFlowLayout : UICollectionViewFlowLayout diff --git a/MessageDisplayKit/Classes/Views/XHEmotionSectionBar.h b/MessageDisplayKit/Classes/Views/XHEmotionSectionBar.h index 52018e1..2bfb707 100644 --- a/MessageDisplayKit/Classes/Views/XHEmotionSectionBar.h +++ b/MessageDisplayKit/Classes/Views/XHEmotionSectionBar.h @@ -7,6 +7,7 @@ // #import +#import "XHEmotionManager.h" @protocol XHEmotionSectionBarDelegate diff --git a/MessageDisplayKit/Classes/Views/XHMessageBubbleView.h b/MessageDisplayKit/Classes/Views/XHMessageBubbleView.h index 616484d..a02f1ca 100644 --- a/MessageDisplayKit/Classes/Views/XHMessageBubbleView.h +++ b/MessageDisplayKit/Classes/Views/XHMessageBubbleView.h @@ -8,9 +8,25 @@ #import +// Views +#import "XHMessageTextView.h" +#import "XHMessageInputView.h" #import "XHMessageDisplayTextView.h" #import "XHBubblePhotoImageView.h" +// Macro +#import "XHMacro.h" + +// Model +#import "XHMessage.h" + +// Factorys +#import "XHMessageAvatorFactory.h" +#import "XHMessageVoiceFactory.h" + +// Categorys +#import "UIImage+XHAnimatedFaceGif.h" + #define kXHMessageBubbleDisplayMaxLine 200 @interface XHMessageBubbleView : UIView diff --git a/MessageDisplayKit/Classes/Views/XHMessageInputView.m b/MessageDisplayKit/Classes/Views/XHMessageInputView.m index bb44ae2..08acb9d 100644 --- a/MessageDisplayKit/Classes/Views/XHMessageInputView.m +++ b/MessageDisplayKit/Classes/Views/XHMessageInputView.m @@ -8,6 +8,8 @@ #import "XHMessageInputView.h" +#import "NSString+MessageInputView.h" + @interface XHMessageInputView () @property (nonatomic, weak, readwrite) XHMessageTextView *inputTextView; diff --git a/MessageDisplayKit/Classes/Views/XHShareMenuView.h b/MessageDisplayKit/Classes/Views/XHShareMenuView.h index b92396f..31ecab6 100644 --- a/MessageDisplayKit/Classes/Views/XHShareMenuView.h +++ b/MessageDisplayKit/Classes/Views/XHShareMenuView.h @@ -7,6 +7,7 @@ // #import +#import "XHShareMenuItem.h" #define kXHShareMenuPageControlHeight 30