Skip to content

Commit 149c486

Browse files
committed
Update Example project
1 parent 640f2cd commit 149c486

File tree

4 files changed

+51
-43
lines changed

4 files changed

+51
-43
lines changed

Example/Podfile.lock

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
PODS:
22
- CGFloatLiteral (0.4.0)
33
- ManualLayout (1.3.0)
4-
- ReusableKit (1.3.0):
5-
- ReusableKit/Core (= 1.3.0)
6-
- ReusableKit/RxSwift (= 1.3.0)
7-
- ReusableKit/Core (1.3.0)
8-
- ReusableKit/RxSwift (1.3.0):
9-
- ReusableKit/Core
10-
- RxCocoa (>= 3.4)
11-
- RxSwift (>= 3.4)
12-
- RxCocoa (4.1.2):
4+
- ReusableKit (2.0.1):
5+
- ReusableKit/Core (= 2.0.1)
6+
- ReusableKit/Core (2.0.1)
7+
- RxCocoa (4.3.1):
138
- RxSwift (~> 4.0)
14-
- RxKeyboard (0.8.2):
15-
- RxCocoa (>= 4.1.0)
16-
- RxSwift (>= 4.1.0)
17-
- RxSwift (4.1.2)
18-
- SnapKit (4.0.0)
9+
- RxKeyboard (0.8.3):
10+
- RxCocoa (>= 4.3.0)
11+
- RxSwift (>= 4.3.0)
12+
- RxSwift (4.3.1)
13+
- SnapKit (4.0.1)
1914
- SwiftyColor (1.0.0)
2015
- SwiftyImage (1.2.0)
21-
- Then (2.2.0)
22-
- "UITextView+Placeholder (1.2.0)"
16+
- Then (2.3.0)
17+
- UITextView+Placeholder (1.2.1)
2318

2419
DEPENDENCIES:
2520
- CGFloatLiteral
@@ -30,38 +25,25 @@ DEPENDENCIES:
3025
- SwiftyColor
3126
- SwiftyImage
3227
- Then
33-
- "UITextView+Placeholder"
34-
35-
SPEC REPOS:
36-
https://github.com/cocoapods/specs.git:
37-
- CGFloatLiteral
38-
- ManualLayout
39-
- ReusableKit
40-
- RxCocoa
41-
- RxSwift
42-
- SnapKit
43-
- SwiftyColor
44-
- SwiftyImage
45-
- Then
46-
- "UITextView+Placeholder"
28+
- UITextView+Placeholder
4729

4830
EXTERNAL SOURCES:
4931
RxKeyboard:
50-
:path: "../"
32+
:path: ../
5133

5234
SPEC CHECKSUMS:
5335
CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140
5436
ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
55-
ReusableKit: 4e4f45128985987555bde17abbf261c0a604f9f2
56-
RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a
57-
RxKeyboard: 239ebf3d8fb0394b831dca7e171a529df3972abc
58-
RxSwift: e49536837d9901277638493ea537394d4b55f570
59-
SnapKit: a42d492c16e80209130a3379f73596c3454b7694
37+
ReusableKit: 11b5bde14553a35bcf3979412dbfd1e690392f14
38+
RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
39+
RxKeyboard: cdc73085509a6baa5795038372d86260bb683bed
40+
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4
41+
SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
6042
SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992
6143
SwiftyImage: ebaa7c7b6163cd4ad102f3bb05a8fb276d35b4f3
62-
Then: 823f9813e1d4d0a814a5ba15e9c9d33ec7aca631
63-
"UITextView+Placeholder": 77680995fcdd07c3f52ec92fe1150874a2ac89ff
44+
Then: ee21c97b85ff6062b9b0080c9abb1eea46743345
45+
UITextView+Placeholder: 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909
6446

6547
PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992
6648

67-
COCOAPODS: 1.5.2
49+
COCOAPODS: 1.3.1

