Skip to content

Presentation completion handler, safer completion blocks, light 'secure logos' to be visible in dark mode #52

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

Presentation completion handler, safer completion blocks, light 'secure logos' to be visible in dark mode #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2b0253
presentation settings
illabo Jun 21, 2020
08c7c68
logos corrected to be visible in dark mode
illabo Jun 22, 2020
48fad94
check blocks are valid on apple pay dismissal
illabo Jun 23, 2020
6468b9c
Merge branch 'master' of github.com:TinkoffCreditSystems/tinkoff-asdk…
illabo Aug 3, 2020
ff10417
Merge remote-tracking branch 'upstream/master' into master
illabo Sep 15, 2020
69e1920
settings update
illabo Sep 22, 2020
29c8448
Merge branch 'master' of github.com:TinkoffCreditSystems/tinkoff-asdk…
illabo Sep 22, 2020
e2d4b38
Merge branch 'master' of github.com:TinkoffCreditSystems/tinkoff-asdk…
illabo Jan 12, 2021
4bd810a
removed unneeded image
illabo Jan 12, 2021
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
4 changes: 3 additions & 1 deletion ASDKCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = ASDK;
LastUpgradeCheck = 1100;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = "TCS Bank";
TargetAttributes = {
83166ED21C63984E00533D85 = {
Expand Down Expand Up @@ -839,6 +839,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -898,6 +899,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
2 changes: 1 addition & 1 deletion ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 3 additions & 1 deletion ASDKUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = ASDK;
LastUpgradeCheck = 1100;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = "TCS Bank";
TargetAttributes = {
8316724E1C64798800533D85 = {
Expand Down Expand Up @@ -837,6 +837,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -897,6 +898,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
2 changes: 1 addition & 1 deletion ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 5 additions & 1 deletion ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,12 @@ typedef NS_ENUM(NSUInteger, TableViewCellType)
*
* @param style - стиль статус бара
*/

- (void)setStatusBarStyle:(UIStatusBarStyle)style;
- (UIStatusBarStyle)statusBarStyle;

- (void)setPresentationCompletion:(void (^)(void))presentationCompletion;
- (void (^)(void))getPresentationCompletion;
- (void)setPresentAnimated:(BOOL)animated;
- (BOOL)shouldAnimate;

@end
22 changes: 22 additions & 0 deletions ASDKUI/Payment/PaymentFormStarter/ASDKDesignConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ @interface ASDKDesignConfiguration ()

@property (nonatomic, strong) NSString *payViewControllerTitle;

@property (nonatomic, strong) void (^presentationCompletion)(void);
@property (nonatomic) BOOL _presentAnimated;

@end

@implementation ASDKDesignConfiguration
Expand All @@ -68,6 +71,7 @@ - (id)init
}
__statusBarStyle = [[UIApplication sharedApplication] statusBarStyle];
__presentStyleModal = UIModalPresentationFullScreen;
__presentAnimated = YES;
}

return self;
Expand Down Expand Up @@ -340,4 +344,22 @@ - (NSString *)payViewTitle
return self.payViewControllerTitle;
}

- (void)setPresentationCompletion:(void (^)(void))presentationCompletion
{
_presentationCompletion = presentationCompletion;
}
- (void (^)(void))getPresentationCompletion
{
return _presentationCompletion;
}

-(void)setPresentAnimated:(BOOL)animated
{
__presentAnimated = animated;
}
-(BOOL)shouldAnimate
{
return __presentAnimated;
}

@end
Loading