Skip to content

Commit 4b243c0

Browse files
committed
style : 컨벤션 적용 #7
- 변수명 소문자 카멜케이스 적용 - 매직리터럴, 매직넘버 enum Metric 으로 분리 - 불필요한 주석 제거, 마크주석 적용 - 개행 컨벤션 적용
1 parent e899afa commit 4b243c0

File tree

7 files changed

+35
-36
lines changed

7 files changed

+35
-36
lines changed

Particle/Particle/LoggedIn/LoggedInBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class LoggedInBuilder: Builder<LoggedInDependency>, LoggedInBuildable {
3737
let mainBuilder = MainBuilder(dependency: component)
3838
return LoggedInRouter(
3939
interactor: interactor,
40-
viewController: component.LoggedInViewController,
40+
viewController: component.loggedInViewController,
4141
mainBuilder: mainBuilder
4242
)
4343
}

Particle/Particle/Main/HomeTab/AddArticle/AddArticleBuilder.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,15 @@
88
import RIBs
99

1010
protocol AddArticleDependency: Dependency {
11-
// TODO: Make sure to convert the variable into lower-camelcase.
1211
var addArticleViewController: ViewControllable { get }
13-
// TODO: Declare the set of dependencies required by this RIB, but won't be
14-
// created by this RIB.
1512
}
1613

1714
final class AddArticleComponent: Component<AddArticleDependency> {
18-
1915
var repository = OrganizingSentenceRepositoryImp()
20-
// TODO: Make sure to convert the variable into lower-camelcase.
16+
2117
fileprivate var addArticleViewController: ViewControllable {
2218
return dependency.addArticleViewController
2319
}
24-
25-
// TODO: Declare 'fileprivate' dependencies that are only used by this RIB.
2620
}
2721

2822
// MARK: - Builder
@@ -32,13 +26,15 @@ protocol AddArticleBuildable: Buildable {
3226
}
3327