Example/RxKeyboardExample.xcodeproj/project.pbxproj

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/* Begin PBXFileReference section */
2222
032ABB7B1E35A9F200A3A5D4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2323
032ABB7D1E35A9F200A3A5D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
24-
032ABB7F1E35A9F200A3A5D4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
24+
032ABB7F1E35A9F200A3A5D4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; tabWidth = 2; };
2525
032ABB811E35A9F200A3A5D4 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
2626
032ABB821E35A9F200A3A5D4 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
2727
032ABB841E35A9F200A3A5D4 /* MessageListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageListViewController.swift; sourceTree = "<group>"; };
@@ -149,6 +149,7 @@
149149
03E8A71B1E35A95B00F7A3EC /* Frameworks */,
150150
03E8A71C1E35A95B00F7A3EC /* Resources */,
151151
E857CEA8F03D723AC93BD7A1 /* [CP] Embed Pods Frameworks */,
152+
2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */,
152153
);
153154
buildRules = (
154155
);
@@ -206,6 +207,21 @@
206207
/* End PBXResourcesBuildPhase section */
207208

208209
/* Begin PBXShellScriptBuildPhase section */
210+
2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */ = {
211+
isa = PBXShellScriptBuildPhase;
212+
buildActionMask = 2147483647;
213+
files = (
214+
);
215+
inputPaths = (
216+
);
217+
name = "[CP] Copy Pods Resources";
218+
outputPaths = (
219+
);
220+
runOnlyForDeploymentPostprocessing = 0;
221+
shellPath = /bin/sh;
222+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-resources.sh\"\n";
223+
showEnvVarsInLog = 0;
224+
};
209225
D103E37D22DD7DDCE369FBBB /* [CP] Check Pods Manifest.lock */ = {
210226
isa = PBXShellScriptBuildPhase;
211227
buildActionMask = 2147483647;
@@ -410,6 +426,7 @@
410426
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
411427
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
412428
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
429+
SWIFT_VERSION = 4.2;
413430
};
414431
name = Debug;
415432
};
@@ -422,6 +439,7 @@
422439
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
423440
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.RxKeyboardExample;
424441
PRODUCT_NAME = RxKeyboardRxKeyboardExample;
442+
SWIFT_VERSION = 4.2;
425443
};
426444
name = Release;
427445
};

Example/Sources/AppDelegate.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
2020

2121
var window: UIWindow?
2222

23+
#if swift(>=4.2)
24+
typealias ApplicationLaunchOptionsKey = UIApplication.LaunchOptionsKey
25+
#else
26+
typealias ApplicationLaunchOptionsKey = UIApplicationLaunchOptionsKey
27+
#endif
28+
2329
func application(
2430
_ application: UIApplication,
25-
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
31+
didFinishLaunchingWithOptions launchOptions: [ApplicationLaunchOptionsKey: Any]?
2632
) -> Bool {
2733
let window = UIWindow(frame: UIScreen.main.bounds)
2834
window.backgroundColor = .white

Example/Sources/Views/MessageCell.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ final class MessageCell: UICollectionViewCell {
9595
let labelWidth = Metric.maximumBalloonWidth - Metric.balloonViewInset * 2
9696
let constraintSize = CGSize(width: labelWidth, height: CGFloat.greatestFiniteMagnitude)
9797
let options: NSStringDrawingOptions = [.usesLineFragmentOrigin, .usesFontLeading]
98-
let attributes: [NSAttributedStringKey: Any] = [.font: Font.label]
99-
let rect = message.text.boundingRect(with: constraintSize, options: options, attributes: attributes, context: nil)
98+
let rect = message.text.boundingRect(with: constraintSize,
99+
options: options,
100+
attributes: [.font: Font.label],
101+
context: nil)
100102
let labelHeight = ceil(rect.height)
101103
return CGSize(width: width, height: labelHeight + Metric.balloonViewInset * 2)
102104
}

0 commit comments

Comments
 (0)