Skip to content

Commit

Permalink
Qa 2 (#41)
Browse files Browse the repository at this point in the history 
* 💄 aboutTeamViewController 스크롤 추가, 색, 위치 등 조정

* 🐛 About 화면 네비게이션바 사라지는 버그 수정

* 🐛 AboutTeamViewController SafeArea를 스크롤뷰가 포함하지 않도록 변경

* 🔨 루트뷰를 NavigationController로 변경. About화면 NavigationView를 통해 자연스럽게 화면전환하도록 변경

* 💄 AboutTeamViewController에 BodyView 추가. 스크롤뷰 상하단 색 변경

* 💄 하트 로티 변경
  • Loading branch information
@wan088
wan088 authored Jan 17, 2021
1 parent d97dd65 commit 61a26b3
Show file tree
Hide file tree
Showing 8 changed files with 103 additions and 74 deletions.
8 changes: 4 additions & 4 deletions Dear-World/Dear-World.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
121BDB44259735200062B15A /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB43259735200062B15A /* UIColor+.swift */; };
121BDB592597652A0062B15A /* MessageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB582597652A0062B15A /* MessageTableViewCell.swift */; };
121BDB672597982F0062B15A /* DiscoverReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB662597982F0062B15A /* DiscoverReactor.swift */; };
122D6E2825B4571200F9D249 /* heart.json in Resources */ = {isa = PBXBuildFile; fileRef = 122D6E2725B4571200F9D249 /* heart.json */; };
1263E09725A1C87400E3F121 /* Message.API.Countries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1263E09625A1C87400E3F121 /* Message.API.Countries.swift */; };
1263E09C25A1C8DD00E3F121 /* Message.Model.Countries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1263E09B25A1C8DD00E3F121 /* Message.Model.Countries.swift */; };
1263E0CF25A1F5ED00E3F121 /* Message.Model.MessageCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1263E0CE25A1F5ED00E3F121 /* Message.Model.MessageCount.swift */; };
Expand Down Expand Up @@ -73,7 +74,6 @@
39965E7A25ABDF8100069860 /* ItemBottomReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E7925ABDF8100069860 /* ItemBottomReactor.swift */; };
39965E8825ABE32400069860 /* BottomSheetItemHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */; };
39965E8D25ACA87A00069860 /* BottomSheetItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8C25ACA87A00069860 /* BottomSheetItem.swift */; };
39965F2525B2E20A00069860 /* heart_fill.json in Resources */ = {isa = PBXBuildFile; fileRef = 39965F2425B2E20900069860 /* heart_fill.json */; };
39965F3325B308B000069860 /* UIApplication+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965F3225B308B000069860 /* UIApplication+.swift */; };
39C832282597651F00236DDF /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832272597651F00236DDF /* RxRelay */; };
39C8322A2597651F00236DDF /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832292597651F00236DDF /* RxSwift */; };
Expand Down Expand Up @@ -120,6 +120,7 @@
121BDB43259735200062B15A /* UIColor+.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = "<group>"; tabWidth = 2; };
121BDB582597652A0062B15A /* MessageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageTableViewCell.swift; sourceTree = "<group>"; };
121BDB662597982F0062B15A /* DiscoverReactor.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = DiscoverReactor.swift; sourceTree = "<group>"; tabWidth = 2; };
122D6E2725B4571200F9D249 /* heart.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = heart.json; path = ../../../../Downloads/heart.json; sourceTree = "<group>"; };
1263E09625A1C87400E3F121 /* Message.API.Countries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.API.Countries.swift; sourceTree = "<group>"; };
1263E09B25A1C8DD00E3F121 /* Message.Model.Countries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.Model.Countries.swift; sourceTree = "<group>"; };
1263E0CE25A1F5ED00E3F121 /* Message.Model.MessageCount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.Model.MessageCount.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -174,7 +175,6 @@
39965E7925ABDF8100069860 /* ItemBottomReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemBottomReactor.swift; sourceTree = "<group>"; };
39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItemHeaderView.swift; sourceTree = "<group>"; };
39965E8C25ACA87A00069860 /* BottomSheetItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItem.swift; sourceTree = "<group>"; };
39965F2425B2E20900069860 /* heart_fill.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = heart_fill.json; sourceTree = "<group>"; };
39965F3225B308B000069860 /* UIApplication+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+.swift"; sourceTree = "<group>"; };
39E9F7CF25A1738F00BC2CC2 /* AboutReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutReactor.swift; sourceTree = "<group>"; };
39E9F7DA25A1BBED00BC2CC2 /* PixelWorldMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelWorldMapView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -385,7 +385,7 @@
395825AE25948E66007325AB /* Resource */ = {
isa = PBXGroup;
children = (
39965F2425B2E20900069860 /* heart_fill.json */,
122D6E2725B4571200F9D249 /* heart.json */,
39658F9F259ADE770050D180 /* splash_1x.json */,
395825B625948EE4007325AB /* Colors.xcassets */,
3958258325948E43007325AB /* Assets.xcassets */,
Expand Down Expand Up @@ -765,7 +765,7 @@
39518C7725A8FA2400F777D1 /* GoogleService-Info.plist in Resources */,
395825B725948EE4007325AB /* Colors.xcassets in Resources */,
3958258425948E43007325AB /* Assets.xcassets in Resources */,
39965F2525B2E20A00069860 /* heart_fill.json in Resources */,
122D6E2825B4571200F9D249 /* heart.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 0 additions & 1 deletion Dear-World/Dear-World/Resource/heart_fill.json
View file

This file was deleted.

4 changes: 3 additions & 1 deletion Dear-World/Dear-World/Source/Core/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
private func setupInitialScene() {
let mainWindow: UIWindow = UIWindow()
window = mainWindow
mainWindow.rootViewController = MainTabBarController()
mainWindow.rootViewController = UINavigationController(rootViewController: MainTabBarController()).then {
$0.navigationBar.isHidden = true
}
mainWindow.makeKeyAndVisible()
}
}
78 changes: 47 additions & 31 deletions ...-World/Dear-World/Source/Presentation/Scene/About/AboutTeam/AboutTeamViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,48 @@ final class AboutTeamViewController: UIViewController, View {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

self.navigationController?.navigationBar.isHidden = true
}
// MARK: 🎛 Setup
private func setupUI() {
self.view.backgroundColor = .breathingWhite

let scrollView: UIScrollView = UIScrollView().then {
$0.backgroundColor = .nightBlue
$0.contentInsetAdjustmentBehavior = .never
}
self.view.addSubview(scrollView)
scrollView.snp.makeConstraints {
$0.top.bottom.leading.trailing.equalTo(self.view)
}
scrollView.contentLayoutGuide.snp.makeConstraints {
$0.leading.trailing.equalTo(self.view)
}

let headerView: UIImageView = UIImageView().then {
$0.image = UIImage(named: "about_top_img")
}
self.view.addSubview(headerView)
scrollView.addSubview(headerView)
headerView.snp.makeConstraints {
$0.top.leading.trailing.equalToSuperview()
$0.height.equalTo(UIScreen.main.bounds.width * 240.0 / 375.0)
}
self.view.addSubview(backButton)

scrollView.addSubview(backButton)
backButton.do {
$0.setBackgroundImage(UIImage(named: "backWhite"), for: .normal)
$0.setBackgroundImage(UIImage(named: "back"), for: .normal)
}
backButton.snp.makeConstraints {
$0.leading.equalToSuperview().inset(20)
$0.top.equalTo(self.view.safeAreaLayoutGuide).inset(37)
$0.width.equalTo(10)
$0.height.equalTo(16)
$0.top.equalToSuperview().inset(UIApplication.shared.windows[0].safeAreaInsets.top + 17)
}

let bodyView = UIView().then {
$0.backgroundColor = .breathingWhite
}
scrollView.addSubview(bodyView)
bodyView.snp.makeConstraints {
$0.top.equalTo(headerView.snp.bottom)
$0.leading.trailing.equalToSuperview()
}

let teamGreetingTitleLabel: UILabel = UILabel().then {
$0.text = "Hello, we are team OFU!"
$0.font = .boldSystemFont(ofSize: 16)
Expand All @@ -77,29 +91,29 @@ final class AboutTeamViewController: UIViewController, View {
$0.textColor = .nightBlue
$0.numberOfLines = 0
}
self.view.addSubview(teamGreetingTitleLabel)
self.view.addSubview(teamGreetingLabel)
bodyView.addSubview(teamGreetingTitleLabel)
bodyView.addSubview(teamGreetingLabel)
teamGreetingTitleLabel.snp.makeConstraints {
$0.leading.trailing.equalToSuperview().inset(20)
$0.top.equalTo(headerView.snp.bottom).offset(30)
$0.top.equalToSuperview().inset(30)
}
teamGreetingLabel.snp.makeConstraints {
$0.leading.trailing.equalToSuperview().inset(20)
$0.top.equalTo(teamGreetingTitleLabel.snp.bottom).offset(10)
}

let crewsTitleLable: UILabel = UILabel().then {
$0.text = "OFU CREWS"
$0.textColor = .warmBlue
$0.font = .boldSystemFont(ofSize: 16)
}
self.view.addSubview(crewsTitleLable)
bodyView.addSubview(crewsTitleLable)
crewsTitleLable.snp.makeConstraints {
$0.top.equalTo(teamGreetingLabel.snp.bottom).offset(50)
$0.leading.trailing.equalToSuperview().inset(20)
}
self.view.addSubview(crewsCollectionView)

bodyView.addSubview(crewsCollectionView)
crewsCollectionView.do {
$0.register(CrewCollectionViewCell.self, forCellWithReuseIdentifier: "CrewCollectionViewCell")
$0.backgroundColor = .breathingWhite
Expand All @@ -110,32 +124,34 @@ final class AboutTeamViewController: UIViewController, View {
$0.top.equalTo(crewsTitleLable.snp.bottom).offset(20)
$0.leading.trailing.equalToSuperview().inset(20)
$0.height.equalTo(440)
$0.bottom.equalToSuperview().inset(20)
}

let footerView: UIView = UIView().then {
$0.backgroundColor = .livelyBlue
$0.backgroundColor = .nightBlue
}
self.view.addSubview(footerView)
scrollView.addSubview(footerView)
footerView.snp.makeConstraints {
$0.leading.trailing.equalToSuperview()
$0.height.equalTo(144)
$0.top.equalTo(crewsCollectionView.snp.bottom).offset(100)
$0.top.equalTo(bodyView.snp.bottom)
$0.bottom.equalToSuperview()
}

footerView.addSubview(moreButton)
moreButton.do {
$0.backgroundColor = .illuminatingYellow
$0.backgroundColor = .livelyBlue
$0.setTitle("More about OFU CREW", for: .normal)
$0.titleLabel?.font = .systemFont(ofSize: 14)
$0.layer.cornerRadius = 10
$0.setTitleColor(.warmBlue, for: .normal)
}
moreButton.snp.makeConstraints {
$0.top.equalToSuperview().inset(15)
$0.bottom.equalToSuperview().inset(82)
$0.leading.trailing.equalToSuperview().inset(20)
$0.height.equalTo(48)
$0.height.equalTo(47)
}

let copyrightLabel: UILabel = UILabel().then {
$0.text = "ⓒ OFU 2021. Made in Korea"
$0.font = .systemFont(ofSize: 14)
Expand All @@ -159,7 +175,7 @@ final class AboutTeamViewController: UIViewController, View {
reactor.state.distinctUntilChanged(\.$isWillDismiss)
.filter { $0.isWillDismiss }
.subscribe(onNext: { [weak self] _ in
self?.dismiss(animated: true, completion: nil)
self?.navigationController?.popViewController(animated: true)
})
.disposed(by: disposeBag)

Expand Down
Loading

0 comments on commit 61a26b3

Please sign in to comment.