ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-12 17:30:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASLayout] Remove new ASLayoutPrivate.h file and put contents into ASLayoutSpec+Subclasses.h

Browse Source
This commit is contained in:
Scott Goodson 2016-10-21 13:21:25 -07:00
parent 2c6f8b0506
commit 30a7edf30f
14 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit.xcodeproj/project.pbxproj
View File

@ -196,7 +196,6 @@
68FC85EA1CE29C7D00EDD713 /* ASVisibilityProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 68FC85E71CE29C7D00EDD713 /* ASVisibilityProtocols.h */; settings = {ATTRIBUTES = (Public, ); }; }; 68FC85EA1CE29C7D00EDD713 /* ASVisibilityProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 68FC85E71CE29C7D00EDD713 /* ASVisibilityProtocols.h */; settings = {ATTRIBUTES = (Public, ); }; };
68FC85EB1CE29C7D00EDD713 /* ASVisibilityProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */; }; 68FC85EB1CE29C7D00EDD713 /* ASVisibilityProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */; };
68FC85EC1CE29C7D00EDD713 /* ASVisibilityProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */; }; 68FC85EC1CE29C7D00EDD713 /* ASVisibilityProtocols.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */; };
690457F71DB5131A00B5EE68 /* ASLayoutPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 690457F61DB5131A00B5EE68 /* ASLayoutPrivate.h */; };
6959433E1D70815300B0EE1F /* ASDisplayNodeLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */; }; 6959433E1D70815300B0EE1F /* ASDisplayNodeLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */; };
6959433F1D70815300B0EE1F /* ASDisplayNodeLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */; }; 6959433F1D70815300B0EE1F /* ASDisplayNodeLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */; };
695943401D70815300B0EE1F /* ASDisplayNodeLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 6959433D1D70815300B0EE1F /* ASDisplayNodeLayout.h */; }; 695943401D70815300B0EE1F /* ASDisplayNodeLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 6959433D1D70815300B0EE1F /* ASDisplayNodeLayout.h */; };
@ -979,7 +978,6 @@
68FC85E11CE29B7E00EDD713 /* ASTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTabBarController.m; sourceTree = "<group>"; }; 68FC85E11CE29B7E00EDD713 /* ASTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTabBarController.m; sourceTree = "<group>"; };
68FC85E71CE29C7D00EDD713 /* ASVisibilityProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASVisibilityProtocols.h; sourceTree = "<group>"; }; 68FC85E71CE29C7D00EDD713 /* ASVisibilityProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASVisibilityProtocols.h; sourceTree = "<group>"; };
68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASVisibilityProtocols.m; sourceTree = "<group>"; }; 68FC85E81CE29C7D00EDD713 /* ASVisibilityProtocols.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASVisibilityProtocols.m; sourceTree = "<group>"; };
690457F61DB5131A00B5EE68 /* ASLayoutPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASLayoutPrivate.h; path = AsyncDisplayKit/Layout/ASLayoutPrivate.h; sourceTree = "<group>"; };
6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASDisplayNodeLayout.mm; sourceTree = "<group>"; }; 6959433C1D70815300B0EE1F /* ASDisplayNodeLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASDisplayNodeLayout.mm; sourceTree = "<group>"; };
6959433D1D70815300B0EE1F /* ASDisplayNodeLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASDisplayNodeLayout.h; sourceTree = "<group>"; }; 6959433D1D70815300B0EE1F /* ASDisplayNodeLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASDisplayNodeLayout.h; sourceTree = "<group>"; };
696FCB301D6E46050093471E /* ASBackgroundLayoutSpecSnapshotTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBackgroundLayoutSpecSnapshotTests.mm; sourceTree = "<group>"; }; 696FCB301D6E46050093471E /* ASBackgroundLayoutSpecSnapshotTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBackgroundLayoutSpecSnapshotTests.mm; sourceTree = "<group>"; };
@ -1712,7 +1710,6 @@
9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */, 9C49C36E1B853957000B0DD5 /* ASStackLayoutElement.h */,
ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */, ACF6ED161B17843500DA7C62 /* ASStackLayoutSpec.h */,
ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */, ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */,
690457F61DB5131A00B5EE68 /* ASLayoutPrivate.h */,
); );
name = Layout; name = Layout;
path = ..; path = ..;
@ -1762,7 +1759,6 @@
9C70F20D1CDBE9CB007D6C76 /* ASDefaultPlayButton.h in Headers */, 9C70F20D1CDBE9CB007D6C76 /* ASDefaultPlayButton.h in Headers */,
68355B411CB57A6C001D4E68 /* ASImageContainerProtocolCategories.h in Headers */, 68355B411CB57A6C001D4E68 /* ASImageContainerProtocolCategories.h in Headers */,
7630FFA81C9E267E007A7C0E /* ASVideoNode.h in Headers */, 7630FFA81C9E267E007A7C0E /* ASVideoNode.h in Headers */,
690457F71DB5131A00B5EE68 /* ASLayoutPrivate.h in Headers */,
B350623F1B010EFD0018CF92 /* _ASAsyncTransactionContainer.h in Headers */, B350623F1B010EFD0018CF92 /* _ASAsyncTransactionContainer.h in Headers */,
B13CA1011C52004900E031AB /* ASCollectionNode+Beta.h in Headers */, B13CA1011C52004900E031AB /* ASCollectionNode+Beta.h in Headers */,
254C6B7E1BF94DF4003EC431 /* ASTextKitTailTruncater.h in Headers */, 254C6B7E1BF94DF4003EC431 /* ASTextKitTailTruncater.h in Headers */,

