Skip to content

Commit c0072c2

Browse files
bcylinbcylin
authored
Merge pull request #10 from bcylin/feature/remove-rswift
Remove R.swift
2 parents 5bf02d0 + de467de commit c0072c2

15 files changed

+26
-61
lines changed

‎.codecov.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
coverage:
22
status:
3-
project:
4-
default:
5-
threshold: 5%
3+
project: off
64
patch: off
75
changes: off
86
comment:

‎Podfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ target :iCookTV do
1414
pod "Freddy", "~> 3.0.0"
1515
pod "HCYoutubeParser"
1616
pod "Hue", "~> 2.0.0"
17-
pod "R.swift", "~> 3.2.0"
1817
pod "Kingfisher", "~> 3.2.0"
1918
pod "TreasureData-iOS-SDK", "0.1.15"
2019

‎Podfile.lock‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ PODS:
1111
- Kingfisher (3.2.4)
1212
- Nimble (7.0.3)
1313
- Quick (1.2.0)
14-
- R.swift (3.2.0):
15-
- R.swift.Library (~> 3.0.2)
16-
- R.swift.Library (3.0.2)
1714
- SwiftLint (0.24.0)
1815
- TreasureData-iOS-SDK (0.1.15):
1916
- KeenClientTD (= 3.2.27)
@@ -29,7 +26,6 @@ DEPENDENCIES:
2926
- Kingfisher (~> 3.2.0)
3027
- Nimble
3128
- Quick
32-
- R.swift (~> 3.2.0)
3329
- SwiftLint (= 0.24.0)
3430
- TreasureData-iOS-SDK (= 0.1.15)
3531

@@ -49,11 +45,9 @@ SPEC CHECKSUMS:
4945
Kingfisher: 8d80f39da403cd9c9ee11984e1655f4d6a566cdb
5046
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
5147
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
52-
R.swift: 207a372a2b5977caef440c696a368009460641d1
53-
R.swift.Library: fbdec16c9802ad104fc1ba53415dc190e6ec5c73
5448
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
5549
TreasureData-iOS-SDK: cc878af36b85ae3540a9a5bdb36b7bdc8707b719
5650

57-
PODFILE CHECKSUM: 890bc8cde488e1da70690561ca3f7dead572ce95
51+
PODFILE CHECKSUM: a39d73a29a507453d7f26041b291e321718ffeff
5852

5953
COCOAPODS: 1.3.1

