Skip to content
This repository has been archived by the owner on Feb 19, 2020. It is now read-only.

Fix screenshot bug in ios 11 #459

Merged
merged 3 commits into from
Sep 14, 2017
Merged

Fix screenshot bug in ios 11 #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c7c8d8
Bug with screenshot being behind navigation bar fixed
Sep 13, 2017
9cf323b
Minor warnings fixed
Sep 13, 2017
93776a9
__IPHONE_11_0 moved to HockeySDKPrivate
Sep 13, 2017
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
9 changes: 6 additions & 3 deletions Classes/BITFeedbackComposeViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#import "BITImageAnnotationViewController.h"
#import "BITHockeyAttachment.h"


@interface BITFeedbackComposeViewController () <BITFeedbackUserDataDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIActionSheetDelegate, BITImageAnnotationDelegate> {
}

Expand Down Expand Up @@ -217,7 +216,7 @@ - (void)viewDidLoad {
style:UIBarButtonItemStyleDone
target:self
action:@selector(sendAction:)];

// Container that contains both the textfield and eventually the photo scroll view on the right side
self.contentViewContainer = [[UIView alloc] initWithFrame:self.view.bounds];
self.contentViewContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
Expand Down Expand Up @@ -262,7 +261,11 @@ - (void)viewDidLoad {
self.attachmentScrollView.bounces = YES;
self.attachmentScrollView.autoresizesSubviews = NO;
self.attachmentScrollView.autoresizingMask = UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleRightMargin;

#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
if (@available(iOS 11.0, *)) {
self.attachmentScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAlways;
}
#endif
[self.contentViewContainer addSubview:self.attachmentScrollView];
}

Expand Down
2 changes: 1 addition & 1 deletion Classes/BITHockeyManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ - (void)pingServerForIntegrationStartWorkflowWithTimeString:(NSString *)timeStri
NSDictionary *params = @{@"timestamp": timeString,
@"sdk": BITHOCKEY_NAME,
@"sdk_version": BITHOCKEY_VERSION,
@"bundle_version": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
@"bundle_version": (id)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
};

NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
Expand Down
2 changes: 1 addition & 1 deletion Classes/BITStoreButton.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ - (CGSize)sizeThatFits:(CGSize) __unused size {
if ([self.buttonData.label respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) {
CGRect calculatedRect = [self.buttonData.label boundingRectWithSize:constr
options:NSStringDrawingUsesFontLeading
attributes:@{NSFontAttributeName:self.titleLabel.font}
attributes:@{NSFontAttributeName:(id)self.titleLabel.font}
context:nil];
newSize = calculatedRect.size;
} else {
Expand Down
4 changes: 4 additions & 0 deletions Classes/HockeySDKPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ NSString *BITHockeyMD5(NSString *str);
#define __IPHONE_8_0 80000
#endif

#ifndef __IPHONE_11_0
#define __IPHONE_11_0 110000
#endif

#ifndef TARGET_OS_SIMULATOR

#ifdef TARGET_IPHONE_SIMULATOR
Expand Down