ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-16 08:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,965 Commits 2 Branches 281 Tags
Commit Graph

2016 Commits

Author SHA1 Message Date
Rajinder Ramgarhia
1b7d68f63f [ASPINRemoteImageDownloader] Allows setting authentication challenge block 2016-05-31 10:06:54 -04:00
appleguy
89f4653cc9 Merge pull request #1696 from maicki/FixImageNodeOpaqueBackground 
[ASImageNode] Fix image sometimes appearing with black background or completely disappearing in ASImageNode
 2016-05-28 22:56:16 +07:00
rcancro
cf2d9aef5c fix crash when setting layoutSpec's child to nil 2016-05-26 15:44:21 -07:00
Michael Schneider
73ce8c148a Add comment for setting the backgroundColor in ASImageNode 2016-05-26 10:01:12 -07:00
Erekle
4f40f3c12f Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
 2016-05-26 12:15:23 +04:00
ricky
bebc4c604c remove _child from ASLayoutSpec.mm. Store all children in the children array. 2016-05-25 13:30:35 -07:00
ricky
c42b0dd33a Remove explicit passing of trait collection to setChild/Children 2016-05-25 10:49:42 -07:00
Michael Schneider
e3e9d36f56 Fix image sometimes appearing with black background or completely disappearing in ASImageNode 2016-05-25 10:07:34 -07:00
Levi McCallum
95f1ab4902 [ASDisplayNode] Rename ASDisplayNodeTransitionContext to ASLayoutTransition (#1680) 
* [ASDisplayNode] Rename ASDisplayNodeTransitionContext to ASLayoutTransition

* Rename internal ivar to fit new naming

* Fix tabbing
 2016-05-25 10:10:27 +07:00
ricky
a33966d4ae Actually propagate the traits down on layout spec 2016-05-24 11:15:41 -07:00
Nick Velloff
d0c30a43ca expose relayoutAllNodes at ASCollectionView level (#1683) 
* expose relayoutAllNodes at ASCollectionView level

* rename relayoutAllNodes to relayoutItems to be more UIKit centric
 2016-05-24 13:22:01 +07:00
ricky
59a26ee111 [ASTraitCollection] Bug fixing/LayoutSpec propagation 
* Fixed bug in `ASEnvironmentMergeObjectAndState`
* New ASLayoutSpec methods for `setChild`/`setChildren`/`setChild:forIdentifier:` have been added to take in a trait collection.
* Added `setChild:`-like methods for ASLayoutSpecs take a traitCollection
* Fixed instances where nodes in a data controller were not getting their trait collections
* propagate traitCollection in ASDisplayNode on insertSubnode or addSubnode
 2016-05-23 16:37:40 -07:00
Erekle
4ab0f1ec60 [ASVideoPlayerNode] fixes; Ability to add custom controls 2016-05-23 23:23:33 +04:00
Erekle
03f193c58b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-22 13:49:36 +04:00
Garrett Moon
94bb3b79cb May as well use the existing visibility function. (#1684) 2016-05-22 14:12:29 +08:00
Rocir Santiago
e8a49b57bc Change ASTableView's visibleNodes interface to return array of ASCellNodes (#1666) 2016-05-22 14:10:12 +08:00
Eric
4ac2d52a06 Allow nil borderColor when using ASImageNodeRoundBorderModificationBlock (#1686) 2016-05-21 11:12:40 +08:00
Eric Jensen
d3c33a38bb Add missing nullability annotations to headers related to display node transitions (#1688) 2016-05-21 11:10:07 +08:00
Erekle
100d2b4f26 moved spinner to ASVIdeoPlayerNode 2016-05-19 15:07:39 +04:00
Erekle
3d5385dad3 replaced deprecated methods 2016-05-19 13:40:09 +04:00
Erekle
053b14992c Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.h
#	AsyncDisplayKit/ASVideoNode.mm
 2016-05-19 11:57:16 +04:00
Max Gu
73b41ee450 Renaming the delegate flags for the deprecated methods 2016-05-18 22:10:06 -07:00
Max Gu
1c64a4a785 Surpressing deprecated methods warning 2016-05-18 16:39:45 -07:00
Max Gu
90877847c2 Adding deprecated methods back 2016-05-18 14:05:08 -07:00
Max Gu
a93bc72e25 Updating and adding a few APIs for ASVideoNode 2016-05-18 08:40:58 -07:00
Max Gu
772cf15b83 Merge branch 'master' into patch-3 2016-05-18 08:37:24 -07:00
Max Gu
325e37020c Adding startup loading state in ASVideoNode 2016-05-17 15:31:30 -07:00
Erekle
39e287f0d6 fixes suggested by levi 2016-05-18 00:45:40 +04:00
Erekle
d9b84db614 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-17 23:34:20 +04:00
Erekle
8c8fc3dba0 Adding ASVideoPlayerNode 2016-05-17 11:08:53 -07:00
Hannah Troisi
97f95e6799 Fix category name collision (Travis error). 2016-05-16 17:35:41 -07:00
Garrett Moon
8d4959bd76 Revert "ASViewController.m -> ASViewController.mm upstream" 
This reverts commit b34e8d78de20ea11b2b07a24df3b12d2936d1a5e.

In attempting to rebase my visibility patch, I overwrote all of Ricky's
changes to ASViewController. This puts them back in.
 2016-05-16 15:03:15 -07:00
Hannah Troisi
37d4c5e475 Fixing a bug in both debug tools (image scaling, tappable area) in which I don't check that the overlay exists before creating it. 2016-05-15 23:28:39 -07:00
Hannah Troisi
a18ffc64ab [AsyncDisplayKit+Debug.h] Moving hitTestDebug tool code out of ASControlNode and into debug file 
- unifying ASControlNode, ASImageNode debugging categories into debug file to simplify base classes
 2016-05-15 23:18:46 -07:00
Erekle
b3360a5daf Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-14 12:26:01 +04:00
appleguy
4cfe3f750a Merge pull request #1661 from maicki/MatchSubarrayContextsNodesCreation 
[ASDataController] Match creation of subarrays for nodes and contexts in ASDataController
 2016-05-13 23:47:41 -07:00
appleguy
50bdaa2442 Merge pull request #1658 from henish/ascollectionview_mutation_during_enumeration 
[Sample] Resolve mutation during enumeration issue
 2016-05-13 16:21:46 -07:00
Michael Schneider
eee2262262 Match creation of subarrays for nodes and contexts in ASDataController 2016-05-13 22:51:40 +02:00
Henish Shah
41a53887d7 [Sample] Resolve mutation during enumeration issue 
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
 2016-05-13 16:14:19 -04:00
Michael Schneider
33b76bbce0 Use calloc’d array for subarray of contexts 2016-05-13 21:38:25 +02:00
Michael Schneider
7d902d98c9 Fix passing wrong constrained size to nodes 
In _layoutNodesFromContexts:ofKind:completion: we pass the full array of contexts to _layoutNodes:fromContexts:atIndexesOfRange:ofKind: but for nodes we pass a subarray of nodes instead based on the batchCount. As batchRange we always start from 0 to batchCount. We now use the same indexes that we use to create the subarray of nodes to get a subarray of contexts that we pass to _layoutNodes:fromContexts:atIndexesOfRange:ofKind:.
 2016-05-13 21:06:16 +02:00
Henish Shah
8e38e225c8 [Sample] Resolve mutation during enumeration issue 
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
 2016-05-13 11:51:01 -04:00
Erekle
3e45f41710 ASVideoNode property proxy 2016-05-13 18:43:24 +04:00
appleguy
0bef0d09e7 Merge pull request #1653 from garrettmoon/visibility 
[ASViewController] Add visibility depth management
 2016-05-12 22:42:27 -07:00
Erekle
658d376d7b ASVideoNode public methods proxy 2016-05-13 02:14:12 +04:00
Erekle
db95771b33 enable/disable controls 2016-05-13 01:49:46 +04:00
Garrett Moon
72d7b57abb Don't add zero for readability 2016-05-12 14:44:54 -07:00
Garrett Moon
7901a985e3 Now that this is included by a C++ file, it needs the weird C extern thing. 2016-05-12 14:21:01 -07:00
Erekle
98c451118b removed play button 
* Removed play button from ASVideoNode
* Removed play button tests
* added some checks in ASVideoPlayerNode
* added new delegate method for time formats
 2016-05-13 00:46:55 +04:00
Garrett Moon
4c78fb3846 Add setVisibilityDepth setter. 2016-05-12 13:42:05 -07:00