Skip to content

Commit 9bdb81a

Browse files
committed
Done: retweet/reply display; replace icons.
Next: tweet text parsing (finally (for real
1 parent 8d861a5 commit 9bdb81a

36 files changed

+366
-122
lines changed

Podfile

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ use_frameworks!
44
swift_version = "3.0"
55

66
target 'TweeBox' do
7+
8+
pod 'Reveal-SDK', :configurations => ['Debug']
9+
710
pod 'TwitterKit'
811
pod 'SwiftyJSON'
912
pod 'Kingfisher', '~> 3.0'

Podfile.lock

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PODS:
1313
- NVActivityIndicatorView (3.7.0):
1414
- NVActivityIndicatorView/Presenter (= 3.7.0)
1515
- NVActivityIndicatorView/Presenter (3.7.0)
16+
- Reveal-SDK (9)
1617
- SnapKit (3.2.0)
1718
- SwiftyJSON (3.1.4)
1819
- TwitterCore (3.0.0)
@@ -27,6 +28,7 @@ DEPENDENCIES:
2728
- DateToolsSwift
2829
- Kingfisher (~> 3.0)
2930
- MXParallaxHeader
31+
- Reveal-SDK
3032
- SwiftyJSON
3133
- TwitterKit
3234
- VisualEffectView
@@ -39,13 +41,14 @@ SPEC CHECKSUMS:
3941
Kingfisher: dc3a4983e86d2dfa89513664983a82340c11a289
4042
MXParallaxHeader: 858c403532ed933b381556a81ce333d7065ad182
4143
NVActivityIndicatorView: d3738df7e2e476aca0ba6bf32a8c9fbcfc33d64b
44+
Reveal-SDK: d977a1ec41e7c076025c1005da6e6d7c1b8ed254
4245
SnapKit: 1ca44df72cfa543218d177cb8aab029d10d86ea7
4346
SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
4447
TwitterCore: 8ce250be1eb34633a0e6acc89520d4165ec52c10
4548
TwitterKit: 21d0b22d67cb9a568cd8053972d0da7df2e0e9a0
4649
VisualEffectView: c6e2b281616b46262d1371aaee3735a58b7b2c7f
4750
Whisper: 051f25e704bf8992641ffd28b20d5682ddc5f5d3
4851

49-
PODFILE CHECKSUM: 8076f3b07ecdefa43c53857f2967e2b48d58311f
52+
PODFILE CHECKSUM: 5d4922c049041d52a57e54a4b9422a34abdcbec5
5053

5154
COCOAPODS: 1.3.1

TweeBox.xcodeproj/project.pbxproj

+19-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
B443A0FC1F2B70D40021BB65 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = B443A0FB1F2B70D40021BB65 /* Error.swift */; };
4040
B45F1D561F40645B00AF201C /* VideoViewerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45F1D551F40645B00AF201C /* VideoViewerViewController.swift */; };
4141
B46242921F4419CF0074158A /* TwitterDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B46242911F4419CF0074158A /* TwitterDate.swift */; };
42+
B469BAC11F480C0B00ADA3F6 /* OriginTweetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B469BAC01F480C0B00ADA3F6 /* OriginTweetView.swift */; };
43+
B469BAC41F481A8500ADA3F6 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B469BAC31F481A8500ADA3F6 /* UIViewExtension.swift */; };
4244
B47E586B1F3C959900CA0C0A /* UserTimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47E586A1F3C959900CA0C0A /* UserTimelineTableViewController.swift */; };
4345
B47E586F1F3D8A2F00CA0C0A /* ImageViewerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47E586E1F3D8A2F00CA0C0A /* ImageViewerViewController.swift */; };
4446
B47E58711F3DACAC00CA0C0A /* PannableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47E58701F3DACAC00CA0C0A /* PannableViewController.swift */; };
@@ -113,6 +115,8 @@
113115
B443A0FB1F2B70D40021BB65 /* Error.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Error.swift; sourceTree = "<group>"; };
114116
B45F1D551F40645B00AF201C /* VideoViewerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoViewerViewController.swift; sourceTree = "<group>"; };
115117
B46242911F4419CF0074158A /* TwitterDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TwitterDate.swift; sourceTree = "<group>"; };
118+
B469BAC01F480C0B00ADA3F6 /* OriginTweetView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OriginTweetView.swift; sourceTree = "<group>"; };
119+
B469BAC31F481A8500ADA3F6 /* UIViewExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewExtension.swift; sourceTree = "<group>"; };
116120
B47E586A1F3C959900CA0C0A /* UserTimelineTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserTimelineTableViewController.swift; sourceTree = "<group>"; };
117121
B47E586E1F3D8A2F00CA0C0A /* ImageViewerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerViewController.swift; sourceTree = "<group>"; };
118122
B47E58701F3DACAC00CA0C0A /* PannableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PannableViewController.swift; sourceTree = "<group>"; };
@@ -229,7 +233,7 @@
229233
B443A0EE1F2B36A50021BB65 /* Model */,
230234
B46A53861F32147F00F0D66E /* ViewController */,
231235
B429859F1F29E8E700AFFB97 /* AppDelegate.swift */,
232-
B40930021F39600C00CAB109 /* Cell */,
236+
B469BAC21F480C1300ADA3F6 /* View */,
233237
B42985A91F29E8E700AFFB97 /* Assets.xcassets */,
234238
B42985AB1F29E8E700AFFB97 /* LaunchScreen.storyboard */,
235239
B42985AE1F29E8E700AFFB97 /* Info.plist */,
@@ -273,6 +277,15 @@
273277
name = Model;
274278
sourceTree = "<group>";
275279
};
280+
B469BAC21F480C1300ADA3F6 /* View */ = {
281+
isa = PBXGroup;
282+
children = (
283+
B40930021F39600C00CAB109 /* Cell */,
284+
B469BAC01F480C0B00ADA3F6 /* OriginTweetView.swift */,
285+
);
286+
name = View;
287+
sourceTree = "<group>";
288+
};
276289
B46A53861F32147F00F0D66E /* ViewController */ = {
277290
isa = PBXGroup;
278291
children = (
@@ -342,6 +355,7 @@
342355
isa = PBXGroup;
343356
children = (
344357
B40930071F3970FF00CAB109 /* URLExtension.swift */,
358+
B469BAC31F481A8500ADA3F6 /* UIViewExtension.swift */,
345359
);
346360
name = Extensions;
347361
sourceTree = "<group>";
@@ -503,6 +517,7 @@
503517
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
504518
"${BUILT_PRODUCTS_DIR}/MXParallaxHeader/MXParallaxHeader.framework",
505519
"${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework",
520+
"${PODS_ROOT}/Reveal-SDK/RevealServer-9/iOS/RevealServer.framework",
506521
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
507522
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
508523
"${BUILT_PRODUCTS_DIR}/VisualEffectView/VisualEffectView.framework",
@@ -516,6 +531,7 @@
516531
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
517532
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MXParallaxHeader.framework",
518533
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NVActivityIndicatorView.framework",
534+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
519535
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
520536
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
521537
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VisualEffectView.framework",
@@ -578,13 +594,15 @@
578594
B40930001F395FFD00CAB109 /* TweetWithTextTableViewCell.swift in Sources */,
579595
B443A0F41F2B39C30021BB65 /* TweetMedia.swift in Sources */,
580596
B47E58711F3DACAC00CA0C0A /* PannableViewController.swift in Sources */,
597+
B469BAC11F480C0B00ADA3F6 /* OriginTweetView.swift in Sources */,
581598
B40930081F39710000CAB109 /* URLExtension.swift in Sources */,
582599
B409300A1F39763E00CAB109 /* MediaSize.swift in Sources */,
583600
B4B406361F4163E600683124 /* HomeTimelineTableViewController.swift in Sources */,
584601
B43BB8BB1F35A2300011A301 /* Entity.swift in Sources */,
585602
B43BB8BD1F35A4A40011A301 /* Place.swift in Sources */,
586603
B485BA631F46CD260077CC31 /* RetweetTableViewCell.swift in Sources */,
587604
B443A0F21F2B38050021BB65 /* TwitterUser.swift in Sources */,
605+
B469BAC41F481A8500ADA3F6 /* UIViewExtension.swift in Sources */,
588606
B45F1D561F40645B00AF201C /* VideoViewerViewController.swift in Sources */,
589607
B40930011F395FFD00CAB109 /* TweetWithPicAndTextTableViewCell.swift in Sources */,
590608
B42985A21F29E8E700AFFB97 /* LoginViewController.swift in Sources */,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "reply (4).png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "reply (5).png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "reply (6).png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "reply (7).png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "reply (8).png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "reply (9).png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}
Loading
Loading
Loading

TweeBox/Assets.xcassets/retweet_false.imageset/Contents.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "retweet (1).png",
5+
"filename" : "retweet-arrows-couple-outline.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "retweet (2).png",
10+
"filename" : "retweet-arrows-couple-outline (1).png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "retweet (3).png",
15+
"filename" : "retweet-arrows-couple-outline (2).png",
1616
"scale" : "3x"
1717
}
1818
],
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading

TweeBox/Assets.xcassets/retweet_true.imageset/Contents.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "retweet (4).png",
5+
"filename" : "retweet-symbol.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "retweet (5).png",
10+
"filename" : "retweet-symbol (1).png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "retweet (6).png",
15+
"filename" : "retweet-symbol (2).png",
1616
"scale" : "3x"
1717
}
1818
],
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading

0 commit comments

Comments
 (0)