3428
final class AddArticleBuilder: Builder<AddArticleDependency>, AddArticleBuildable {
29+
3530

3631
override init(dependency: AddArticleDependency) {
3732
super.init(dependency: dependency)
3833
}
3934

4035
func build(withListener listener: AddArticleListener) -> AddArticleRouting {
4136
let component = AddArticleComponent(dependency: dependency)
37+
4238
let interactor = AddArticleInteractor()
4339
interactor.listener = listener
4440

Particle/Particle/Main/HomeTab/AddArticle/AddArticleInteractor.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,14 @@ protocol AddArticleRouting: Routing {
2525
func detachSetAdditionalInformation()
2626
}
2727

28-
protocol AddArticleListener: AnyObject {
29-
// TODO: Declare methods the interactor can invoke to communicate with other RIBs.
30-
}
28+
protocol AddArticleListener: AnyObject { }
3129

3230
final class AddArticleInteractor: Interactor, AddArticleInteractable {
3331

3432
weak var router: AddArticleRouting?
3533
weak var listener: AddArticleListener?
3634

37-
// TODO: Add additional dependencies to constructor. Do not perform any logic
38-
// in constructor.
39-
override init() {
40-
}
35+
override init() { }
4136

4237
override func didBecomeActive() {
4338
super.didBecomeActive()
@@ -48,7 +43,6 @@ final class AddArticleInteractor: Interactor, AddArticleInteractable {
4843
super.willResignActive()
4944

5045
router?.cleanupViews()
51-
// TODO: Pause any business logic.
5246
}
5347

5448
// MARK: - PhotoPickerListener
@@ -71,7 +65,6 @@ final class AddArticleInteractor: Interactor, AddArticleInteractable {
7165
router?.attachOrganizingSentence()
7266
}
7367

74-
7568
// MARK: - OrganizingSentenceListener
7669

7770
func organizingSentenceNextButtonTapped() {

Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/EditSentence/EditSentenceBuilder.swift

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@
77

88
import RIBs
99

10-
protocol EditSentenceDependency: Dependency {
11-
// TODO: Declare the set of dependencies required by this RIB, but cannot be
12-
// created by this RIB.
13-
}
14-
15-
final class EditSentenceComponent: Component<EditSentenceDependency> {
10+
protocol EditSentenceDependency: Dependency { }
1611

17-
// TODO: Declare 'fileprivate' dependencies that are only used by this RIB.
18-
}
12+
final class EditSentenceComponent: Component<EditSentenceDependency> { }
1913

2014
// MARK: - Builder
2115

@@ -31,7 +25,7 @@ final class EditSentenceBuilder: Builder<EditSentenceDependency>, EditSentenceBu
3125

3226
func build(withListener listener: EditSentenceListener, text: String) -> EditSentenceRouting {
3327
_ = EditSentenceComponent(dependency: dependency)
34-
let viewController = EditSentenceViewController(with: text) // FIXME: text 데이터 전달과정 리뷰요청. component 활용방법 연구
28+
let viewController = EditSentenceViewController(with: text)
3529
let interactor = EditSentenceInteractor(presenter: viewController)
3630
interactor.listener = listener
3731
return EditSentenceRouter(interactor: interactor, viewController: viewController)

Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/EditSentence/EditSentenceViewController.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ final class EditSentenceViewController: UIViewController, EditSentencePresentabl
9090
height: 50
9191
)
9292
)
93-
uiview.layer.borderWidth = 1
94-
uiview.layer.borderColor = UIColor.systemGray6.cgColor
95-
uiview.layer.backgroundColor = UIColor.systemBackground.cgColor
93+
uiview.layer.backgroundColor = UIColor.darkGray.cgColor
9694
return uiview
9795
}()
9896

@@ -105,6 +103,8 @@ final class EditSentenceViewController: UIViewController, EditSentencePresentabl
105103
return button
106104
}()
107105

106+
// MARK: - Initializers
107+
108108
init(with text: String) {
109109
self.originalText = text
110110
super.init(nibName: nil, bundle: nil)
@@ -116,6 +116,8 @@ final class EditSentenceViewController: UIViewController, EditSentencePresentabl
116116
fatalError("init(coder:) has not been implemented")
117117
}
118118

119+
// MARK: - View LifeCycles
120+
119121
override func viewDidLoad() {
120122
super.viewDidLoad()
121123
setupKeyboardNotification()

Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/SelectSentenceViewController.swift

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ protocol SelectSentencePresentableListener: AnyObject {
2020
func nextButtonTapped()
2121
}
2222

23-
final class SelectSentenceViewController: UIViewController, SelectSentencePresentable, SelectSentenceViewControllable {
23+
final class SelectSentenceViewController: UIViewController,
24+
SelectSentencePresentable,
25+
SelectSentenceViewControllable {
2426

2527
enum Metric {
2628
enum Title {
@@ -29,15 +31,21 @@ final class SelectSentenceViewController: UIViewController, SelectSentencePresen
2931
}
3032

3133
enum NavigationBar {
32-
static let height = 44
33-
static let backButtonLeftMargin = 8
34-
static let nextButtonRightMargin = 8
34+
static let height: CGFloat = 44
35+
static let backButtonLeftMargin: CGFloat = 8
36+
static let nextButtonRightMargin: CGFloat = 8
37+
}
38+
39+
enum InfoBox {
40+
static let height: CGFloat = 53
41+
}
42+
3543
enum CollectionViewCell {
3644
static let width = DeviceSize.width
3745
static let height = DeviceSize.height - Metric.NavigationBar.height - InfoBox.height - 100
3846
}
3947
}
40-
48+
4149
weak var listener: SelectSentencePresentableListener?
4250
private var disposeBag: DisposeBag = .init()
4351

@@ -114,6 +122,8 @@ final class SelectSentenceViewController: UIViewController, SelectSentencePresen
114122
return textView
115123
}()
116124

125+
// MARK: - Initializers
126+
117127
init(selectedImages: [PHAsset]) {
118128
super.init(nibName: nil, bundle: nil)
119129

@@ -129,6 +139,8 @@ final class SelectSentenceViewController: UIViewController, SelectSentencePresen
129139
fatalError("init(coder:) has not been implemented")
130140
}
131141

142+
// MARK: - View LifeCycles
143+
132144
override func viewDidLoad() {
133145
super.viewDidLoad()
134146
setupInitialView()
@@ -154,6 +166,7 @@ final class SelectSentenceViewController: UIViewController, SelectSentencePresen
154166

155167
private func setupNavigationBar() {
156168
navigationController?.isNavigationBarHidden = true
169+
157170
backButton.rx.tap
158171
.bind { [weak self] in
159172
self?.listener?.backButtonTapped()
@@ -274,6 +287,7 @@ final class SelectSentenceViewController: UIViewController, SelectSentencePresen
274287
}
275288

276289
// MARK: - SelectSentenceViewControllable
290+
277291
func present(viewController: ViewControllable) {
278292
present(viewController.uiviewController, animated: true)
279293
}
@@ -339,7 +353,7 @@ private extension SelectSentenceViewController {
339353
infoBox.snp.makeConstraints {
340354
$0.top.equalTo(navigationBar.snp.bottom)
341355
$0.leading.trailing.equalTo(view.safeAreaLayoutGuide)
342-
$0.height.equalTo(53)
356+
$0.height.equalTo(Metric.InfoBox.height)
343357
}
344358

345359
infoLabel.snp.makeConstraints {
@@ -361,6 +375,7 @@ import SwiftUI
361375

362376
@available(iOS 13.0, *)
363377
struct SelectSentenceViewController_Preview: PreviewProvider {
378+
364379
static var previews: some View {
365380
SelectSentenceViewController(selectedImages: []).showPreview()
366381
}

Particle/Particle/Root/RootRouter.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ final class RootRouter: LaunchRouter<RootInteractable, RootViewControllable>, Ro
5858
private let loggedInBuilder: LoggedInBuildable
5959

6060
private var loggedOut: ViewableRouting?
61-
// private var loggedIn: Routing?
6261

6362
private func routeToLoggedOut() {
6463
let loggedOut = loggedOutBuilder.build(withListener: interactor)

0 commit comments

Comments
 (0)