2
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -30,7 +30,7 @@
#import "ASLayoutElementStylePrivate.h" #import "ASLayoutElementStylePrivate.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
#import "ASLayoutSpec.h" #import "ASLayoutSpec.h"
#import "ASCellNode+Internal.h" #import "ASCellNode+Internal.h"
#import "ASWeakProxy.h" #import "ASWeakProxy.h"

2
AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm
View File

@ -11,7 +11,7 @@
#import "ASAbsoluteLayoutSpec.h" #import "ASAbsoluteLayoutSpec.h"
#import "ASLayout.h" #import "ASLayout.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
#import "ASLayoutSpecUtilities.h" #import "ASLayoutSpecUtilities.h"
#import "ASLayoutElementStylePrivate.h" #import "ASLayoutElementStylePrivate.h"

2
AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm
View File

@ -10,9 +10,7 @@
#import "ASBackgroundLayoutSpec.h" #import "ASBackgroundLayoutSpec.h"
#import "ASLayoutSpec+Subclasses.h" #import "ASLayoutSpec+Subclasses.h"
#import "ASAssert.h" #import "ASAssert.h"
#import "ASLayoutPrivate.h"
static NSUInteger const kForegroundChildIndex = 0; static NSUInteger const kForegroundChildIndex = 0;
static NSUInteger const kBackgroundChildIndex = 1; static NSUInteger const kBackgroundChildIndex = 1;

4
AsyncDisplayKit/Layout/ASInsetLayoutSpec.mm
View File