‎iCookTV.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
B5A614F71CCA05B4004A3CD5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B5A614F91CCA05B4004A3CD5 /* InfoPlist.strings */; };
5353
B5A8F7091CA259120069F836 /* CategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A8F7081CA259120069F836 /* CategoryCell.swift */; };
5454
B5AEEE321C82D4BC001CF112 /* Metrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEEE311C82D4BC001CF112 /* Metrics.swift */; };
55-
B5BA3B4C1CF6D25500B0A022 /* R.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BA3B4B1CF6D25500B0A022 /* R.generated.swift */; };
5655
B5BA61891C77431400548B38 /* VideoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BA61881C77431400548B38 /* VideoCell.swift */; };
5756
B5BA618B1C7748B900548B38 /* Video.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BA618A1C7748B900548B38 /* Video.swift */; };
5857
B5BA618D1C774BC400548B38 /* VideoPlayerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BA618C1C774BC400548B38 /* VideoPlayerController.swift */; };
@@ -133,7 +132,6 @@
133132
B5A614FB1CCA05B7004A3CD5 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
134133
B5A8F7081CA259120069F836 /* CategoryCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CategoryCell.swift; sourceTree = "<group>"; };
135134
B5AEEE311C82D4BC001CF112 /* Metrics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metrics.swift; sourceTree = "<group>"; };
136-
B5BA3B4B1CF6D25500B0A022 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = "<group>"; };
137135
B5BA61881C77431400548B38 /* VideoCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoCell.swift; sourceTree = "<group>"; };
138136
B5BA618A1C7748B900548B38 /* Video.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Video.swift; sourceTree = "<group>"; };
139137
B5BA618C1C774BC400548B38 /* VideoPlayerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerController.swift; sourceTree = "<group>"; };
@@ -230,7 +228,6 @@
230228
B5F7BF541BA9C95F00A75099 /* Info.plist */,
231229
B5A614F91CCA05B4004A3CD5 /* InfoPlist.strings */,
232230
B500D9A81CB94B5D00622198 /* Localizable.strings */,
233-
B5BA3B4B1CF6D25500B0A022 /* R.generated.swift */,
234231
);
235232
name = "Supporting Files";
236233
sourceTree = "<group>";
@@ -374,7 +371,6 @@
374371
buildPhases = (
375372
24D096314DA4D14E4EDFA5EB /* [CP] Check Pods Manifest.lock */,
376373
B52DFA9C1CF8006E005B9D67 /* Run Swiftlint */,
377-
B5BA3B4A1CF6D19800B0A022 /* Run R.swift Script */,
378374
B5F7BF441BA9C95F00A75099 /* Sources */,
379375
B5F7BF451BA9C95F00A75099 /* Frameworks */,
380376
B5F7BF461BA9C95F00A75099 /* Resources */,
@@ -540,7 +536,6 @@
540536
"${BUILT_PRODUCTS_DIR}/KeenClientTD/KeenClientTD.framework",
541537
"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
542538
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
543-
"${BUILT_PRODUCTS_DIR}/R.swift.Library/Rswift.framework",
544539
"${BUILT_PRODUCTS_DIR}/TreasureData-iOS-SDK/TreasureData_iOS_SDK.framework",
545540
);
546541
name = "[CP] Embed Pods Frameworks";
@@ -552,7 +547,6 @@
552547
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeenClientTD.framework",
553548
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
554549
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
555-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rswift.framework",
556550
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TreasureData_iOS_SDK.framework",
557551
);
558552
runOnlyForDeploymentPostprocessing = 0;
@@ -588,20 +582,6 @@
588582
shellPath = /bin/sh;
589583
shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --config ${SRCROOT}/.swiftlint.yml";
590584
};
591-
B5BA3B4A1CF6D19800B0A022 /* Run R.swift Script */ = {
592-
isa = PBXShellScriptBuildPhase;
593-
buildActionMask = 2147483647;
594-
files = (
595-
);
596-
inputPaths = (
597-
);
598-
name = "Run R.swift Script";
599-
outputPaths = (
600-
);
601-
runOnlyForDeploymentPostprocessing = 0;
602-
shellPath = /bin/sh;
603-
shellScript = "sh ${SRCROOT}/scripts/rswift.sh";
604-
};
605585
D98BF45783F7971E01068E78 /* [CP] Embed Pods Frameworks */ = {
606586
isa = PBXShellScriptBuildPhase;
607587
buildActionMask = 2147483647;
@@ -616,7 +596,6 @@
616596
"${BUILT_PRODUCTS_DIR}/KeenClientTD/KeenClientTD.framework",
617597
"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
618598
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
619-
"${BUILT_PRODUCTS_DIR}/R.swift.Library/Rswift.framework",
620599
"${BUILT_PRODUCTS_DIR}/TreasureData-iOS-SDK/TreasureData_iOS_SDK.framework",
621600
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
622601
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
@@ -630,7 +609,6 @@
630609
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeenClientTD.framework",
631610
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
632611
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
633-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rswift.framework",
634612
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TreasureData_iOS_SDK.framework",
635613
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
636614
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
@@ -690,7 +668,6 @@
690668
B5DA8EDE1CB3BD1B0068E0E3 /* MenuView.swift in Sources */,
691669
B5AEEE321C82D4BC001CF112 /* Metrics.swift in Sources */,
692670
B543C3EA1CD1E85E008C512B /* OverlayViewPresentable.swift in Sources */,
693-
B5BA3B4C1CF6D25500B0A022 /* R.generated.swift in Sources */,
694671
B55BF7E71DC5B7F400EE20BD /* Reusable.swift in Sources */,
695672
B5C591151CA04BA50096B985 /* SectionHeaderView.swift in Sources */,
696673
B516E78B1D54D73B00A3FCB9 /* SourceType.swift in Sources */,

‎iCookTV/Controllers/CategoriesViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CategoriesViewController: UIViewController,
4040

4141
private lazy var titleView: MainMenuView = {
4242
let _menu = MainMenuView()
43-
_menu.button.setTitle(R.string.localizable.history(), for: .normal)
43+
_menu.button.setTitle(NSLocalizedString("history", comment: ""), for: .normal)
4444
_menu.button.addTarget(self, action: .showHistory, for: .primaryActionTriggered)
4545
return _menu
4646
}()

‎iCookTV/Controllers/HistoryViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HistoryViewController: UIViewController,
5757

5858
override var title: String? {
5959
get {
60-
return R.string.localizable.history()
60+
return NSLocalizedString("history", comment: "")
6161
}
6262
set {} // swiftlint:disable:this unused_setter_value
6363
}
@@ -67,7 +67,7 @@ class HistoryViewController: UIViewController,
6767
setUpBlurBackground()
6868
setUpCollectionView()
6969
setUpDropdownMenuView()
70-
dropdownMenuView.button.setTitle(R.string.localizable.home(), for: .normal)
70+
dropdownMenuView.button.setTitle(NSLocalizedString("home", comment: ""), for: .normal)
7171
dropdownMenuView.button.addTarget(self, action: .backToHome, for: .primaryActionTriggered)
7272
}
7373

