Skip to content

Commit ca881ca

Browse files
authored
Merge pull request #116 from EAT-SSU/fix/#115
[#115]
2 parents e6e02dd + 3e2aa75 commit ca881ca

File tree

3 files changed

+39
-42
lines changed

3 files changed

+39
-42
lines changed

β€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/View/RerportView/ReportView.swiftβ€Ž

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,33 +82,25 @@ final class ReportView: BaseUIView {
8282
/// "EAT SSU νŒ€μ—κ²Œ 보내기" λ²„νŠΌ
8383
internal let sendToEATSSUButton = ESButton(size: .big, title: "EAT SSU νŒ€μ—κ²Œ 보내기")
8484

85-
// MARK: - Initializer
86-
87-
init() {
88-
super.init(frame: .zero)
85+
// MARK: - Functions
8986

90-
self.setLayout()
91-
}
92-
93-
required init?(coder: NSCoder) {
94-
fatalError("init(coder:) has not been implemented")
95-
}
87+
override func configureUI() {
88+
self.addSubviews(
89+
reviewReportReasonLabel,
90+
singleReportPerDayLabel,
91+
unrelatedToMenuButton,
92+
inappropriateContentButton,
93+
inappropriatePromotionButton,
94+
offTopicContentButton,
95+
copyrightInfringementButton,
96+
otherReasonButton,
97+
reviewReportReasonTextView,
98+
characterCountLabel,
99+
sendToEATSSUButton
100+
)
101+
}
96102

97103
internal override func setLayout() {
98-
self.addSubviews(
99-
reviewReportReasonLabel,
100-
singleReportPerDayLabel,
101-
unrelatedToMenuButton,
102-
inappropriateContentButton,
103-
inappropriatePromotionButton,
104-
offTopicContentButton,
105-
copyrightInfringementButton,
106-
otherReasonButton,
107-
reviewReportReasonTextView,
108-
characterCountLabel,
109-
sendToEATSSUButton
110-
)
111-
112104
reviewReportReasonLabel.snp.makeConstraints { make in
113105
make.leading.equalTo(self).inset(24)
114106
make.trailing.equalTo(self).inset(166)

β€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/Review/ViewController/ReportViewController.swiftβ€Ž

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ final class ReportViewController: BaseViewController {
3939
override func viewDidLoad() {
4040
super.viewDidLoad()
4141

42-
self.connectView()
42+
self.configureUI()
43+
self.setLayout()
4344
self.setScrollViewSetting()
4445
self.setDelegate()
4546
self.addArray()
@@ -54,7 +55,7 @@ final class ReportViewController: BaseViewController {
5455

5556
// MARK: - Methods
5657

57-
private func connectView() {
58+
override func configureUI() {
5859
view.addSubview(scrollView)
5960
scrollView.snp.makeConstraints { make in
6061
make.edges.equalTo(view.safeAreaLayoutGuide)
@@ -68,6 +69,10 @@ final class ReportViewController: BaseViewController {
6869
make.height.equalTo(800)
6970
}
7071
}
72+
73+
override func setLayout() {
74+
super.setLayout()
75+
}
7176

7277
private func setScrollViewSetting() {
7378
self.scrollView.frame = self.view.bounds

β€ŽEATSSU_MVC/EATSSU_MVC/Sources/Utility/Application/SceneDelegate.swiftβ€Ž

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
2121
}
2222
}
2323

24-
func sceneWillEnterForeground(_ scene: UIScene) {
25-
// Called as the scene transitions from the background to the foreground.
26-
// Use this method to undo the changes made on entering the background.
27-
// self.checkAndUpdateIfNeeded()
28-
}
24+
func sceneWillEnterForeground(_ scene: UIScene) {
25+
// Called as the scene transitions from the background to the foreground.
26+
// Use this method to undo the changes made on entering the background.
27+
self.checkAndUpdateIfNeeded()
28+
}
2929

3030
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
3131
guard let windowScene = (scene as? UIWindowScene) else { return }
@@ -35,17 +35,17 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
3535

3636
var navigationController = UINavigationController(rootViewController: LoginViewController())
3737

38-
FirebaseRemoteConfig.shared.noticeCheck { [weak self] result in
39-
if result != nil {
40-
navigationController =
41-
UINavigationController(rootViewController: NoticeViewController(noticeMessage: result ?? ""))
42-
} else {
43-
self?.window?.rootViewController = navigationController
44-
self?.window?.makeKeyAndVisible()
45-
// self?.checkAndUpdateIfNeeded()
46-
}
47-
}
48-
}
38+
FirebaseRemoteConfig.shared.noticeCheck { [weak self] result in
39+
if result != nil {
40+
navigationController =
41+
UINavigationController(rootViewController: NoticeViewController(noticeMessage: result ?? ""))
42+
} else {
43+
self?.window?.rootViewController = navigationController
44+
self?.window?.makeKeyAndVisible()
45+
self?.checkAndUpdateIfNeeded()
46+
}
47+
}
48+
}
4949

5050
// μ—…λ°μ΄νŠΈκ°€ ν•„μš”ν•œμ§€ 확인 ν›„ μ—…λ°μ΄νŠΈ μ•ŒλŸΏμ„ λ„μš°λŠ” λ©”μ†Œλ“œ
5151
func checkAndUpdateIfNeeded() {

0 commit comments

Comments
Β (0)