Skip to content

iOS 13 changes. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DhavalRKansara wants to merge 2 commits into
base: master
Choose a base branch
from
Open

iOS 13 changes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1440fec
iOS 13 changes.
Nov 1, 2019
cdd7589
Cancel button visibility modifications.
Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions RSMasterTableView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
32 changes: 18 additions & 14 deletions RSMasterTableView/RSMasterTableView/RSSearchBar/RSSearchBar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,38 +61,42 @@ - (id)setFrame:(CGRect)frame placeHolder:(NSString *)placeHolder font:(UIFont *)
}

-(void)drawRect:(CGRect)rect {

NSUInteger index = [self indexOfTextFieldInSubViews];

if(index){
searchTextField = (UITextField *)(self.subviews[0]).subviews[index];

searchTextField.frame = CGRectMake(kDefaultMargin, kDefaultMargin, self.frame.size.width - 2*kDefaultMargin, self.frame.size.height - 2*kDefaultMargin);

searchTextField.font = self.prefferedTextFont;
searchTextField.textColor = self.prefferedTextColor;
searchTextField.backgroundColor = self.barTintColor;
}

[self drawBottomLine];
[super drawRect:rect];
}

#pragma mark- Private methods

-(NSUInteger)indexOfTextFieldInSubViews {

NSUInteger index = NSNotFound;
-(UITextField *)TextFieldInSubViews {
UITextField *textField;
UIView *searchBarView = self.subviews[0];

for (int i = 0; i < searchBarView.subviews.count; ++i) {

if([searchBarView.subviews[i] isKindOfClass:[UITextField class]]){
index = i;
break;
if (@available(iOS 13, *)){
UIView *tempView = searchBarView.subviews[i];
if(tempView.subviews.count > 0){
for(UIView * innerView in tempView.subviews){
if([innerView isKindOfClass:[UITextField class]]){
textField = innerView;
break;
}
}
}
}else {
if([searchBarView.subviews[i] isKindOfClass:[UITextField class]]){
textField = searchBarView.subviews[i];
break;
}
}
}
return index;
return textField;
}

-(void)drawBottomLine {
Expand Down
10 changes: 9 additions & 1 deletion RSMasterTableView/RSMasterTableView/RSTableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ -(void)addSearchBarWithPlaceHolder:(NSString *)placeHolder borderColor:(UIColor
self.searchBar.barTintColor = self.backgroundContainerView.backgroundColor;
self.searchBar.bottomBorderColor = borderColor;

self.searchBar.showsCancelButton = YES;
self.searchBar.showsCancelButton = NO;
self.searchBar.delegate = self;

// add search bar to tableHeaderView
Expand Down Expand Up @@ -479,6 +479,14 @@ -(void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
[searchBar resignFirstResponder];
}

- (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar{
self.searchBar.showsCancelButton = YES;
}

- (void)searchBarTextDidEndEditing:(UISearchBar *)searchBar{
self.searchBar.showsCancelButton = NO;
}

- (void)layoutSubviews {
[super layoutSubviews];

Expand Down