Skip to content

Commit e247631

Browse files
committed
extra namming rule update
1 parent 3a54572 commit e247631

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.DS_Store

0 Bytes
Binary file not shown.

Example/SwiftyBootpay.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
383383
GCC_WARN_UNUSED_FUNCTION = YES;
384384
GCC_WARN_UNUSED_VARIABLE = YES;
385-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
385+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
386386
MTL_ENABLE_DEBUG_INFO = YES;
387387
ONLY_ACTIVE_ARCH = YES;
388388
SDKROOT = iphoneos;
@@ -431,7 +431,7 @@
431431
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
432432
GCC_WARN_UNUSED_FUNCTION = YES;
433433
GCC_WARN_UNUSED_VARIABLE = YES;
434-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
434+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
435435
MTL_ENABLE_DEBUG_INFO = NO;
436436
SDKROOT = iphoneos;
437437
SWIFT_OBJC_BRIDGING_HEADER = "";
Binary file not shown.

SwiftyBootpay.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Pod::Spec.new do |s|
1111
s.name = 'SwiftyBootpay'
12-
s.version = '3.4.2'
12+
s.version = '3.4.3'
1313
s.summary = 'Bootpay PG Plugin For Swift'
1414

1515
# This description is used to generate tags and improve search results.

SwiftyBootpay/Classes/BootpayController.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ extension BootpayController {
112112
var topPadding = CGFloat(0.0)
113113
var bottomPadding = CGFloat(0.0)
114114
var btnMarginTop = CGFloat(0.0)
115-
if(extra.iosCloseButton) {
115+
if(extra.ios_close_button) {
116116
btnMarginTop = 20.0
117117
}
118118

@@ -149,18 +149,18 @@ extension BootpayController {
149149
wv.parentController = self
150150
self.view.addSubview(wv)
151151

152-
if(extra.iosCloseButton) {
153-
if(extra.iosCloseButtonView == nil) {
152+
if(extra.ios_close_button) {
153+
if(extra.ios_close_button_view == nil) {
154154
let close = UIButton()
155155
close.setTitle("X", for: .normal)
156156
close.addTarget(self, action: #selector(removePaymentWindow), for: .touchUpInside)
157157
close.frame = CGRect(x: self.view.frame.width - 40, y: topPadding, width: 40, height: 30)
158158
close.setTitleColor(.darkGray, for: .normal)
159159
self.view.addSubview(close)
160160
} else {
161-
extra.iosCloseButtonView!.addTarget(self, action: #selector(removePaymentWindow), for: .touchUpInside)
162-
if(extra.iosCloseButtonView!.frame == CGRect.null) { extra.iosCloseButtonView!.frame = CGRect(x: self.view.frame.width - 40, y: topPadding, width: 40, height: 30) }
163-
self.view.addSubview(extra.iosCloseButtonView!)
161+
extra.ios_close_button_view!.addTarget(self, action: #selector(removePaymentWindow), for: .touchUpInside)
162+
if(extra.ios_close_button_view!.frame == CGRect.null) { extra.ios_close_button_view!.frame = CGRect(x: self.view.frame.width - 40, y: topPadding, width: 40, height: 30) }
163+
self.view.addSubview(extra.ios_close_button_view!)
164164
}
165165
}
166166
}

SwiftyBootpay/Classes/models/BootpayExtra.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public class BootpayExtra: NSObject, BootpayParams, Mappable {
2121
@objc public var quick_popup = 1 //1: popup 호출시 버튼을 띄우지 않는다. 0: 일 경우 버튼을 호출한다
2222
@objc public var disp_cash_result = "Y" // 현금영수증 보일지 말지.. 가상계좌 KCP 옵션
2323
@objc public var escrow = 0
24-
@objc public var iosCloseButton = false
25-
@objc public var iosCloseButtonView: UIButton?
24+
@objc public var ios_close_button = false
25+
@objc public var ios_close_button_view: UIButton?
2626
@objc public var onestore = BootpayOneStore()
2727

2828
@objc public var theme = "purple" //통합 결제창 색상 지정 (purple, red, custom 지정 가능 )
@@ -51,7 +51,7 @@ public class BootpayExtra: NSObject, BootpayParams, Mappable {
5151
disp_cash_result <- map["disp_cash_result"]
5252
escrow <- map["escrow"]
5353
onestore <- map["onestore"]
54-
iosCloseButton <- map["iosCloseButton"]
54+
ios_close_button <- map["ios_close_button"]
5555

5656
theme <- map["theme"]
5757
custom_background <- map["custom_background"]
@@ -80,7 +80,7 @@ public class BootpayExtra: NSObject, BootpayParams, Mappable {
8080
"custom_background:'\(custom_background)',",
8181
"custom_font_color:'\(custom_font_color)',",
8282
"topMargin:'\(topMargin)',",
83-
"iosCloseButton: \(iosCloseButton)",
83+
"ios_close_button: \(ios_close_button)",
8484

8585
]
8686

0 commit comments

Comments
 (0)