@ -9,11 +9,9 @@
// //
#import "ASInsetLayoutSpec.h" #import "ASInsetLayoutSpec.h"
#import "ASAssert.h" #import "ASAssert.h"
#import "ASLayoutSpec+Subclasses.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutPrivate.h"
@interface ASInsetLayoutSpec () @interface ASInsetLayoutSpec ()
{ {

3
AsyncDisplayKit/Layout/ASLayout.mm
View File

@ -8,11 +8,10 @@
// of patent rights can be found in the PATENTS file in the same directory. // of patent rights can be found in the PATENTS file in the same directory.
// //
#import "ASLayoutPrivate.h"
#import "ASDimension.h" #import "ASDimension.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutSpecUtilities.h" #import "ASLayoutSpecUtilities.h"
#import "ASLayoutSpec+Subclasses.h"
#import <queue> #import <queue>
#import "ASObjectDescriptionHelpers.h" #import "ASObjectDescriptionHelpers.h"

25
AsyncDisplayKit/Layout/ASLayoutPrivate.h
View File

@ -1,25 +0,0 @@
//
// ASLayoutPrivate.h
// AsyncDisplayKit
//
// Created by Michael Schneider on 10/17/16.
// Copyright © 2016 Facebook. All rights reserved.
//
#pragma once
#import "ASLayout.h"
/**
* Private header of ASLayout for internal usage in the framework
*/
@interface ASLayout ()
/**
* Position in parent. Default to CGPointNull.
*
* @discussion When being used as a sublayout, this property must not equal CGPointNull.
*/
@property (nonatomic, assign, readwrite) CGPoint position;
@end

11
AsyncDisplayKit/Layout/ASLayoutSpec+Subclasses.h
View File

@ -61,4 +61,15 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface ASLayout ()
/**
* Position in parent. Default to CGPointNull.
*
* @discussion When being used as a sublayout, this property must not equal CGPointNull.
*/
@property (nonatomic, assign, readwrite) CGPoint position;
@end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

1
AsyncDisplayKit/Layout/ASLayoutSpec.mm
View File

@ -11,7 +11,6 @@
#import "ASLayoutSpec.h" #import "ASLayoutSpec.h"
#import "ASLayoutSpecPrivate.h" #import "ASLayoutSpecPrivate.h"
#import "ASLayoutSpec+Subclasses.h" #import "ASLayoutSpec+Subclasses.h"
#import "ASLayoutPrivate.h"
#import "ASLayoutElementStylePrivate.h" #import "ASLayoutElementStylePrivate.h"
@implementation ASLayoutSpec @implementation ASLayoutSpec

2
AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm
View File

@ -12,7 +12,7 @@
#import "ASLayoutSpec+Subclasses.h" #import "ASLayoutSpec+Subclasses.h"
#import "ASAssert.h" #import "ASAssert.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
static NSUInteger const kUnderlayChildIndex = 0; static NSUInteger const kUnderlayChildIndex = 0;
static NSUInteger const kOverlayChildIndex = 1; static NSUInteger const kOverlayChildIndex = 1;

2
AsyncDisplayKit/Layout/ASRatioLayoutSpec.mm
View File

@ -17,7 +17,7 @@
#import "ASAssert.h" #import "ASAssert.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
#pragma mark - ASRatioLayoutSpec #pragma mark - ASRatioLayoutSpec

2
AsyncDisplayKit/Layout/ASRelativeLayoutSpec.mm
View File

@ -13,7 +13,7 @@
#import "ASRelativeLayoutSpec.h" #import "ASRelativeLayoutSpec.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
@implementation ASRelativeLayoutSpec @implementation ASRelativeLayoutSpec

2
AsyncDisplayKit/Private/ASStackBaselinePositionedLayout.mm
View File

@ -11,7 +11,7 @@
#import "ASStackBaselinePositionedLayout.h" #import "ASStackBaselinePositionedLayout.h"
#import "ASLayoutSpecUtilities.h" #import "ASLayoutSpecUtilities.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
static CGFloat baselineForItem(const ASStackLayoutSpecStyle &style, static CGFloat baselineForItem(const ASStackLayoutSpecStyle &style,
const ASLayout *layout) { const ASLayout *layout) {

2
AsyncDisplayKit/Private/ASStackPositionedLayout.mm
View File

@ -14,7 +14,7 @@
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASLayoutSpecUtilities.h" #import "ASLayoutSpecUtilities.h"
#import "ASLayoutPrivate.h" #import "ASLayoutSpec+Subclasses.h"
static CGFloat crossOffset(const ASStackLayoutSpecStyle &style, static CGFloat crossOffset(const ASStackLayoutSpecStyle &style,
const ASStackUnpositionedItem &l, const ASStackUnpositionedItem &l,