diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index ce61ce6..61baa2f 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -39,6 +39,33 @@ A9617A551ACC27860024AE4A /* SetUpViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9617A531ACC27860024AE4A /* SetUpViewController.xib */; }; A9617A581ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9617A561ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png */; }; A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9617A571ACC2EBC0024AE4A /* mine-setting-icon@2x.png */; }; + A96862421ACCF0B400DDAA6B /* LICENCE.txt in Resources */ = {isa = PBXBuildFile; fileRef = A968622A1ACCF0B400DDAA6B /* LICENCE.txt */; }; + A96862431ACCF0B400DDAA6B /* MWCaptionView.m in Sources */ = {isa = PBXBuildFile; fileRef = A968622E1ACCF0B400DDAA6B /* MWCaptionView.m */; }; + A96862441ACCF0B400DDAA6B /* MWGridCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862311ACCF0B400DDAA6B /* MWGridCell.m */; }; + A96862451ACCF0B400DDAA6B /* MWGridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862331ACCF0B400DDAA6B /* MWGridViewController.m */; }; + A96862461ACCF0B400DDAA6B /* MWPhoto.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862351ACCF0B400DDAA6B /* MWPhoto.m */; }; + A96862471ACCF0B400DDAA6B /* MWPhotoBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862371ACCF0B400DDAA6B /* MWPhotoBrowser.m */; }; + A96862481ACCF0B400DDAA6B /* MWTapDetectingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A968623B1ACCF0B400DDAA6B /* MWTapDetectingImageView.m */; }; + A96862491ACCF0B400DDAA6B /* MWTapDetectingView.m in Sources */ = {isa = PBXBuildFile; fileRef = A968623D1ACCF0B400DDAA6B /* MWTapDetectingView.m */; }; + A968624A1ACCF0B400DDAA6B /* MWZoomingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = A968623F1ACCF0B400DDAA6B /* MWZoomingScrollView.m */; }; + A968624B1ACCF0B400DDAA6B /* MWPhotoBrowser.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A96862401ACCF0B400DDAA6B /* MWPhotoBrowser.bundle */; }; + A968624C1ACCF0B400DDAA6B /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = A96862411ACCF0B400DDAA6B /* README.md */; }; + A96862501ACCF12300DDAA6B /* DACircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = A968624F1ACCF12300DDAA6B /* DACircularProgressView.m */; }; + A968626E1ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862531ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m */; }; + A968626F1ACCF13300DDAA6B /* PSTCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862551ACCF13300DDAA6B /* PSTCollectionView.m */; }; + A96862701ACCF13300DDAA6B /* PSTCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862571ACCF13300DDAA6B /* PSTCollectionViewCell.m */; }; + A96862711ACCF13300DDAA6B /* PSTCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A968625A1ACCF13300DDAA6B /* PSTCollectionViewController.m */; }; + A96862721ACCF13300DDAA6B /* PSTCollectionViewData.m in Sources */ = {isa = PBXBuildFile; fileRef = A968625C1ACCF13300DDAA6B /* PSTCollectionViewData.m */; }; + A96862731ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = A968625E1ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m */; }; + A96862741ACCF13300DDAA6B /* PSTCollectionViewItemKey.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862601ACCF13300DDAA6B /* PSTCollectionViewItemKey.m */; }; + A96862751ACCF13300DDAA6B /* PSTCollectionViewLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862631ACCF13300DDAA6B /* PSTCollectionViewLayout.m */; }; + A96862761ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862651ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m */; }; + A96862771ACCF13300DDAA6B /* PSTGridLayoutInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862671ACCF13300DDAA6B /* PSTGridLayoutInfo.m */; }; + A96862781ACCF13300DDAA6B /* PSTGridLayoutItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A96862691ACCF13300DDAA6B /* PSTGridLayoutItem.m */; }; + A96862791ACCF13300DDAA6B /* PSTGridLayoutRow.m in Sources */ = {isa = PBXBuildFile; fileRef = A968626B1ACCF13300DDAA6B /* PSTGridLayoutRow.m */; }; + A968627A1ACCF13300DDAA6B /* PSTGridLayoutSection.m in Sources */ = {isa = PBXBuildFile; fileRef = A968626D1ACCF13300DDAA6B /* PSTGridLayoutSection.m */; }; + A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A968627B1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png */; }; + A968627E1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */; }; A97559A01ACB88FE004ADA42 /* AWordDefault.m in Sources */ = {isa = PBXBuildFile; fileRef = A975599F1ACB88FE004ADA42 /* AWordDefault.m */; }; A97559A31ACB8CE0004ADA42 /* AWordUser.m in Sources */ = {isa = PBXBuildFile; fileRef = A97559A21ACB8CE0004ADA42 /* AWordUser.m */; }; A97559A51ACB9748004ADA42 /* setup-head-default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97559A41ACB9748004ADA42 /* setup-head-default@2x.png */; }; @@ -161,6 +188,60 @@ A9617A531ACC27860024AE4A /* SetUpViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetUpViewController.xib; sourceTree = ""; }; A9617A561ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mine-setting-icon-click@2x.png"; sourceTree = ""; }; A9617A571ACC2EBC0024AE4A /* mine-setting-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mine-setting-icon@2x.png"; sourceTree = ""; }; + A968622A1ACCF0B400DDAA6B /* LICENCE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENCE.txt; sourceTree = ""; }; + A968622D1ACCF0B400DDAA6B /* MWCaptionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWCaptionView.h; sourceTree = ""; }; + A968622E1ACCF0B400DDAA6B /* MWCaptionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWCaptionView.m; sourceTree = ""; }; + A968622F1ACCF0B400DDAA6B /* MWCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWCommon.h; sourceTree = ""; }; + A96862301ACCF0B400DDAA6B /* MWGridCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWGridCell.h; sourceTree = ""; }; + A96862311ACCF0B400DDAA6B /* MWGridCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWGridCell.m; sourceTree = ""; }; + A96862321ACCF0B400DDAA6B /* MWGridViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWGridViewController.h; sourceTree = ""; }; + A96862331ACCF0B400DDAA6B /* MWGridViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWGridViewController.m; sourceTree = ""; }; + A96862341ACCF0B400DDAA6B /* MWPhoto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWPhoto.h; sourceTree = ""; }; + A96862351ACCF0B400DDAA6B /* MWPhoto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWPhoto.m; sourceTree = ""; }; + A96862361ACCF0B400DDAA6B /* MWPhotoBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWPhotoBrowser.h; sourceTree = ""; }; + A96862371ACCF0B400DDAA6B /* MWPhotoBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWPhotoBrowser.m; sourceTree = ""; }; + A96862381ACCF0B400DDAA6B /* MWPhotoBrowserPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWPhotoBrowserPrivate.h; sourceTree = ""; }; + A96862391ACCF0B400DDAA6B /* MWPhotoProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWPhotoProtocol.h; sourceTree = ""; }; + A968623A1ACCF0B400DDAA6B /* MWTapDetectingImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWTapDetectingImageView.h; sourceTree = ""; }; + A968623B1ACCF0B400DDAA6B /* MWTapDetectingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWTapDetectingImageView.m; sourceTree = ""; }; + A968623C1ACCF0B400DDAA6B /* MWTapDetectingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWTapDetectingView.h; sourceTree = ""; }; + A968623D1ACCF0B400DDAA6B /* MWTapDetectingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWTapDetectingView.m; sourceTree = ""; }; + A968623E1ACCF0B400DDAA6B /* MWZoomingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWZoomingScrollView.h; sourceTree = ""; }; + A968623F1ACCF0B400DDAA6B /* MWZoomingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWZoomingScrollView.m; sourceTree = ""; }; + A96862401ACCF0B400DDAA6B /* MWPhotoBrowser.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MWPhotoBrowser.bundle; sourceTree = ""; }; + A96862411ACCF0B400DDAA6B /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + A968624E1ACCF12300DDAA6B /* DACircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DACircularProgressView.h; sourceTree = ""; }; + A968624F1ACCF12300DDAA6B /* DACircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DACircularProgressView.m; sourceTree = ""; }; + A96862521ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSIndexPath+PSTCollectionViewAdditions.h"; sourceTree = ""; }; + A96862531ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSIndexPath+PSTCollectionViewAdditions.m"; sourceTree = ""; }; + A96862541ACCF13300DDAA6B /* PSTCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionView.h; sourceTree = ""; }; + A96862551ACCF13300DDAA6B /* PSTCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionView.m; sourceTree = ""; }; + A96862561ACCF13300DDAA6B /* PSTCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewCell.h; sourceTree = ""; }; + A96862571ACCF13300DDAA6B /* PSTCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewCell.m; sourceTree = ""; }; + A96862581ACCF13300DDAA6B /* PSTCollectionViewCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewCommon.h; sourceTree = ""; }; + A96862591ACCF13300DDAA6B /* PSTCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewController.h; sourceTree = ""; }; + A968625A1ACCF13300DDAA6B /* PSTCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewController.m; sourceTree = ""; }; + A968625B1ACCF13300DDAA6B /* PSTCollectionViewData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewData.h; sourceTree = ""; }; + A968625C1ACCF13300DDAA6B /* PSTCollectionViewData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewData.m; sourceTree = ""; }; + A968625D1ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewFlowLayout.h; sourceTree = ""; }; + A968625E1ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewFlowLayout.m; sourceTree = ""; }; + A968625F1ACCF13300DDAA6B /* PSTCollectionViewItemKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewItemKey.h; sourceTree = ""; }; + A96862601ACCF13300DDAA6B /* PSTCollectionViewItemKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewItemKey.m; sourceTree = ""; }; + A96862611ACCF13300DDAA6B /* PSTCollectionViewLayout+Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PSTCollectionViewLayout+Internals.h"; sourceTree = ""; }; + A96862621ACCF13300DDAA6B /* PSTCollectionViewLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewLayout.h; sourceTree = ""; }; + A96862631ACCF13300DDAA6B /* PSTCollectionViewLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewLayout.m; sourceTree = ""; }; + A96862641ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTCollectionViewUpdateItem.h; sourceTree = ""; }; + A96862651ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTCollectionViewUpdateItem.m; sourceTree = ""; }; + A96862661ACCF13300DDAA6B /* PSTGridLayoutInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTGridLayoutInfo.h; sourceTree = ""; }; + A96862671ACCF13300DDAA6B /* PSTGridLayoutInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTGridLayoutInfo.m; sourceTree = ""; }; + A96862681ACCF13300DDAA6B /* PSTGridLayoutItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTGridLayoutItem.h; sourceTree = ""; }; + A96862691ACCF13300DDAA6B /* PSTGridLayoutItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTGridLayoutItem.m; sourceTree = ""; }; + A968626A1ACCF13300DDAA6B /* PSTGridLayoutRow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTGridLayoutRow.h; sourceTree = ""; }; + A968626B1ACCF13300DDAA6B /* PSTGridLayoutRow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTGridLayoutRow.m; sourceTree = ""; }; + A968626C1ACCF13300DDAA6B /* PSTGridLayoutSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSTGridLayoutSection.h; sourceTree = ""; }; + A968626D1ACCF13300DDAA6B /* PSTGridLayoutSection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSTGridLayoutSection.m; sourceTree = ""; }; + A968627B1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cellmorebtnnormalN@2x.png"; sourceTree = ""; }; + A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cellmorebtnclickN@2x.png"; sourceTree = ""; }; A975599E1ACB88FE004ADA42 /* AWordDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWordDefault.h; sourceTree = ""; }; A975599F1ACB88FE004ADA42 /* AWordDefault.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AWordDefault.m; sourceTree = ""; }; A97559A11ACB8CE0004ADA42 /* AWordUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWordUser.h; sourceTree = ""; }; @@ -389,6 +470,95 @@ path = My; sourceTree = ""; }; + A96862291ACCF0B400DDAA6B /* MWPhotoBrowser */ = { + isa = PBXGroup; + children = ( + A968622A1ACCF0B400DDAA6B /* LICENCE.txt */, + A968622B1ACCF0B400DDAA6B /* MWPhotoBrowser */, + A96862411ACCF0B400DDAA6B /* README.md */, + ); + path = MWPhotoBrowser; + sourceTree = ""; + }; + A968622B1ACCF0B400DDAA6B /* MWPhotoBrowser */ = { + isa = PBXGroup; + children = ( + A968622C1ACCF0B400DDAA6B /* Classes */, + A96862401ACCF0B400DDAA6B /* MWPhotoBrowser.bundle */, + ); + path = MWPhotoBrowser; + sourceTree = ""; + }; + A968622C1ACCF0B400DDAA6B /* Classes */ = { + isa = PBXGroup; + children = ( + A968622D1ACCF0B400DDAA6B /* MWCaptionView.h */, + A968622E1ACCF0B400DDAA6B /* MWCaptionView.m */, + A968622F1ACCF0B400DDAA6B /* MWCommon.h */, + A96862301ACCF0B400DDAA6B /* MWGridCell.h */, + A96862311ACCF0B400DDAA6B /* MWGridCell.m */, + A96862321ACCF0B400DDAA6B /* MWGridViewController.h */, + A96862331ACCF0B400DDAA6B /* MWGridViewController.m */, + A96862341ACCF0B400DDAA6B /* MWPhoto.h */, + A96862351ACCF0B400DDAA6B /* MWPhoto.m */, + A96862361ACCF0B400DDAA6B /* MWPhotoBrowser.h */, + A96862371ACCF0B400DDAA6B /* MWPhotoBrowser.m */, + A96862381ACCF0B400DDAA6B /* MWPhotoBrowserPrivate.h */, + A96862391ACCF0B400DDAA6B /* MWPhotoProtocol.h */, + A968623A1ACCF0B400DDAA6B /* MWTapDetectingImageView.h */, + A968623B1ACCF0B400DDAA6B /* MWTapDetectingImageView.m */, + A968623C1ACCF0B400DDAA6B /* MWTapDetectingView.h */, + A968623D1ACCF0B400DDAA6B /* MWTapDetectingView.m */, + A968623E1ACCF0B400DDAA6B /* MWZoomingScrollView.h */, + A968623F1ACCF0B400DDAA6B /* MWZoomingScrollView.m */, + ); + path = Classes; + sourceTree = ""; + }; + A968624D1ACCF12300DDAA6B /* DACircularProgress */ = { + isa = PBXGroup; + children = ( + A968624E1ACCF12300DDAA6B /* DACircularProgressView.h */, + A968624F1ACCF12300DDAA6B /* DACircularProgressView.m */, + ); + path = DACircularProgress; + sourceTree = ""; + }; + A96862511ACCF13300DDAA6B /* PSTCollectionView */ = { + isa = PBXGroup; + children = ( + A96862521ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.h */, + A96862531ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m */, + A96862541ACCF13300DDAA6B /* PSTCollectionView.h */, + A96862551ACCF13300DDAA6B /* PSTCollectionView.m */, + A96862561ACCF13300DDAA6B /* PSTCollectionViewCell.h */, + A96862571ACCF13300DDAA6B /* PSTCollectionViewCell.m */, + A96862581ACCF13300DDAA6B /* PSTCollectionViewCommon.h */, + A96862591ACCF13300DDAA6B /* PSTCollectionViewController.h */, + A968625A1ACCF13300DDAA6B /* PSTCollectionViewController.m */, + A968625B1ACCF13300DDAA6B /* PSTCollectionViewData.h */, + A968625C1ACCF13300DDAA6B /* PSTCollectionViewData.m */, + A968625D1ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.h */, + A968625E1ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m */, + A968625F1ACCF13300DDAA6B /* PSTCollectionViewItemKey.h */, + A96862601ACCF13300DDAA6B /* PSTCollectionViewItemKey.m */, + A96862611ACCF13300DDAA6B /* PSTCollectionViewLayout+Internals.h */, + A96862621ACCF13300DDAA6B /* PSTCollectionViewLayout.h */, + A96862631ACCF13300DDAA6B /* PSTCollectionViewLayout.m */, + A96862641ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.h */, + A96862651ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m */, + A96862661ACCF13300DDAA6B /* PSTGridLayoutInfo.h */, + A96862671ACCF13300DDAA6B /* PSTGridLayoutInfo.m */, + A96862681ACCF13300DDAA6B /* PSTGridLayoutItem.h */, + A96862691ACCF13300DDAA6B /* PSTGridLayoutItem.m */, + A968626A1ACCF13300DDAA6B /* PSTGridLayoutRow.h */, + A968626B1ACCF13300DDAA6B /* PSTGridLayoutRow.m */, + A968626C1ACCF13300DDAA6B /* PSTGridLayoutSection.h */, + A968626D1ACCF13300DDAA6B /* PSTGridLayoutSection.m */, + ); + path = PSTCollectionView; + sourceTree = ""; + }; A97559AE1ACBC615004ADA42 /* Note */ = { isa = PBXGroup; children = ( @@ -512,6 +682,9 @@ A97C54D91AC9014D0038818A /* Vender */ = { isa = PBXGroup; children = ( + A96862511ACCF13300DDAA6B /* PSTCollectionView */, + A968624D1ACCF12300DDAA6B /* DACircularProgress */, + A96862291ACCF0B400DDAA6B /* MWPhotoBrowser */, A97559B41ACBD99E004ADA42 /* UIPlaceHolderTextView */, A98F98461ACA29B5007C4594 /* UMSocial_Sdk_Extra_Frameworks */, A9B4E39B1AC9908E00A1DBDF /* UMAnalytics_Sdk_3.4.6 */, @@ -544,6 +717,8 @@ A97C54E21AC91FD70038818A /* Resource */ = { isa = PBXGroup; children = ( + A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */, + A968627B1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png */, A9617A561ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png */, A9617A571ACC2EBC0024AE4A /* mine-setting-icon@2x.png */, A97559C61ACBF0BC004ADA42 /* btn_bad_clicked@2x.png */, @@ -803,12 +978,14 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A968624B1ACCF0B400DDAA6B /* MWPhotoBrowser.bundle in Resources */, A93442001ACA919F00A6B233 /* tabbarVoiceClick@2x.png in Resources */, A97C55001AC933AD0038818A /* UMSCommentDetailController.xib in Resources */, A93441F21ACA916D00A6B233 /* tabbarQuotationClick@2x.png in Resources */, A93442031ACA981D00A6B233 /* Default-568h@2x.png in Resources */, A9FAD4321AC923FC007ADC10 /* MyViewController.xib in Resources */, A93441FF1ACA919F00A6B233 /* tabbarVoice@2x.png in Resources */, + A968627E1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png in Resources */, A93441FA1ACA919500A6B233 /* tabbarQuotation-dark@2x.png in Resources */, A97559D01ACBF0BC004ADA42 /* btn_share_clicked@2x.png in Resources */, A955109B1AC39E6A0006D16F /* Main.storyboard in Resources */, @@ -819,6 +996,7 @@ A97559CF1ACBF0BC004ADA42 /* btn_good@2x.png in Resources */, A97559CC1ACBF0BC004ADA42 /* btn_bad_clicked@2x.png in Resources */, A97DBE461ACAE7B500705682 /* iconWeixin@2x.png in Resources */, + A96862421ACCF0B400DDAA6B /* LICENCE.txt in Resources */, A97C55071AC933AD0038818A /* UMSShareListController.xib in Resources */, A93441EE1ACA8C8F00A6B233 /* defaultUserIcon@2x.png in Resources */, A97559AC1ACB9DF0004ADA42 /* navigationButtonRefresh@2x.png in Resources */, @@ -827,6 +1005,7 @@ A97C55041AC933AD0038818A /* UMShareEditViewControlleriPad.xib in Resources */, A98F98541ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */, + A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */, A95510A01AC39E6A0006D16F /* LaunchScreen.xib in Resources */, A93442041ACA981D00A6B233 /* Default@2x.png in Resources */, A97DBE401ACAE29E00705682 /* Icon@2x.png in Resources */, @@ -917,30 +1096,53 @@ A97559A01ACB88FE004ADA42 /* AWordDefault.m in Sources */, A97C54D31AC8F10F0038818A /* XiaoYuAPIClient.m in Sources */, A97559C41ACBEE99004ADA42 /* NoteTableViewCell.m in Sources */, + A96862481ACCF0B400DDAA6B /* MWTapDetectingImageView.m in Sources */, A9FAD4311AC923FC007ADC10 /* MyViewController.m in Sources */, A97559BF1ACBE6C6004ADA42 /* NotePublishViewModel.m in Sources */, + A96862781ACCF13300DDAA6B /* PSTGridLayoutItem.m in Sources */, A97559B21ACBC683004ADA42 /* NotePublishViewController.m in Sources */, A97C54DD1AC901980038818A /* MBProgressHUD+Util.m in Sources */, + A96862721ACCF13300DDAA6B /* PSTCollectionViewData.m in Sources */, A97DBE331ACAE10800705682 /* LoginViewController.m in Sources */, A97559A31ACB8CE0004ADA42 /* AWordUser.m in Sources */, A95510981AC39E6A0006D16F /* ViewController.m in Sources */, A98F986B1ACA2FA9007C4594 /* BaseRefreshViewController.m in Sources */, + A96862471ACCF0B400DDAA6B /* MWPhotoBrowser.m in Sources */, A9617A541ACC27860024AE4A /* SetUpViewController.m in Sources */, A97C54D21AC8F10F0038818A /* AFgzipResponseSerializer.m in Sources */, A9FAD4221AC922A5007ADC10 /* MainViewController.m in Sources */, + A96862761ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m in Sources */, + A968626E1ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m in Sources */, A9FAD42C1AC923E2007ADC10 /* MessageViewController.m in Sources */, + A968627A1ACCF13300DDAA6B /* PSTGridLayoutSection.m in Sources */, + A96862771ACCF13300DDAA6B /* PSTGridLayoutInfo.m in Sources */, + A96862751ACCF13300DDAA6B /* PSTCollectionViewLayout.m in Sources */, + A96862791ACCF13300DDAA6B /* PSTGridLayoutRow.m in Sources */, A97C54CD1AC8F10F0038818A /* BaseViewModel.m in Sources */, A9617A4F1ACC0D0F0024AE4A /* NoteViewModel.m in Sources */, + A96862461ACCF0B400DDAA6B /* MWPhoto.m in Sources */, + A968624A1ACCF0B400DDAA6B /* MWZoomingScrollView.m in Sources */, A97C54CF1AC8F10F0038818A /* NSString+HXAddtions.m in Sources */, + A96862501ACCF12300DDAA6B /* DACircularProgressView.m in Sources */, A95510951AC39E6A0006D16F /* AppDelegate.m in Sources */, A97C54D11AC8F10F0038818A /* RequireEngine.m in Sources */, + A96862731ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m in Sources */, + A96862441ACCF0B400DDAA6B /* MWGridCell.m in Sources */, + A96862741ACCF13300DDAA6B /* PSTCollectionViewItemKey.m in Sources */, + A96862451ACCF0B400DDAA6B /* MWGridViewController.m in Sources */, A97C54D01AC8F10F0038818A /* PropertyEntity.m in Sources */, A93441DE1ACA311700A6B233 /* Ash_UIUtil.m in Sources */, + A968624C1ACCF0B400DDAA6B /* README.md in Sources */, + A96862701ACCF13300DDAA6B /* PSTCollectionViewCell.m in Sources */, A97559B71ACBD99E004ADA42 /* UIPlaceHolderTextView.m in Sources */, A97C54D41AC8F10F0038818A /* XMFishBaseCode.m in Sources */, A97C54E11AC91DA10038818A /* CommonUtil.m in Sources */, + A96862491ACCF0B400DDAA6B /* MWTapDetectingView.m in Sources */, + A968626F1ACCF13300DDAA6B /* PSTCollectionView.m in Sources */, A9FAD4351AC925AC007ADC10 /* LoginViewModel.m in Sources */, A95510921AC39E6A0006D16F /* main.m in Sources */, + A96862711ACCF13300DDAA6B /* PSTCollectionViewController.m in Sources */, + A96862431ACCF0B400DDAA6B /* MWCaptionView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout b/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout index 5431d00..0b6403d 100644 --- a/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout +++ b/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout @@ -10,14 +10,14 @@ Ash_AWord IDESourceControlProjectOriginsDictionary - C2124BD0C46D10FF81834A1B3449A80D6B860D76 + B459B20E6BFCBAF9E5514A0B814271AD85A6C13B https://github.com/wu736139669/Ash_First.git IDESourceControlProjectPath Ash_AWord.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - C2124BD0C46D10FF81834A1B3449A80D6B860D76 + B459B20E6BFCBAF9E5514A0B814271AD85A6C13B .. IDESourceControlProjectURL @@ -25,14 +25,14 @@ IDESourceControlProjectVersion 111 IDESourceControlProjectWCCIdentifier - C2124BD0C46D10FF81834A1B3449A80D6B860D76 + B459B20E6BFCBAF9E5514A0B814271AD85A6C13B IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - C2124BD0C46D10FF81834A1B3449A80D6B860D76 + B459B20E6BFCBAF9E5514A0B814271AD85A6C13B IDESourceControlWCCName Ash_AWord diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6bf2b90..ebd7af2 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -307,5 +307,37 @@ landmarkType = "5"> + + + + + + + + diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 1004acd..578d637 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -4,29 +4,27 @@ CFBundleDevelopmentRegion en + CFBundleDisplayName + OneWord CFBundleExecutable $(EXECUTABLE_NAME) + CFBundleIconFiles + + Icon@2x + Icon + CFBundleIdentifier ash.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName $(PRODUCT_NAME) - CFBundleDisplayName - OneWord CFBundlePackageType APPL CFBundleShortVersionString 1.0 CFBundleSignature ???? - CFBundleVersion - 1 - CFBundleIconFiles - - Icon@2x - Icon - CFBundleURLTypes @@ -54,6 +52,8 @@ + CFBundleVersion + 1 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Ash_AWord/Resource/Icon.png b/Ash_AWord/Resource/Icon.png index 83106e8..abded57 100644 Binary files a/Ash_AWord/Resource/Icon.png and b/Ash_AWord/Resource/Icon.png differ diff --git a/Ash_AWord/Resource/Icon@2x.png b/Ash_AWord/Resource/Icon@2x.png index 0152449..f2281ef 100644 Binary files a/Ash_AWord/Resource/Icon@2x.png and b/Ash_AWord/Resource/Icon@2x.png differ diff --git a/Ash_AWord/Resource/cellmorebtnclickN@2x.png b/Ash_AWord/Resource/cellmorebtnclickN@2x.png new file mode 100644 index 0000000..de158ed Binary files /dev/null and b/Ash_AWord/Resource/cellmorebtnclickN@2x.png differ diff --git a/Ash_AWord/Resource/cellmorebtnnormalN@2x.png b/Ash_AWord/Resource/cellmorebtnnormalN@2x.png new file mode 100644 index 0000000..72fdfd6 Binary files /dev/null and b/Ash_AWord/Resource/cellmorebtnnormalN@2x.png differ diff --git a/Ash_AWord/Resource/first-login-icon.png b/Ash_AWord/Resource/first-login-icon.png index 2d8d840..f2281ef 100644 Binary files a/Ash_AWord/Resource/first-login-icon.png and b/Ash_AWord/Resource/first-login-icon.png differ diff --git a/Pods/DACircularProgress/DACircularProgress/DACircularProgressView.h b/Ash_AWord/Vender/DACircularProgress/DACircularProgressView.h similarity index 100% rename from Pods/DACircularProgress/DACircularProgress/DACircularProgressView.h rename to Ash_AWord/Vender/DACircularProgress/DACircularProgressView.h diff --git a/Pods/DACircularProgress/DACircularProgress/DACircularProgressView.m b/Ash_AWord/Vender/DACircularProgress/DACircularProgressView.m similarity index 100% rename from Pods/DACircularProgress/DACircularProgress/DACircularProgressView.m rename to Ash_AWord/Vender/DACircularProgress/DACircularProgressView.m diff --git a/Pods/MWPhotoBrowser/LICENCE.txt b/Ash_AWord/Vender/MWPhotoBrowser/LICENCE.txt similarity index 100% rename from Pods/MWPhotoBrowser/LICENCE.txt rename to Ash_AWord/Vender/MWPhotoBrowser/LICENCE.txt diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCaptionView.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCommon.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCommon.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCommon.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWCommon.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridCell.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWGridViewController.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhoto.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m similarity index 99% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m index 456676e..1dfebd5 100644 --- a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m +++ b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowser.m @@ -185,7 +185,9 @@ _nextButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:[NSString stringWithFormat:arrowPathFormat, @"Right"]] style:UIBarButtonItemStylePlain target:self action:@selector(gotoNextPage)]; } if (self.displayActionButton) { - _actionButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonPressed:)]; +// _actionButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(actionButtonPressed:)]; +// _actionButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@""] style:UIBarButtonItemStyleDone target:self action:@selector(actionButtonPressed:)]; + _actionButton = [Ash_UIUtil rightBarButtonItemWithTarget:self action:@selector(actionButtonPressed:) image:[UIImage imageNamed:@"cellmorebtnnormalN"] highlightedImage:[UIImage imageNamed:@"cellmorebtnclickN"]]; } // Update diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowserPrivate.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowserPrivate.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowserPrivate.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoBrowserPrivate.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoProtocol.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoProtocol.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoProtocol.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWPhotoProtocol.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingView.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.h b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.h similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.h rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.h diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.m b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.m similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.m rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWZoomingScrollView.m diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/Checkmark@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageError@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOff@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedOn@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOff@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/ImageSelectedSmallOn@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowLeft@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineLeft@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowOutlineRight@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemArrowRight@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGrid@2x.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6.png diff --git a/Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6@2x.png b/Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6@2x.png similarity index 100% rename from Pods/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6@2x.png rename to Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/MWPhotoBrowser.bundle/images/UIBarButtonItemGridiOS6@2x.png diff --git a/Pods/MWPhotoBrowser/README.md b/Ash_AWord/Vender/MWPhotoBrowser/README.md similarity index 100% rename from Pods/MWPhotoBrowser/README.md rename to Ash_AWord/Vender/MWPhotoBrowser/README.md diff --git a/Pods/PSTCollectionView/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.h b/Ash_AWord/Vender/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.h rename to Ash_AWord/Vender/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.m b/Ash_AWord/Vender/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.m similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.m rename to Ash_AWord/Vender/PSTCollectionView/NSIndexPath+PSTCollectionViewAdditions.m diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionView.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionView.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionView.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionView.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionView.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionView.m similarity index 92% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionView.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionView.m index bac662f..1bd8599 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionView.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionView.m @@ -11,10 +11,7 @@ #import "PSTCollectionViewItemKey.h" #import -#if TARGET_IPHONE_SIMULATOR #import -#endif -#import @interface PSTCollectionViewLayout (Internal) @property (nonatomic, unsafe_unretained) PSTCollectionView *collectionView; @@ -114,7 +111,7 @@ CGFloat PSTSimulatorAnimationDragCoefficient(void); unsigned int doneFirstLayout : 1; }_collectionViewFlags; CGPoint _lastLayoutOffset; - char filler[232]; // [HACK] Our class needs to be larger than Apple's class for the superclass change to work. + char filler[200]; // [HACK] Our class needs to be larger than Apple's class for the superclass change to work. } @property (nonatomic, strong) PSTCollectionViewData *collectionViewData; @property (nonatomic, strong, readonly) PSTCollectionViewExt *extVars; @@ -275,10 +272,8 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { - (void)setFrame:(CGRect)frame { if (!CGRectEqualToRect(frame, self.frame)) { - CGRect bounds = (CGRect){.origin=self.contentOffset, .size=frame.size}; - BOOL shouldInvalidate = [self.collectionViewLayout shouldInvalidateLayoutForBoundsChange:bounds]; [super setFrame:frame]; - if (shouldInvalidate) { + if ([self.collectionViewLayout shouldInvalidateLayoutForBoundsChange:self.bounds]) { [self invalidateLayout]; _collectionViewFlags.fadeCellsForBoundsChange = YES; } @@ -287,9 +282,8 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { - (void)setBounds:(CGRect)bounds { if (!CGRectEqualToRect(bounds, self.bounds)) { - BOOL shouldInvalidate = [self.collectionViewLayout shouldInvalidateLayoutForBoundsChange:bounds]; [super setBounds:bounds]; - if (shouldInvalidate) { + if ([self.collectionViewLayout shouldInvalidateLayoutForBoundsChange:bounds]) { [self invalidateLayout]; _collectionViewFlags.fadeCellsForBoundsChange = YES; } @@ -617,8 +611,18 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } - (NSIndexPath *)indexPathForItemAtPoint:(CGPoint)point { - PSTCollectionViewLayoutAttributes *attributes = [[self.collectionViewLayout layoutAttributesForElementsInRect:CGRectMake(point.x, point.y, 1, 1)] lastObject]; - return attributes.indexPath; + __block NSIndexPath *indexPath = nil; + [_allVisibleViewsDict enumerateKeysAndObjectsWithOptions:kNilOptions usingBlock:^(id key, id obj, BOOL *stop) { + PSTCollectionViewItemKey *itemKey = (PSTCollectionViewItemKey *)key; + if (itemKey.type == PSTCollectionViewItemTypeCell) { + PSTCollectionViewCell *cell = (PSTCollectionViewCell *)obj; + if (CGRectContainsPoint(cell.frame, point) && cell.userInteractionEnabled) { + indexPath = itemKey.indexPath; + *stop = YES; + } + } + }]; + return indexPath; } - (NSIndexPath *)indexPathForCell:(PSTCollectionViewCell *)cell { @@ -984,8 +988,8 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { // First delete all items NSMutableArray *paths = [NSMutableArray new]; [sections enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) { - for (int i = 0; i < [self numberOfItemsInSection:(NSInteger)idx]; ++i) { - [paths addObject:[NSIndexPath indexPathForItem:i inSection:(NSInteger)idx]]; + for (int i = 0; i < [self numberOfItemsInSection:idx]; ++i) { + [paths addObject:[NSIndexPath indexPathForItem:i inSection:idx]]; } }]; [self deleteItemsAtIndexPaths:paths]; @@ -1082,9 +1086,6 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } else { layout.collectionView = self; - - _layout.collectionView = nil; - _layout = layout; _collectionViewData = [[PSTCollectionViewData alloc] initWithCollectionView:self layout:layout]; [_collectionViewData prepareToLoadData]; @@ -1285,6 +1286,9 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { applyNewLayoutBlock(); freeUnusedViews(); } + + _layout.collectionView = nil; + _layout = layout; } } @@ -1300,22 +1304,22 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { self.extVars.collectionViewDelegate = delegate; // Managing the Selected Cells - _collectionViewFlags.delegateShouldSelectItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:shouldSelectItemAtIndexPath:)]; - _collectionViewFlags.delegateDidSelectItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didSelectItemAtIndexPath:)]; - _collectionViewFlags.delegateShouldDeselectItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:shouldDeselectItemAtIndexPath:)]; - _collectionViewFlags.delegateDidDeselectItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didDeselectItemAtIndexPath:)]; + _collectionViewFlags.delegateShouldSelectItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:shouldSelectItemAtIndexPath:)]; + _collectionViewFlags.delegateDidSelectItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:didSelectItemAtIndexPath:)]; + _collectionViewFlags.delegateShouldDeselectItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:shouldDeselectItemAtIndexPath:)]; + _collectionViewFlags.delegateDidDeselectItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:didDeselectItemAtIndexPath:)]; // Managing Cell Highlighting - _collectionViewFlags.delegateShouldHighlightItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:shouldHighlightItemAtIndexPath:)]; - _collectionViewFlags.delegateDidHighlightItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didHighlightItemAtIndexPath:)]; - _collectionViewFlags.delegateDidUnhighlightItemAtIndexPath = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didUnhighlightItemAtIndexPath:)]; + _collectionViewFlags.delegateShouldHighlightItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:shouldHighlightItemAtIndexPath:)]; + _collectionViewFlags.delegateDidHighlightItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:didHighlightItemAtIndexPath:)]; + _collectionViewFlags.delegateDidUnhighlightItemAtIndexPath = [self.delegate respondsToSelector:@selector(collectionView:didUnhighlightItemAtIndexPath:)]; // Tracking the Removal of Views - _collectionViewFlags.delegateDidEndDisplayingCell = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didEndDisplayingCell:forItemAtIndexPath:)]; - _collectionViewFlags.delegateDidEndDisplayingSupplementaryView = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:didEndDisplayingSupplementaryView:forElementOfKind:atIndexPath:)]; + _collectionViewFlags.delegateDidEndDisplayingCell = [self.delegate respondsToSelector:@selector(collectionView:didEndDisplayingCell:forItemAtIndexPath:)]; + _collectionViewFlags.delegateDidEndDisplayingSupplementaryView = [self.delegate respondsToSelector:@selector(collectionView:didEndDisplayingSupplementaryView:forElementOfKind:atIndexPath:)]; // Managing Actions for Cells - _collectionViewFlags.delegateSupportsMenus = (unsigned int)[self.delegate respondsToSelector:@selector(collectionView:shouldShowMenuForItemAtIndexPath:)]; + _collectionViewFlags.delegateSupportsMenus = [self.delegate respondsToSelector:@selector(collectionView:shouldShowMenuForItemAtIndexPath:)]; // These aren't present in the flags which is a little strange. Not adding them because that will mess with byte alignment which will affect cross compatibility. // The flag names are guesses and are there for documentation purposes. @@ -1329,10 +1333,10 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { _dataSource = dataSource; // Getting Item and Section Metrics - _collectionViewFlags.dataSourceNumberOfSections = (unsigned int)[_dataSource respondsToSelector:@selector(numberOfSectionsInCollectionView:)]; + _collectionViewFlags.dataSourceNumberOfSections = [_dataSource respondsToSelector:@selector(numberOfSectionsInCollectionView:)]; // Getting Views for Items - _collectionViewFlags.dataSourceViewForSupplementaryElement = (unsigned int)[_dataSource respondsToSelector:@selector(collectionView:viewForSupplementaryElementOfKind:atIndexPath:)]; + _collectionViewFlags.dataSourceViewForSupplementaryElement = [_dataSource respondsToSelector:@selector(collectionView:viewForSupplementaryElementOfKind:atIndexPath:)]; } } @@ -1341,7 +1345,7 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } - (void)setAllowsSelection:(BOOL)allowsSelection { - _collectionViewFlags.allowsSelection = (unsigned int)allowsSelection; + _collectionViewFlags.allowsSelection = allowsSelection; } - (BOOL)allowsMultipleSelection { @@ -1349,7 +1353,7 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } - (void)setAllowsMultipleSelection:(BOOL)allowsMultipleSelection { - _collectionViewFlags.allowsMultipleSelection = (unsigned int)allowsMultipleSelection; + _collectionViewFlags.allowsMultipleSelection = allowsMultipleSelection; // Deselect all objects if allows multiple selection is false if (!allowsMultipleSelection && _indexPathsForSelectedItems.count) { @@ -1723,10 +1727,10 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { NSArray *oldToNewIndexMap = _update[@"oldToNewIndexMap"]; NSUInteger newGlobalIndex = NSNotFound; if (NSNotFound != oldGlobalIndex && oldGlobalIndex < oldToNewIndexMap.count) { - newGlobalIndex = [oldToNewIndexMap[oldGlobalIndex] unsignedIntegerValue]; + newGlobalIndex = [oldToNewIndexMap[oldGlobalIndex] intValue]; } - NSIndexPath *newIndexPath = newGlobalIndex == NSNotFound ? nil : [_update[@"newModel"] indexPathForItemAtGlobalIndex:(int)newGlobalIndex]; - NSIndexPath *oldIndexPath = oldGlobalIndex == NSNotFound ? nil : [_update[@"oldModel"] indexPathForItemAtGlobalIndex:(int)oldGlobalIndex]; + NSIndexPath *newIndexPath = newGlobalIndex == NSNotFound ? nil : [_update[@"newModel"] indexPathForItemAtGlobalIndex:newGlobalIndex]; + NSIndexPath *oldIndexPath = oldGlobalIndex == NSNotFound ? nil : [_update[@"oldModel"] indexPathForItemAtGlobalIndex:oldGlobalIndex]; if (newIndexPath) { PSTCollectionViewLayoutAttributes *startAttrs = nil; @@ -1779,9 +1783,6 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } } - //In here I think it doesn't need the animation but the transaction, it would cause some issue of display. - //I resolve the bug when user insert the new sections, the cell will display with a blink animation at the first operation. - //But I don't know why the next operation wouldn't reproduction in the pre version. _allVisibleViewsDict = newAllVisibleView; for (NSDictionary *animation in animations) { @@ -1790,41 +1791,58 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { [view applyLayoutAttributes:attr]; }; - _collectionViewFlags.updatingLayout = YES; - - [CATransaction begin]; - [CATransaction setAnimationDuration:0]; - [CATransaction setCompletionBlock:^{ - // Iterate through all the views that we are going to remove. - [viewsToRemove enumerateKeysAndObjectsUsingBlock:^(NSNumber *keyObj, NSArray *views, BOOL *stop) { - PSTCollectionViewItemType type = [keyObj unsignedIntegerValue]; - for (PSTCollectionReusableView *view in views) { - if (type == PSTCollectionViewItemTypeCell) { - [self reuseCell:(PSTCollectionViewCell *)view]; - } else if (type == PSTCollectionViewItemTypeSupplementaryView) { - [self reuseSupplementaryView:view]; - } else if (type == PSTCollectionViewItemTypeDecorationView) { - [self reuseDecorationView:view]; - } - } - }]; - - _collectionViewFlags.updatingLayout = NO; - - //In here I think when the block is called, the flag is YES. So the _updateCopletionHandler's paramer is YES. - if (_updateCompletionHandler) { - _updateCompletionHandler(YES); - _updateCompletionHandler = nil; - } - }]; - - for (NSDictionary *animation in animations) { - PSTCollectionReusableView *view = animation[@"view"]; - PSTCollectionViewLayoutAttributes *attrs = animation[@"newLayoutInfos"]; - [view applyLayoutAttributes:attrs]; - } - [CATransaction commit]; - + [UIView animateWithDuration:.3 animations:^{ + _collectionViewFlags.updatingLayout = YES; + + [CATransaction begin]; + [CATransaction setAnimationDuration:.3]; + + // You might wonder why we use CATransaction to handle animation completion + // here instead of using the completion: parameter of UIView's animateWithDuration:. + // The problem is that animateWithDuration: calls this completion block + // when other animations are finished. This means that the block is called + // after the user releases his finger and the scroll view has finished scrolling. + // This can be a large delay, which causes the layout of the cells to be greatly + // delayed, and thus, be unrendered. I assume that was done for performance + // purposes but it completely breaks our layout logic here. + // To get the completion block called immediately after the animation actually + // finishes, I switched to use CATransaction. + // The only thing I'm not sure about - _completed_ flag. I don't know where to get it + // in terms of CATransaction's API, so I use animateWithDuration's completion block + // to call _updateCompletionHandler with that flag. + // Ideally, _updateCompletionHandler should be called along with the other logic in + // CATransaction's completionHandler but I simply don't know where to get that flag. + [CATransaction setCompletionBlock:^{ + // Iterate through all the views that we are going to remove. + [viewsToRemove enumerateKeysAndObjectsUsingBlock:^(NSNumber *keyObj, NSArray *views, BOOL *stop) { + PSTCollectionViewItemType type = [keyObj unsignedIntegerValue]; + for (PSTCollectionReusableView *view in views) { + if (type == PSTCollectionViewItemTypeCell) { + [self reuseCell:(PSTCollectionViewCell *)view]; + }else if (type == PSTCollectionViewItemTypeSupplementaryView) { + [self reuseSupplementaryView:view]; + }else if (type == PSTCollectionViewItemTypeDecorationView) { + [self reuseDecorationView:view]; + } + } + }]; + _collectionViewFlags.updatingLayout = NO; + }]; + + for (NSDictionary *animation in animations) { + PSTCollectionReusableView *view = animation[@"view"]; + PSTCollectionViewLayoutAttributes *attrs = animation[@"newLayoutInfos"]; + [view applyLayoutAttributes:attrs]; + } + [CATransaction commit]; + } completion:^(BOOL finished) { + + if (_updateCompletionHandler) { + _updateCompletionHandler(finished); + _updateCompletionHandler = nil; + } + }]; + [_layout finalizeCollectionViewUpdates]; } @@ -2013,12 +2031,12 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { #if !defined NS_BLOCK_ASSERTIONS for (NSNumber *sectionKey in [operations keyEnumerator]) { - NSInteger section = [sectionKey integerValue]; + NSInteger section = [sectionKey intValue]; - NSInteger insertedCount = [operations[sectionKey][@"inserted"] integerValue]; - NSInteger deletedCount = [operations[sectionKey][@"deleted"] integerValue]; - NSInteger movedInCount = [operations[sectionKey][@"movedIn"] integerValue]; - NSInteger movedOutCount = [operations[sectionKey][@"movedOut"] integerValue]; + NSInteger insertedCount = [operations[sectionKey][@"inserted"] intValue]; + NSInteger deletedCount = [operations[sectionKey][@"deleted"] intValue]; + NSInteger movedInCount = [operations[sectionKey][@"movedIn"] intValue]; + NSInteger movedOutCount = [operations[sectionKey][@"movedOut"] intValue]; NSAssert([oldCollectionViewData numberOfItemsInSection:section] + insertedCount - deletedCount + movedInCount - movedOutCount == [_collectionViewData numberOfItemsInSection:section], @@ -2059,33 +2077,33 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { // section updates are ignored anyway in animation code. If not commented, mixing rows and section deletion causes crash in else below // [newModel removeObjectAtIndex:updateItem.indexPathBeforeUpdate.section]; }else { - [(NSMutableArray *)newModel[(NSUInteger)updateItem.indexPathBeforeUpdate.section] - removeObjectAtIndex:(NSUInteger)updateItem.indexPathBeforeUpdate.item]; + [(NSMutableArray *)newModel[updateItem.indexPathBeforeUpdate.section] + removeObjectAtIndex:updateItem.indexPathBeforeUpdate.item]; } } break; case PSTCollectionUpdateActionInsert: { if (updateItem.isSectionOperation) { [newModel insertObject:[[NSMutableArray alloc] init] - atIndex:(NSUInteger)updateItem.indexPathAfterUpdate.section]; + atIndex:updateItem.indexPathAfterUpdate.section]; }else { - [(NSMutableArray *)newModel[(NSUInteger)updateItem.indexPathAfterUpdate.section] + [(NSMutableArray *)newModel[updateItem.indexPathAfterUpdate.section] insertObject:@(NSNotFound) - atIndex:(NSUInteger)updateItem.indexPathAfterUpdate.item]; + atIndex:updateItem.indexPathAfterUpdate.item]; } } break; case PSTCollectionUpdateActionMove: { if (updateItem.isSectionOperation) { - id section = newModel[(NSUInteger)updateItem.indexPathBeforeUpdate.section]; - [newModel insertObject:section atIndex:(NSUInteger)updateItem.indexPathAfterUpdate.section]; + id section = newModel[updateItem.indexPathBeforeUpdate.section]; + [newModel insertObject:section atIndex:updateItem.indexPathAfterUpdate.section]; } else { id object = @([oldCollectionViewData globalIndexForItemAtIndexPath:updateItem.indexPathBeforeUpdate]); - [newModel[(NSUInteger)updateItem.indexPathBeforeUpdate.section] removeObject:object]; - [newModel[(NSUInteger)updateItem.indexPathAfterUpdate.section] insertObject:object - atIndex:(NSUInteger)updateItem.indexPathAfterUpdate.item]; + [newModel[updateItem.indexPathBeforeUpdate.section] removeObject:object]; + [newModel[updateItem.indexPathAfterUpdate.section] insertObject:object + atIndex:updateItem.indexPathAfterUpdate.item]; } } break; @@ -2093,8 +2111,8 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { } } - NSMutableArray *oldToNewMap = [NSMutableArray arrayWithCapacity:(NSUInteger)[oldCollectionViewData numberOfItems]]; - NSMutableArray *newToOldMap = [NSMutableArray arrayWithCapacity:(NSUInteger)[_collectionViewData numberOfItems]]; + NSMutableArray *oldToNewMap = [NSMutableArray arrayWithCapacity:[oldCollectionViewData numberOfItems]]; + NSMutableArray *newToOldMap = [NSMutableArray arrayWithCapacity:[_collectionViewData numberOfItems]]; for (NSInteger i = 0; i < [oldCollectionViewData numberOfItems]; i++) [oldToNewMap addObject:@(NSNotFound)]; @@ -2105,9 +2123,9 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { for (NSUInteger i = 0; i < newModel.count; i++) { NSMutableArray *section = newModel[i]; for (NSUInteger j = 0; j < section.count; j++) { - NSUInteger newGlobalIndex = [_collectionViewData globalIndexForItemAtIndexPath:[NSIndexPath indexPathForItem:(NSInteger)j inSection:(NSInteger)i]]; + NSInteger newGlobalIndex = [_collectionViewData globalIndexForItemAtIndexPath:[NSIndexPath indexPathForItem:j inSection:i]]; if ([section[j] integerValue] != NSNotFound) - oldToNewMap[[section[j] unsignedIntegerValue]] = @(newGlobalIndex); + oldToNewMap[[section[j] intValue]] = @(newGlobalIndex); if (newGlobalIndex != NSNotFound) newToOldMap[newGlobalIndex] = section[j]; } @@ -2151,7 +2169,7 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { NSMutableArray *updateActions = [self arrayForUpdateAction:updateAction]; [sections enumerateIndexesUsingBlock:^(NSUInteger section, BOOL *stop) { - PSTCollectionViewUpdateItem *updateItem = [[PSTCollectionViewUpdateItem alloc] initWithAction:updateAction forIndexPath:[NSIndexPath indexPathForItem:NSNotFound inSection:(NSInteger)section]]; + PSTCollectionViewUpdateItem *updateItem = [[PSTCollectionViewUpdateItem alloc] initWithAction:updateAction forIndexPath:[NSIndexPath indexPathForItem:NSNotFound inSection:section]]; [updateActions addObject:updateItem]; }]; @@ -2208,50 +2226,31 @@ static void PSTCollectionViewCommonSetup(PSTCollectionView *_self) { @implementation PSUICollectionViewLayoutAttributes_ @end @implementation PSUICollectionViewController_ @end -static void PSTRegisterClasses() { - NSDictionary *map = @{ - @"UICollectionView": PSUICollectionView_.class, - @"UICollectionViewCell": PSUICollectionViewCell_.class, - @"UICollectionReusableView": PSUICollectionReusableView_.class, - @"UICollectionViewLayout": PSUICollectionViewLayout_.class, - @"UICollectionViewFlowLayout": PSUICollectionViewFlowLayout_.class, - @"UICollectionViewLayoutAttributes": PSUICollectionViewLayoutAttributes_.class, - @"UICollectionViewController": PSUICollectionViewController_.class - }; +static BOOL PSTRegisterClass(NSString *UIClassName, Class PSTClass) { + NSCParameterAssert(UIClassName && PSTClass); - // Ensure that superclass replacement is all-or-nothing for the PSUI*_ types. Either use exclusively - // UICollectionView*, or exclusively PSTCollectionView*. - __block BOOL canOverwrite = YES; - [map enumerateKeysAndObjectsUsingBlock:^(NSString* UIClassName, id PSTClass, BOOL *stop) { - Class UIClass = NSClassFromString(UIClassName); - if (UIClass) { - // Class size need to be the same for class_setSuperclass to work. - // If the UIKit class is smaller then our subclass, ivars won't clash, so there's no issue. - long sizeDifference = (long)class_getInstanceSize(UIClass) - class_getInstanceSize(PSTClass); - if (sizeDifference > 0) { - canOverwrite = NO; - NSLog(@"Warning! ivar size mismatch in %@ of %tu bytes - can't change the superclass.", PSTClass, sizeDifference); - } + Class UIClass = NSClassFromString(UIClassName); + if (UIClass) { + // Class size need to be the same for class_setSuperclass to work. + // If the UIKit class is smaller then our subclass, ivars won't clash, so there's no issue. + long sizeDifference = class_getInstanceSize(UIClass) - class_getInstanceSize(PSTClass); + if (sizeDifference > 0) { + NSLog(@"Warning! ivar size mismatch in %@ - can't change the superclass.", PSTClass); + return NO; } else { - canOverwrite = NO; - // We're most likely on iOS5, the requested UIKit class doesn't exist, so we create it dynamically. - if ((UIClass = objc_allocateClassPair(PSTClass, UIClassName.UTF8String, 0))) { - objc_registerClassPair(UIClass); - } - } - }]; - - if (canOverwrite) { - // All UICollectionView types were found and appropriately sized, so it is safe to replace the super-class. - [map enumerateKeysAndObjectsUsingBlock:^(NSString* UIClassName, id PSTClass, BOOL *stop) { - Class UIClass = NSClassFromString(UIClassName); #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" // class_setSuperclass is deprecated, but still exists and works on iOS6/7. class_setSuperclass(PSTClass, UIClass); #pragma clang diagnostic pop - }]; + } + } else { + // We're most likely on iOS5, the requested UIKit class doesn't exist, so we create it dynamically. + if ((UIClass = objc_allocateClassPair(PSTClass, UIClassName.UTF8String, 0))) { + objc_registerClassPair(UIClass); + } } + return YES; } // Create subclasses that pose as UICollectionView et al, if not available at runtime. @@ -2260,7 +2259,13 @@ __attribute__((constructor)) static void PSTCreateUICollectionViewClasses(void) @autoreleasepool { // Change superclass at runtime. This allows seamless switching from PST* to UI* at runtime. - PSTRegisterClasses(); + PSTRegisterClass(@"UICollectionView", PSUICollectionView_.class); + PSTRegisterClass(@"UICollectionViewCell", PSUICollectionViewCell_.class); + PSTRegisterClass(@"UICollectionReusableView", PSUICollectionReusableView_.class); + PSTRegisterClass(@"UICollectionViewLayout", PSUICollectionViewLayout_.class); + PSTRegisterClass(@"UICollectionViewFlowLayout", PSUICollectionViewFlowLayout_.class); + PSTRegisterClass(@"UICollectionViewLayoutAttributes", PSUICollectionViewLayoutAttributes_.class); + PSTRegisterClass(@"UICollectionViewController", PSUICollectionViewController_.class); // add PSUI classes at runtime to make Interface Builder sane // (IB doesn't allow adding the PSUICollectionView_ types but doesn't complain on unknown classes) diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCell.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCell.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCell.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCell.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCell.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCell.m similarity index 97% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCell.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCell.m index a81555e..db216ed 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCell.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCell.m @@ -76,7 +76,7 @@ } - (void)setInUpdateAnimation:(BOOL)inUpdateAnimation { - _reusableViewFlags.inUpdateAnimation = (unsigned int)inUpdateAnimation; + _reusableViewFlags.inUpdateAnimation = inUpdateAnimation; } @end @@ -149,14 +149,14 @@ // Selection highlights underlying contents - (void)setSelected:(BOOL)selected { - _collectionCellFlags.selected = (unsigned int)selected; + _collectionCellFlags.selected = selected; self.accessibilityTraits = selected ? UIAccessibilityTraitSelected : UIAccessibilityTraitNone; [self updateBackgroundView:selected]; } // Cell highlighting only highlights the cell itself - (void)setHighlighted:(BOOL)highlighted { - _collectionCellFlags.highlighted = (unsigned int)highlighted; + _collectionCellFlags.highlighted = highlighted; [self updateBackgroundView:highlighted]; } diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCommon.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCommon.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewCommon.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewCommon.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewController.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewController.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewController.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewController.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewController.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewController.m similarity index 99% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewController.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewController.m index 9000dc7..f3849fc 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewController.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewController.m @@ -123,7 +123,7 @@ #pragma mark - Properties - (void)setClearsSelectionOnViewWillAppear:(BOOL)clearsSelectionOnViewWillAppear { - _collectionViewControllerFlags.clearsSelectionOnViewWillAppear = (unsigned int)clearsSelectionOnViewWillAppear; + _collectionViewControllerFlags.clearsSelectionOnViewWillAppear = clearsSelectionOnViewWillAppear; } - (BOOL)clearsSelectionOnViewWillAppear { diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewData.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewData.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewData.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewData.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewData.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewData.m similarity index 96% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewData.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewData.m index 2892e42..54a920e 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewData.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewData.m @@ -171,7 +171,7 @@ } - (void)setLayoutIsPrepared:(BOOL)layoutIsPrepared { - _collectionViewDataFlags.layoutIsPrepared = (unsigned int)layoutIsPrepared; + _collectionViewDataFlags.layoutIsPrepared = layoutIsPrepared; } /////////////////////////////////////////////////////////////////////////////////////////// @@ -208,9 +208,9 @@ } // allocate space if (!_sectionItemCounts) { - _sectionItemCounts = malloc((size_t)_numSections * sizeof(NSInteger)); + _sectionItemCounts = malloc(_numSections * sizeof(NSInteger)); }else { - _sectionItemCounts = realloc(_sectionItemCounts, (size_t)_numSections * sizeof(NSInteger)); + _sectionItemCounts = realloc(_sectionItemCounts, _numSections * sizeof(NSInteger)); } // query cells per section diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.h similarity index 97% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.h index 7dc971b..043333d 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.h +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.h @@ -24,6 +24,7 @@ typedef NS_ENUM(NSInteger, PSTCollectionViewScrollDirection) { - (CGFloat)collectionView:(PSTCollectionView *)collectionView layout:(PSTCollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section; - (CGSize)collectionView:(PSTCollectionView *)collectionView layout:(PSTCollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section; - (CGSize)collectionView:(PSTCollectionView *)collectionView layout:(PSTCollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section; +- (PSTCollectionViewLayoutAttributes *)layoutAttributesForSupplementaryViewOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath; @end diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.m similarity index 88% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.m index e34d002..0104340 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewFlowLayout.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewFlowLayout.m @@ -145,7 +145,7 @@ static char kPSTCachedItemRectsKey; normalizedHeaderFrame.origin.x += section.frame.origin.x; normalizedHeaderFrame.origin.y += section.frame.origin.y; if (!CGRectIsEmpty(normalizedHeaderFrame) && CGRectIntersectsRect(normalizedHeaderFrame, rect)) { - PSTCollectionViewLayoutAttributes *layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:PSTCollectionElementKindSectionHeader withIndexPath:[NSIndexPath indexPathForItem:0 inSection:(NSInteger)sectionIndex]]; + PSTCollectionViewLayoutAttributes *layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:PSTCollectionElementKindSectionHeader withIndexPath:[NSIndexPath indexPathForItem:0 inSection:sectionIndex]]; layoutAttributes.frame = normalizedHeaderFrame; [layoutAttributesArray addObject:layoutAttributes]; } @@ -155,13 +155,11 @@ static char kPSTCachedItemRectsKey; itemRects = [(section.rows)[0] itemRects]; if (itemRects) rectCache[@(sectionIndex)] = itemRects; } - + for (PSTGridLayoutRow *row in section.rows) { CGRect normalizedRowFrame = row.rowFrame; - normalizedRowFrame.origin.x += section.frame.origin.x; normalizedRowFrame.origin.y += section.frame.origin.y; - if (CGRectIntersectsRect(normalizedRowFrame, rect)) { // TODO be more fine-grained for items @@ -170,21 +168,16 @@ static char kPSTCachedItemRectsKey; NSUInteger sectionItemIndex; CGRect itemFrame; if (row.fixedItemSize) { - itemFrame = [itemRects[(NSUInteger)itemIndex] CGRectValue]; - sectionItemIndex = (NSUInteger)(row.index * section.itemsByRowCount + itemIndex); + itemFrame = [itemRects[itemIndex] CGRectValue]; + sectionItemIndex = row.index * section.itemsByRowCount + itemIndex; }else { - PSTGridLayoutItem *item = row.items[(NSUInteger)itemIndex]; + PSTGridLayoutItem *item = row.items[itemIndex]; sectionItemIndex = [section.items indexOfObjectIdenticalTo:item]; itemFrame = item.itemFrame; } - - CGRect normalisedItemFrame = CGRectMake(normalizedRowFrame.origin.x + itemFrame.origin.x, normalizedRowFrame.origin.y + itemFrame.origin.y, itemFrame.size.width, itemFrame.size.height); - - if (CGRectIntersectsRect(normalisedItemFrame, rect)) { - layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForCellWithIndexPath:[NSIndexPath indexPathForItem:(NSInteger)sectionItemIndex inSection:(NSInteger)sectionIndex]]; - layoutAttributes.frame = normalisedItemFrame; - [layoutAttributesArray addObject:layoutAttributes]; - } + layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForCellWithIndexPath:[NSIndexPath indexPathForItem:sectionItemIndex inSection:sectionIndex]]; + layoutAttributes.frame = CGRectMake(normalizedRowFrame.origin.x + itemFrame.origin.x, normalizedRowFrame.origin.y + itemFrame.origin.y, itemFrame.size.width, itemFrame.size.height); + [layoutAttributesArray addObject:layoutAttributes]; } } } @@ -193,7 +186,7 @@ static char kPSTCachedItemRectsKey; normalizedFooterFrame.origin.x += section.frame.origin.x; normalizedFooterFrame.origin.y += section.frame.origin.y; if (!CGRectIsEmpty(normalizedFooterFrame) && CGRectIntersectsRect(normalizedFooterFrame, rect)) { - PSTCollectionViewLayoutAttributes *layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:PSTCollectionElementKindSectionFooter withIndexPath:[NSIndexPath indexPathForItem:0 inSection:(NSInteger)sectionIndex]]; + PSTCollectionViewLayoutAttributes *layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:PSTCollectionElementKindSectionFooter withIndexPath:[NSIndexPath indexPathForItem:0 inSection:sectionIndex]]; layoutAttributes.frame = normalizedFooterFrame; [layoutAttributesArray addObject:layoutAttributes]; } @@ -205,17 +198,17 @@ static char kPSTCachedItemRectsKey; - (PSTCollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath { if (!_data) [self prepareLayout]; - PSTGridLayoutSection *section = _data.sections[(NSUInteger)indexPath.section]; + PSTGridLayoutSection *section = _data.sections[indexPath.section]; PSTGridLayoutRow *row = nil; CGRect itemFrame = CGRectZero; - if (section.fixedItemSize && section.itemsByRowCount > 0 && indexPath.item / section.itemsByRowCount < (NSInteger)section.rows.count) { - row = section.rows[(NSUInteger)(indexPath.item / section.itemsByRowCount)]; - NSUInteger itemIndex = (NSUInteger)(indexPath.item % section.itemsByRowCount); + if (section.fixedItemSize && indexPath.item / section.itemsByRowCount < (NSInteger)section.rows.count) { + row = section.rows[indexPath.item / section.itemsByRowCount]; + NSUInteger itemIndex = indexPath.item % section.itemsByRowCount; NSArray *itemRects = [row itemRects]; itemFrame = [itemRects[itemIndex] CGRectValue]; }else if (indexPath.item < (NSInteger)section.items.count) { - PSTGridLayoutItem *item = section.items[(NSUInteger)indexPath.item]; + PSTGridLayoutItem *item = section.items[indexPath.item]; row = item.rowObject; itemFrame = item.itemFrame; } @@ -234,7 +227,7 @@ static char kPSTCachedItemRectsKey; - (PSTCollectionViewLayoutAttributes *)layoutAttributesForSupplementaryViewOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath { if (!_data) [self prepareLayout]; - NSUInteger sectionIndex = (NSUInteger)indexPath.section; + NSUInteger sectionIndex = indexPath.section; PSTCollectionViewLayoutAttributes *layoutAttributes = nil; if (sectionIndex < _data.sections.count) { @@ -252,7 +245,7 @@ static char kPSTCachedItemRectsKey; normalizedFrame.origin.x += section.frame.origin.x; normalizedFrame.origin.y += section.frame.origin.y; - layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:kind withIndexPath:[NSIndexPath indexPathForItem:0 inSection:(NSInteger)sectionIndex]]; + layoutAttributes = [[self.class layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:kind withIndexPath:[NSIndexPath indexPathForItem:0 inSection:sectionIndex]]; layoutAttributes.frame = normalizedFrame; } } @@ -330,8 +323,8 @@ static char kPSTCachedItemRectsKey; BOOL implementsHeaderReferenceDelegate = [flowDataSource respondsToSelector:@selector(collectionView:layout:referenceSizeForHeaderInSection:)]; BOOL implementsFooterReferenceDelegate = [flowDataSource respondsToSelector:@selector(collectionView:layout:referenceSizeForFooterInSection:)]; - NSInteger numberOfSections = [self.collectionView numberOfSections]; - for (NSInteger section = 0; section < numberOfSections; section++) { + NSUInteger numberOfSections = [self.collectionView numberOfSections]; + for (NSUInteger section = 0; section < numberOfSections; section++) { PSTGridLayoutSection *layoutSection = [_data addSection]; layoutSection.verticalInterstice = _data.horizontal ? self.minimumInteritemSpacing : self.minimumLineSpacing; layoutSection.horizontalInterstice = !_data.horizontal ? self.minimumInteritemSpacing : self.minimumLineSpacing; @@ -376,12 +369,12 @@ static char kPSTCachedItemRectsKey; } layoutSection.footerDimension = _data.horizontal ? footerReferenceSize.width : footerReferenceSize.height; - NSInteger numberOfItems = [self.collectionView numberOfItemsInSection:section]; + NSUInteger numberOfItems = [self.collectionView numberOfItemsInSection:section]; // if delegate implements size delegate, query it for all items if (implementsSizeDelegate) { - for (NSInteger item = 0; item < numberOfItems; item++) { - NSIndexPath *indexPath = [NSIndexPath indexPathForItem:item inSection:(NSInteger)section]; + for (NSUInteger item = 0; item < numberOfItems; item++) { + NSIndexPath *indexPath = [NSIndexPath indexPathForItem:item inSection:section]; CGSize itemSize = implementsSizeDelegate ? [flowDataSource collectionView:self.collectionView layout:self sizeForItemAtIndexPath:indexPath] : self.itemSize; PSTGridLayoutItem *layoutItem = [layoutSection addItem]; @@ -406,11 +399,11 @@ static char kPSTCachedItemRectsKey; if (_data.horizontal) { sectionFrame.origin.x += contentSize.width; contentSize.width += section.frame.size.width + section.frame.origin.x; - contentSize.height = MAX(contentSize.height, sectionFrame.size.height + section.frame.origin.y + section.sectionMargins.top + section.sectionMargins.bottom); + contentSize.height = fmax(contentSize.height, sectionFrame.size.height + section.frame.origin.y + section.sectionMargins.top + section.sectionMargins.bottom); }else { sectionFrame.origin.y += contentSize.height; contentSize.height += sectionFrame.size.height + section.frame.origin.y; - contentSize.width = MAX(contentSize.width, sectionFrame.size.width + section.frame.origin.x + section.sectionMargins.left + section.sectionMargins.right); + contentSize.width = fmax(contentSize.width, sectionFrame.size.width + section.frame.origin.x + section.sectionMargins.left + section.sectionMargins.right); } section.frame = sectionFrame; } diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewItemKey.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewItemKey.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewItemKey.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewItemKey.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewItemKey.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewItemKey.m similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewItemKey.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewItemKey.m diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout+Internals.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout+Internals.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout+Internals.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout+Internals.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout.m similarity index 94% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout.m index 7cb5ead..4eb897a 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewLayout.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewLayout.m @@ -8,7 +8,6 @@ #import "PSTCollectionView.h" #import "PSTCollectionViewItemKey.h" #import "PSTCollectionViewData.h" - #import @interface PSTCollectionView () @@ -126,18 +125,14 @@ return self.representedElementCategory == PSTCollectionViewItemTypeCell; } -- (void) updateFrame { - _frame = (CGRect){{_center.x - _size.width / 2, _center.y - _size.height / 2}, _size}; -} - - (void)setSize:(CGSize)size { _size = size; - [self updateFrame]; + _frame = (CGRect){_frame.origin, _size}; } - (void)setCenter:(CGPoint)center { _center = center; - [self updateFrame]; + _frame = (CGRect){{_center.x - _frame.size.width / 2, _center.y - _frame.size.height / 2}, _frame.size}; } - (void)setFrame:(CGRect)frame { @@ -301,7 +296,7 @@ PSTCollectionViewLayoutAttributes *attr = [view.layoutAttributes copy]; if (attr) { if (attr.isCell) { - NSUInteger index = [update[@"oldModel"] globalIndexForItemAtIndexPath:[attr indexPath]]; + NSInteger index = [update[@"oldModel"] globalIndexForItemAtIndexPath:[attr indexPath]]; if (index != NSNotFound) { [attr setIndexPath:[attr indexPath]]; } @@ -316,9 +311,9 @@ for (PSTCollectionViewLayoutAttributes *attr in [collectionViewData layoutAttributesForElementsInRect:bounds]) { if (attr.isCell) { - NSInteger index = (NSInteger)[collectionViewData globalIndexForItemAtIndexPath:attr.indexPath]; + NSInteger index = [collectionViewData globalIndexForItemAtIndexPath:attr.indexPath]; - index = [update[@"newToOldIndexMap"][(NSUInteger)index] integerValue]; + index = [update[@"newToOldIndexMap"][index] intValue]; if (index != NSNotFound) { PSTCollectionViewLayoutAttributes *finalAttrs = [attr copy]; [finalAttrs setIndexPath:[update[@"oldModel"] indexPathForItemAtGlobalIndex:index]]; @@ -333,12 +328,12 @@ if ([updateItem isSectionOperation]) { if (action == PSTCollectionUpdateActionReload) { - [_deletedSectionsSet addIndex:(NSUInteger)[[updateItem indexPathBeforeUpdate] section]]; - [_insertedSectionsSet addIndex:(NSUInteger)[updateItem indexPathAfterUpdate].section]; + [_deletedSectionsSet addIndex:[[updateItem indexPathBeforeUpdate] section]]; + [_insertedSectionsSet addIndex:[updateItem indexPathAfterUpdate].section]; } else { NSMutableIndexSet *indexSet = action == PSTCollectionUpdateActionInsert ? _insertedSectionsSet : _deletedSectionsSet; - [indexSet addIndex:(NSUInteger)[updateItem indexPath].section]; + [indexSet addIndex:[updateItem indexPath].section]; } } else { @@ -370,7 +365,7 @@ - (PSTCollectionViewLayoutAttributes *)initialLayoutAttributesForAppearingItemAtIndexPath:(NSIndexPath *)itemIndexPath { PSTCollectionViewLayoutAttributes *attrs = _initialAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForCellWithIndexPath:itemIndexPath]]; - if ([_insertedSectionsSet containsIndex:(NSUInteger)[itemIndexPath section]]) { + if ([_insertedSectionsSet containsIndex:[itemIndexPath section]]) { attrs = [attrs copy]; [attrs setAlpha:0]; } @@ -380,7 +375,7 @@ - (PSTCollectionViewLayoutAttributes *)finalLayoutAttributesForDisappearingItemAtIndexPath:(NSIndexPath *)itemIndexPath { PSTCollectionViewLayoutAttributes *attrs = _finalAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForCellWithIndexPath:itemIndexPath]]; - if ([_deletedSectionsSet containsIndex:(NSUInteger)[itemIndexPath section]]) { + if ([_deletedSectionsSet containsIndex:[itemIndexPath section]]) { attrs = [attrs copy]; [attrs setAlpha:0]; } @@ -391,7 +386,7 @@ - (PSTCollectionViewLayoutAttributes *)initialLayoutAttributesForInsertedSupplementaryElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)elementIndexPath { PSTCollectionViewLayoutAttributes *attrs = _initialAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForCellWithIndexPath:elementIndexPath]]; - if ([_insertedSectionsSet containsIndex:(NSUInteger)[elementIndexPath section]]) { + if ([_insertedSectionsSet containsIndex:[elementIndexPath section]]) { attrs = [attrs copy]; [attrs setAlpha:0]; } diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewUpdateItem.h b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewUpdateItem.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewUpdateItem.h rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewUpdateItem.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewUpdateItem.m b/Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewUpdateItem.m similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTCollectionViewUpdateItem.m rename to Ash_AWord/Vender/PSTCollectionView/PSTCollectionViewUpdateItem.m diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutInfo.h b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutInfo.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutInfo.h rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutInfo.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutInfo.m b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutInfo.m similarity index 92% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutInfo.m rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutInfo.m index 6ab1aeb..c4c2746 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutInfo.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutInfo.m @@ -50,12 +50,12 @@ } - (CGRect)frameForItemAtIndexPath:(NSIndexPath *)indexPath { - PSTGridLayoutSection *section = self.sections[(NSUInteger)indexPath.section]; + PSTGridLayoutSection *section = self.sections[indexPath.section]; CGRect itemFrame; if (section.fixedItemSize) { itemFrame = (CGRect){.size=section.itemSize}; }else { - itemFrame = [section.items[(NSUInteger)indexPath.item] itemFrame]; + itemFrame = [section.items[indexPath.item] itemFrame]; } return itemFrame; } diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutItem.h b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutItem.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutItem.h rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutItem.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutItem.m b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutItem.m similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutItem.m rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutItem.m diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutRow.h b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutRow.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutRow.h rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutRow.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutRow.m b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutRow.m similarity index 96% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutRow.m rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutRow.m index 3d6ef65..ced4aab 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutRow.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutRow.m @@ -73,7 +73,7 @@ // UICollectionView is smart and lays out items like they would have been placed on a full row // So we need to calculate the "usedItemCount" with using the last item as a reference size. // This allows us to correctly justify-place the items in the grid. - NSInteger usedItemCount = 0; + NSUInteger usedItemCount = 0; NSInteger itemIndex = 0; CGFloat spacing = isHorizontal ? self.section.verticalInterstice : self.section.horizontalInterstice; // the last row should justify as if it is filled with more (invisible) items so that the whole @@ -82,7 +82,7 @@ CGFloat nextItemSize; // first we need to find the size (width/height) of the next item to fit if (!self.fixedItemSize) { - PSTGridLayoutItem *item = self.items[(NSUInteger)MIN(itemIndex, self.itemCount - 1)]; + PSTGridLayoutItem *item = self.items[MIN(itemIndex, self.itemCount - 1)]; nextItemSize = isHorizontal ? item.itemFrame.size.height : item.itemFrame.size.width; }else { nextItemSize = isHorizontal ? self.section.itemSize.height : self.section.itemSize.width; @@ -128,7 +128,7 @@ for (itemIndex = 0; itemIndex < self.itemCount; itemIndex++) { PSTGridLayoutItem *item = nil; if (!self.fixedItemSize) { - item = self.items[(NSUInteger)itemIndex]; + item = self.items[itemIndex]; itemFrame = [item itemFrame]; } // depending on horizontal/vertical for an item size (height/width), @@ -186,7 +186,7 @@ if (self.fixedItemSize) { return _itemCount; }else { - return (NSInteger)self.items.count; + return self.items.count; } } diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutSection.h b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutSection.h similarity index 100% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutSection.h rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutSection.h diff --git a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutSection.m b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutSection.m similarity index 96% rename from Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutSection.m rename to Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutSection.m index 42bef96..7fbdb6a 100644 --- a/Pods/PSTCollectionView/PSTCollectionView/PSTGridLayoutSection.m +++ b/Ash_AWord/Vender/PSTCollectionView/PSTGridLayoutSection.m @@ -85,7 +85,7 @@ BOOL finishCycle = itemIndex >= self.itemsCount; // TODO: fast path could even remove row creation and just calculate on the fly PSTGridLayoutItem *item = nil; - if (!finishCycle) item = self.fixedItemSize ? nil : self.items[(NSUInteger)itemIndex]; + if (!finishCycle) item = self.fixedItemSize ? nil : self.items[itemIndex]; CGSize itemSize = self.fixedItemSize ? self.itemSize : item.itemFrame.size; CGFloat itemDimension = self.layoutInfo.horizontal ? itemSize.height : itemSize.width; @@ -105,12 +105,12 @@ if (self.layoutInfo.horizontal) { row.rowFrame = CGRectMake(sectionSize.width, self.sectionMargins.top, row.rowSize.width, row.rowSize.height); - sectionSize.height = MAX(row.rowSize.height, sectionSize.height); + sectionSize.height = fmax(row.rowSize.height, sectionSize.height); sectionSize.width += row.rowSize.width + (finishCycle ? 0 : self.horizontalInterstice); }else { row.rowFrame = CGRectMake(self.sectionMargins.left, sectionSize.height, row.rowSize.width, row.rowSize.height); sectionSize.height += row.rowSize.height + (finishCycle ? 0 : self.verticalInterstice); - sectionSize.width = MAX(row.rowSize.width, sectionSize.width); + sectionSize.width = fmax(row.rowSize.width, sectionSize.width); } } // add new rows until the section is fully laid out @@ -204,7 +204,7 @@ } - (NSInteger)itemsCount { - return self.fixedItemSize ? _itemsCount : (NSInteger)self.items.count; + return self.fixedItemSize ? _itemsCount : self.items.count; } @end diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.xib b/Ash_AWord/ViewControllers/Login/LoginViewController.xib index 3d186f6..d90155b 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.xib @@ -93,7 +93,7 @@ - + diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index 63e89ab..eb1130f 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -58,7 +58,7 @@ [button setBackgroundColor:[UIColor redColor]]; button.layer.cornerRadius = 5.0; button.layer.masksToBounds = YES; - button.frame = CGRectMake(20, 25, kScreenWidth-40, 50); + button.frame = CGRectMake(20, 25, kScreenWidth-40, 40); [view addSubview:button]; return view; } @@ -67,7 +67,7 @@ static NSString* cellIdentifier = @"cell"; UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; if (!cell) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier]; + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cellIdentifier]; } switch (indexPath.row) { case 0: diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.h b/Ash_AWord/Views/Note/NoteTableViewCell.h index aae9ef5..5f21f23 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.h +++ b/Ash_AWord/Views/Note/NoteTableViewCell.h @@ -20,7 +20,7 @@ @property (weak, nonatomic) IBOutlet UIButton *shareBtn; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *contentHeight; -@property (weak, nonatomic) IBOutlet UIButton *imageBtnClick; +- (IBAction)imageBtnClick:(id)sender; - (IBAction)goodBtnClick:(id)sender; diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m index 5b56fc0..6cc0266 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.m +++ b/Ash_AWord/Views/Note/NoteTableViewCell.m @@ -8,12 +8,19 @@ #import "NoteTableViewCell.h" #import "NoteViewModel.h" +#import "AppDelegate.h" +#import "MWPhotoBrowser.h" +@interface NoteTableViewCell() +@end @implementation NoteTableViewCell - +{ + Text_Image* _text_image; +} - (void)awakeFromNib { // Initialization code _contentLabel.font = [UIFont appFontOfSize:14.0]; _contentTextView.font = [UIFont appFontOfSize:14.0]; + _contentTextView.scrollEnabled = NO; _timeLabel.font = [UIFont appFontOfSize:14.0]; _avatar.layer.cornerRadius = _avatar.frame.size.width/2; @@ -40,6 +47,7 @@ } -(void)setText_Image:(Text_Image *)text_image { + _text_image = text_image; CGSize imageSize = _contentImgView.frame.size; UIGraphicsBeginImageContextWithOptions(imageSize, 0, [UIScreen mainScreen].scale); [[UIColor colorWithWhite:0.6 alpha:0.5] set]; @@ -54,7 +62,7 @@ CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; - _contentHeight.constant = labelRect.size.height+10; + _contentHeight.constant = labelRect.size.height+25; _contentTextView.text = text_image.content; [_contentImgView sd_setImageWithURL:text_image.imageUrl placeholderImage:pressedColorImg]; @@ -75,4 +83,40 @@ } return imageHeight+labelRect.size.height+95; } +- (IBAction)imageBtnClick:(id)sender { + + MWPhotoBrowser *pBrowser = [[MWPhotoBrowser alloc]initWithDelegate:self]; + //是否显示分享按钮 + pBrowser.displayActionButton = YES; + //左右分页切换 + pBrowser.displayNavArrows = YES; + //是否显示选择按钮 + pBrowser.displaySelectionButtons = NO; + //是否显示条件控制控件 + pBrowser.alwaysShowControls = YES; + //是否全屏 + pBrowser.zoomPhotosToFill = YES; + + //允许使用网络查看所有图片 + pBrowser.enableGrid = YES; + //是否第一张 + pBrowser.startOnGrid = YES; + pBrowser.enableSwipeToDismiss = YES; + [pBrowser showNextPhotoAnimated:YES]; + [pBrowser showPreviousPhotoAnimated:YES]; + [pBrowser setCurrentPhotoIndex:0]; + [[AppDelegate visibleViewController].navigationController pushViewController:pBrowser animated:YES]; +} +#pragma mark - MWPhotoBrowserDelegate +-(NSUInteger)numberOfPhotosInPhotoBrowser:(MWPhotoBrowser *)photoBrowser +{ + return 1; +} + +-(id)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index +{ + MWPhoto *photo = [[MWPhoto alloc]initWithURL:_text_image.imageUrl]; + return photo; +} + @end diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib index 4ec7338..9e8279f 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.xib +++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib @@ -89,7 +89,7 @@ - +