Skip to content

Commit

Permalink
Rename table addtional views to scroll additinal views.
Browse files Browse the repository at this point in the history
  • Loading branch information
grigaci committed Feb 22, 2016
1 parent 1c9a814 commit 840f368
Show file tree
Hide file tree
Showing 36 changed files with 310 additions and 310 deletions.
48 changes: 24 additions & 24 deletions BIObjCHelpers.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
4304A9B61B70D892009739B3 /* BIDatasourceTableViewTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4304A9B51B70D892009739B3 /* BIDatasourceTableViewTestCase.m */; };
432001981C7B26C0006A8BB7 /* UIScrollView+BIBatching.m in Sources */ = {isa = PBXBuildFile; fileRef = 432001971C7B26C0006A8BB7 /* UIScrollView+BIBatching.m */; };
43329F6F1BFC7D6F0081FDA3 /* BIDatasourceBaseTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 43329F6E1BFC7D6F0081FDA3 /* BIDatasourceBaseTestCase.m */; };
433DEB4A1C4D1A16002296AE /* BITableAdditionalViewBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB491C4D1A16002296AE /* BITableAdditionalViewBase.m */; };
433DEB4D1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB4C1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.m */; };
433DEB501C4D1A74002296AE /* BITableAdditionalLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB4F1C4D1A74002296AE /* BITableAdditionalLoadingView.m */; };
433DEB531C4D1AA4002296AE /* BITableAdditionalNoContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB521C4D1AA4002296AE /* BITableAdditionalNoContentView.m */; };
433DEB4A1C4D1A16002296AE /* BIScrollAdditionalViewBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB491C4D1A16002296AE /* BIScrollAdditionalViewBase.m */; };
433DEB4D1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB4C1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.m */; };
433DEB501C4D1A74002296AE /* BIScrollAdditionalLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB4F1C4D1A74002296AE /* BIScrollAdditionalLoadingView.m */; };
433DEB531C4D1AA4002296AE /* BIScrollAdditionalNoContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DEB521C4D1AA4002296AE /* BIScrollAdditionalNoContentView.m */; };
435D59C01B622E8A00ECA859 /* BIMockHandlerTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 435D59BF1B622E8A00ECA859 /* BIMockHandlerTableView.m */; };
43A7D0281C735C1B007C8CC0 /* UIScrollView+InfiniteScroll.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A7D0271C735C1B007C8CC0 /* UIScrollView+InfiniteScroll.m */; };
43BE6C311B56882B001F0A00 /* libBIObjCHelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BE6C251B56882B001F0A00 /* libBIObjCHelpers.a */; };
Expand Down Expand Up @@ -101,14 +101,14 @@
432001961C7B26C0006A8BB7 /* UIScrollView+BIBatching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIScrollView+BIBatching.h"; path = "Views/ScrollView/UIScrollView+BIBatching.h"; sourceTree = "<group>"; };
432001971C7B26C0006A8BB7 /* UIScrollView+BIBatching.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIScrollView+BIBatching.m"; path = "Views/ScrollView/UIScrollView+BIBatching.m"; sourceTree = "<group>"; };
43329F6E1BFC7D6F0081FDA3 /* BIDatasourceBaseTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BIDatasourceBaseTestCase.m; sourceTree = "<group>"; };
433DEB481C4D1A16002296AE /* BITableAdditionalViewBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BITableAdditionalViewBase.h; path = Views/TableView/Additions/BITableAdditionalViewBase.h; sourceTree = "<group>"; };
433DEB491C4D1A16002296AE /* BITableAdditionalViewBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BITableAdditionalViewBase.m; path = Views/TableView/Additions/BITableAdditionalViewBase.m; sourceTree = "<group>"; };
433DEB4B1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BITableAdditionalErrorNoContentView.h; path = Views/TableView/Additions/BITableAdditionalErrorNoContentView.h; sourceTree = "<group>"; };
433DEB4C1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BITableAdditionalErrorNoContentView.m; path = Views/TableView/Additions/BITableAdditionalErrorNoContentView.m; sourceTree = "<group>"; };
433DEB4E1C4D1A74002296AE /* BITableAdditionalLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BITableAdditionalLoadingView.h; path = Views/TableView/Additions/BITableAdditionalLoadingView.h; sourceTree = "<group>"; };
433DEB4F1C4D1A74002296AE /* BITableAdditionalLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BITableAdditionalLoadingView.m; path = Views/TableView/Additions/BITableAdditionalLoadingView.m; sourceTree = "<group>"; };
433DEB511C4D1AA4002296AE /* BITableAdditionalNoContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BITableAdditionalNoContentView.h; path = Views/TableView/Additions/BITableAdditionalNoContentView.h; sourceTree = "<group>"; };
433DEB521C4D1AA4002296AE /* BITableAdditionalNoContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BITableAdditionalNoContentView.m; path = Views/TableView/Additions/BITableAdditionalNoContentView.m; sourceTree = "<group>"; };
433DEB481C4D1A16002296AE /* BIScrollAdditionalViewBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BIScrollAdditionalViewBase.h; path = Views/TableView/Additions/BIScrollAdditionalViewBase.h; sourceTree = "<group>"; };
433DEB491C4D1A16002296AE /* BIScrollAdditionalViewBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BIScrollAdditionalViewBase.m; path = Views/TableView/Additions/BIScrollAdditionalViewBase.m; sourceTree = "<group>"; };
433DEB4B1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BIScrollAdditionalErrorNoContentView.h; path = Views/TableView/Additions/BIScrollAdditionalErrorNoContentView.h; sourceTree = "<group>"; };
433DEB4C1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BIScrollAdditionalErrorNoContentView.m; path = Views/TableView/Additions/BIScrollAdditionalErrorNoContentView.m; sourceTree = "<group>"; };
433DEB4E1C4D1A74002296AE /* BIScrollAdditionalLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BIScrollAdditionalLoadingView.h; path = Views/TableView/Additions/BIScrollAdditionalLoadingView.h; sourceTree = "<group>"; };
433DEB4F1C4D1A74002296AE /* BIScrollAdditionalLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BIScrollAdditionalLoadingView.m; path = Views/TableView/Additions/BIScrollAdditionalLoadingView.m; sourceTree = "<group>"; };
433DEB511C4D1AA4002296AE /* BIScrollAdditionalNoContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BIScrollAdditionalNoContentView.h; path = Views/TableView/Additions/BIScrollAdditionalNoContentView.h; sourceTree = "<group>"; };
433DEB521C4D1AA4002296AE /* BIScrollAdditionalNoContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BIScrollAdditionalNoContentView.m; path = Views/TableView/Additions/BIScrollAdditionalNoContentView.m; sourceTree = "<group>"; };
4355334F1B81B87F0052A128 /* _BITableView+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "_BITableView+Internal.h"; path = "Views/TableView/_BITableView+Internal.h"; sourceTree = "<group>"; };
435D59BE1B622E8A00ECA859 /* BIMockHandlerTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BIMockHandlerTableView.h; path = BIHandlerTableView/BIMockHandlerTableView.h; sourceTree = "<group>"; };
435D59BF1B622E8A00ECA859 /* BIMockHandlerTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BIMockHandlerTableView.m; path = BIHandlerTableView/BIMockHandlerTableView.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -261,14 +261,14 @@
433DEB471C4D19DB002296AE /* Additions */ = {
isa = PBXGroup;
children = (
433DEB481C4D1A16002296AE /* BITableAdditionalViewBase.h */,
433DEB491C4D1A16002296AE /* BITableAdditionalViewBase.m */,
433DEB4B1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.h */,
433DEB4C1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.m */,
433DEB4E1C4D1A74002296AE /* BITableAdditionalLoadingView.h */,
433DEB4F1C4D1A74002296AE /* BITableAdditionalLoadingView.m */,
433DEB511C4D1AA4002296AE /* BITableAdditionalNoContentView.h */,
433DEB521C4D1AA4002296AE /* BITableAdditionalNoContentView.m */,
433DEB481C4D1A16002296AE /* BIScrollAdditionalViewBase.h */,
433DEB491C4D1A16002296AE /* BIScrollAdditionalViewBase.m */,
433DEB4B1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.h */,
433DEB4C1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.m */,
433DEB4E1C4D1A74002296AE /* BIScrollAdditionalLoadingView.h */,
433DEB4F1C4D1A74002296AE /* BIScrollAdditionalLoadingView.m */,
433DEB511C4D1AA4002296AE /* BIScrollAdditionalNoContentView.h */,
433DEB521C4D1AA4002296AE /* BIScrollAdditionalNoContentView.m */,
);
name = Additions;
sourceTree = "<group>";
Expand Down Expand Up @@ -1044,12 +1044,12 @@
43BE6C731B5689CA001F0A00 /* NSBundle+BIExtra.m in Sources */,
9437007F1BCD3F9C0063D2CC /* BILaunchStartersFactory.m in Sources */,
43BE6C7B1B5689CA001F0A00 /* BIDatasourceTableView.m in Sources */,
433DEB4A1C4D1A16002296AE /* BITableAdditionalViewBase.m in Sources */,
433DEB4A1C4D1A16002296AE /* BIScrollAdditionalViewBase.m in Sources */,
91614A8E1B9481A000D00EB2 /* BICollectionView.m in Sources */,
43BE6C801B5689CA001F0A00 /* BISerialOperationQueue.m in Sources */,
91E9ECF01B94A6F10009C4F1 /* BICollectionViewActivityIndicatorReusableView.m in Sources */,
43BE6C7E1B5689CA001F0A00 /* BILifecycle.m in Sources */,
433DEB4D1C4D1A52002296AE /* BITableAdditionalErrorNoContentView.m in Sources */,
433DEB4D1C4D1A52002296AE /* BIScrollAdditionalErrorNoContentView.m in Sources */,
43F23F8A1B9F081200CEAD8C /* BIBatchRequest.m in Sources */,
43F23F7F1B9EFC0D00CEAD8C /* BIBatchHelpers.m in Sources */,
43BE6C7A1B5689CA001F0A00 /* BIDatasourceFetchedTableView.m in Sources */,
Expand All @@ -1059,7 +1059,7 @@
91614A951B94830600D00EB2 /* BIHandlerCollectionView.m in Sources */,
91E517F21B59208F000B51AF /* BITableViewCell.m in Sources */,
43BE6C811B5689CA001F0A00 /* BIStartersFactory.m in Sources */,
433DEB531C4D1AA4002296AE /* BITableAdditionalNoContentView.m in Sources */,
433DEB531C4D1AA4002296AE /* BIScrollAdditionalNoContentView.m in Sources */,
43BE6C761B5689CA001F0A00 /* BIDatasourceBase.m in Sources */,
43BE6C7C1B5689CA001F0A00 /* BIHandlerBase.m in Sources */,
43BE6C781B5689CA001F0A00 /* BIDatasourceFetchedCollectionView.m in Sources */,
Expand All @@ -1068,7 +1068,7 @@
91E9ECE91B949D0D0009C4F1 /* BIDatasourceFeedCollectionView.m in Sources */,
43F23F851B9F040C00CEAD8C /* BIBatchResponse.m in Sources */,
43BE6C7F1B5689CA001F0A00 /* BIOperationQueue.m in Sources */,
433DEB501C4D1A74002296AE /* BITableAdditionalLoadingView.m in Sources */,
433DEB501C4D1A74002296AE /* BIScrollAdditionalLoadingView.m in Sources */,
91E59B871B5840CD0034824F /* BITableView.m in Sources */,
43BE6C7D1B5689CA001F0A00 /* BIHandlerTableView.m in Sources */,
43A7D0281C735C1B007C8CC0 /* UIScrollView+InfiniteScroll.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import "BIBatchRequest.h"
#import "BIBatchResponse.h"
#import "_BICollectionView+Internal.h"
#import "BITableAdditionalViewBase.h"
#import "BIScrollAdditionalViewBase.h"

@interface BIDatasourceFeedCollectionView ()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import "BIBatchResponse.h"
#import "BITableViewCell.h"
#import "_BITableView+Internal.h"
#import "BITableAdditionalViewBase.h"
#import "BIScrollAdditionalViewBase.h"

@interface BIDatasourceFeedTableView ()

Expand Down
8 changes: 4 additions & 4 deletions BIObjCHelpers/Interface/BIObjCHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

// Views
#import "BITableView.h"
#import "BITableAdditionalViewBase.h"
#import "BITableAdditionalLoadingView.h"
#import "BITableAdditionalNoContentView.h"
#import "BITableAdditionalErrorNoContentView.h"
#import "BIScrollAdditionalViewBase.h"
#import "BIScrollAdditionalLoadingView.h"
#import "BIScrollAdditionalNoContentView.h"
#import "BIScrollAdditionalErrorNoContentView.h"
#import "BICollectionView.h"
#import "UIScrollView+BIBatching.h"

Expand Down
2 changes: 1 addition & 1 deletion BIObjCHelpers/Views/CollectionView/BICollectionView.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@class BIDatasourceCollectionView;
@class BIHandlerCollectionView;
@class BITableAdditionalViewBase;
@class BIScrollAdditionalViewBase;

/*!
@brief CollectionView with infinite scrolling support.
Expand Down
6 changes: 3 additions & 3 deletions BIObjCHelpers/Views/CollectionView/BICollectionView.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "BIActivityIndicatorContainerView.h"
#import "_BIScrollViewProxy.h"
#import "BIBatchHelpers.h"
#import "BITableAdditionalViewBase.h"
#import "BIScrollAdditionalViewBase.h"
#import "BIDatasourceFeedCollectionView.h"
#import "UIScrollView+InfiniteScroll.h"

Expand Down Expand Up @@ -161,9 +161,9 @@ - (void)setInfiniteScrollingState:(BIInfiniteScrollingState)infiniteScrollingSta
}
}

#pragma mark - BITableAdditionalViewBaseListener methods
#pragma mark - BIScrollAdditionalViewBaseListener methods

- (void)didTapTableAdditionalView:(nonnull BITableAdditionalViewBase *)additionalView {
- (void)didTapTableAdditionalView:(nonnull BIScrollAdditionalViewBase *)additionalView {
if ([self.datasource isKindOfClass:[BIDatasourceFeedCollectionView class]]) {
switch (additionalView.type) {
case BITableAdditionalTypeErrorNoContentView: {
Expand Down
28 changes: 14 additions & 14 deletions BIObjCHelpers/Views/ScrollView/UIScrollView+BIBatching.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,74 +6,74 @@
// Copyright © 2016 iGama Apps. All rights reserved.
//

#import "BITableAdditionalViewBase.h"
#import "BIScrollAdditionalViewBase.h"

#import <UIKit/UIKit.h>

/*!
@brief Category for handling additional views such as loading, error or no content.
*/
@interface UIScrollView (BIBatching) <BITableAdditionalViewBaseListener>
@interface UIScrollView (BIBatching) <BIScrollAdditionalViewBaseListener>

/*!
@brief Currently used additional view when scroll view is empty(no data to show).
*/
@property (nonatomic, strong, nullable, readonly) BITableAdditionalViewBase *additionalNoContentView;
@property (nonatomic, strong, nullable, readonly) BIScrollAdditionalViewBase *additionalNoContentView;

/*!
@brief Currently used additional view when scroll view is empty due to a failed operation. Can be used
to reload scroll view content with a simple tap gesture.
*/
@property (nonatomic, strong, nullable, readonly) BITableAdditionalViewBase *additionalErrorNoContentView;
@property (nonatomic, strong, nullable, readonly) BIScrollAdditionalViewBase *additionalErrorNoContentView;

/*!
@brief Currently used additional view when scroll view is loading the initial data on first request, or after a failed initial request.
*/
@property (nonatomic, strong, nullable, readonly) BITableAdditionalViewBase *additionalLoadingContentView;
@property (nonatomic, strong, nullable, readonly) BIScrollAdditionalViewBase *additionalLoadingContentView;

/*!
@brief Currently visible additional view.
*/
@property (nonatomic, strong, nullable, readonly) BITableAdditionalViewBase *visibleAdditionalView;
@property (nonatomic, strong, nullable, readonly) BIScrollAdditionalViewBase *visibleAdditionalView;

/*!
@brief Callback to create an no content additional view.
*/
@property (nonatomic, copy, nullable) BITableAdditionalViewBase * _Nullable (^createAdditionalNoContentViewCallback)(void);
@property (nonatomic, copy, nullable) BIScrollAdditionalViewBase * _Nullable (^createAdditionalNoContentViewCallback)(void);

/*!
@brief Callback to create an error no content additional view.
*/
@property (nonatomic, copy, nullable) BITableAdditionalViewBase * _Nullable (^createAdditionalErrorNoContentViewCallback)(void);
@property (nonatomic, copy, nullable) BIScrollAdditionalViewBase * _Nullable (^createAdditionalErrorNoContentViewCallback)(void);

/*!
@brief Callback to create an loading additional view.
*/
@property (nonatomic, copy, nullable) BITableAdditionalViewBase * _Nullable (^createAdditionalLoadingContentViewCallback)(void);
@property (nonatomic, copy, nullable) BIScrollAdditionalViewBase * _Nullable (^createAdditionalLoadingContentViewCallback)(void);

/*!
@brief Method to create an no content additional view.
@return Additional view to show, or nil otherwise.
*/
- (nullable BITableAdditionalViewBase *)createAdditionalNoContentView;
- (nullable BIScrollAdditionalViewBase *)createAdditionalNoContentView;

/*!
@brief Method to create an error no content additional view.
@return Additional view to show, or nil otherwise.
*/
- (nullable BITableAdditionalViewBase *)createAdditionalErrorNoContentView;
- (nullable BIScrollAdditionalViewBase *)createAdditionalErrorNoContentView;

/*!
@brief Method to create an loading additional view.
@return Additional view to show, or nil otherwise.
*/
- (nullable BITableAdditionalViewBase *)createAdditionalLoadingContentView;
- (nullable BIScrollAdditionalViewBase *)createAdditionalLoadingContentView;

/*!
@brief Add any additional view to the scroll. Will disable scroll view scrolling.
@param additionalView View to add.
*/
- (void)addGeneralAdditionalView:(nonnull BITableAdditionalViewBase *)additionalView;
- (void)addGeneralAdditionalView:(nonnull BIScrollAdditionalViewBase *)additionalView;

/*!
@brief Create and add an no content additional view to the scroll. Will disable scroll view scrolling.
Expand All @@ -97,7 +97,7 @@
@brief Remove a given additional view from the scroll. Will enable scroll view scrolling.
@param additionalView View to remove.
*/
- (void)removeGeneralAdditionalView:(nonnull BITableAdditionalViewBase *)additionalView;
- (void)removeGeneralAdditionalView:(nonnull BIScrollAdditionalViewBase *)additionalView;

/*!
@brief Remove currently visible additional view from the scroll. Will enable scroll view scrolling.
Expand Down

0 comments on commit 840f368

Please sign in to comment.