@@ -126,7 +126,7 @@ class HistoryViewController: UIViewController,
126126

127127
private(set) lazy var overlayView: UIView = {
128128
let _empty = EmptyStateView()
129-
_empty.textLabel.text = R.string.localizable.noHistoryFound()
129+
_empty.textLabel.text = NSLocalizedString("no-history-found", comment: "")
130130
return _empty
131131
}()
132132

‎iCookTV/Controllers/LaunchViewController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class LaunchViewController: UIViewController, DataFetching {
3232

3333
private lazy var launchImageView: UIImageView = {
3434
let _imageView = UIImageView()
35-
_imageView.image = R.image.launchImage()
35+
_imageView.image = UIImage(named: "launchImage")
3636
_imageView.contentMode = .scaleAspectFill
3737
return _imageView
3838
}()
@@ -46,13 +46,13 @@ class LaunchViewController: UIViewController, DataFetching {
4646

4747
private lazy var upperTaglineLabel: UILabel = {
4848
let _upper = UILabel.taglineLabel()
49-
_upper.text = R.string.localizable.launchScreenUpperTagline()
49+
_upper.text = NSLocalizedString("launch-screen-upper-tagline", comment: "")
5050
return _upper
5151
}()
5252

5353
private lazy var lowerTaglineLabel: UILabel = {
5454
let _lower = UILabel.taglineLabel()
55-
_lower.text = R.string.localizable.launchScreenLowerTagline()
55+
_lower.text = NSLocalizedString("launch-screen-lower-tagline", comment: "")
5656
return _lower
5757
}()
5858

‎iCookTV/Controllers/VideoPlayerController.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ class VideoPlayerController: AVPlayerViewController, Trackable {
155155
loadingIndicator.stopAnimating()
156156

157157
guard let playerItem = playerItem else {
158-
let message = R.string.localizable.videoError() + "\n" + R.string.localizable.contactInfo()
159-
let alert = UIAlertController(title: R.string.localizable.errorTitle(), message: message, preferredStyle: .alert)
160-
alert.addAction(UIAlertAction(title: R.string.localizable.ok(), style: .default) { [weak self] _ in
158+
let message = NSLocalizedString("video-error", comment: "") + "\n" + NSLocalizedString("contact-info", comment: "")
159+
let alert = UIAlertController(title: NSLocalizedString("error-title", comment: ""), message: message, preferredStyle: .alert)
160+
alert.addAction(UIAlertAction(title: NSLocalizedString("ok", comment: ""), style: .default) { [weak self] _ in
161161
self?.dismiss()
162162
})
163163
present(alert, animated: true, completion: nil)

‎iCookTV/Controllers/VideosViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class VideosViewController: UIViewController,
8989
setUpBlurBackground()
9090
setUpCollectionView()
9191
setUpDropdownMenuView()
92-
dropdownMenuView.button.setTitle(R.string.localizable.history(), for: .normal)
92+
dropdownMenuView.button.setTitle(NSLocalizedString("history", comment: ""), for: .normal)
9393
dropdownMenuView.button.addTarget(self, action: .showHistory, for: .primaryActionTriggered)
9494
}
9595

‎iCookTV/Extensions/UIViewController+Alert.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ extension UIViewController {
3232
Tracker.track(error)
3333

3434
let alert = UIAlertController(
35-
title: R.string.localizable.errorTitle(),
36-
message: R.string.localizable.contactInfo(),
35+
title: NSLocalizedString("error-title", comment: ""),
36+
message: NSLocalizedString("contact-info", comment: ""),
3737
preferredStyle: .alert
3838
)
39-
alert.addAction(UIAlertAction(title: R.string.localizable.retry(), style: .default) { _ in
39+
alert.addAction(UIAlertAction(title: NSLocalizedString("retry", comment: ""), style: .default) { _ in
4040
retry?()
4141
})
4242
present(alert, animated: true, completion: nil)

0 commit comments

Comments
 (0)