Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] #211 - 피드백 기능 구현 #215

Merged
merged 6 commits into from
Aug 6, 2024
Merged

[Feat] #211 - 피드백 기능 구현 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80e7b09
[WIP] #211 - SendFeedback
joonBaek12 Jul 30, 2024
93ac759
[Fix] #211 - ScrollView 스크롤 이슈
joonBaek12 Aug 5, 2024
f0e2c1f
[Feat] #211 - 설문 링크 다이렉션 구현
joonBaek12 Aug 5, 2024
9889fca
[Chore] #211 - Toast Layout 수정
cchanmi Aug 6, 2024
fd702fb
[Chore] #211 - 에러 subject 추가
cchanmi Aug 6, 2024
5c2a644
[Chore] #211 - setting view height 레이아웃 기기대응
cchanmi Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
37ADCC022B0289AD00E474AA /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37ADCC012B0289AD00E474AA /* Observable.swift */; };
37B360AA2AC2A4680006C8ED /* SmeemTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B360A92AC2A4680006C8ED /* SmeemTextView.swift */; };
37BCADF22BC3FFBF006EF960 /* DetailDiaryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BCADF12BC3FFBF006EF960 /* DetailDiaryViewModel.swift */; };
37BDC9872C4FEA940075F68A /* SendFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BDC9862C4FEA940075F68A /* SendFeedbackView.swift */; };
37DCA6572A47574300FF8F90 /* RandomTopicAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DCA6562A47574300FF8F90 /* RandomTopicAPI.swift */; };
37DCA65A2A47598700FF8F90 /* RandomTopicService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DCA6592A47598700FF8F90 /* RandomTopicService.swift */; };
37DCA65D2A475B5100FF8F90 /* RandomTopicResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DCA65C2A475B5100FF8F90 /* RandomTopicResponse.swift */; };
Expand Down Expand Up @@ -293,6 +294,7 @@
37ADCC012B0289AD00E474AA /* Observable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Observable.swift; sourceTree = "<group>"; };
37B360A92AC2A4680006C8ED /* SmeemTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmeemTextView.swift; sourceTree = "<group>"; };
37BCADF12BC3FFBF006EF960 /* DetailDiaryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailDiaryViewModel.swift; sourceTree = "<group>"; };
37BDC9862C4FEA940075F68A /* SendFeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendFeedbackView.swift; sourceTree = "<group>"; };
37DCA6562A47574300FF8F90 /* RandomTopicAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RandomTopicAPI.swift; sourceTree = "<group>"; };
37DCA6592A47598700FF8F90 /* RandomTopicService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RandomTopicService.swift; sourceTree = "<group>"; };
37DCA65C2A475B5100FF8F90 /* RandomTopicResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RandomTopicResponse.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1521,6 +1523,7 @@
4AC705902BEA1E49003C5310 /* PlanContainerView.swift */,
4AC705922BEA1E52003C5310 /* LanguageContainerView.swift */,
4AC705942BEA1E58003C5310 /* AlarmContainerView.swift */,
37BDC9862C4FEA940075F68A /* SendFeedbackView.swift */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -1918,6 +1921,7 @@
4AF58CE92A4820AA00305248 /* AuthNetworkModel.swift in Sources */,
378E461F2B551A6F00D2A473 /* DeepLResponse.swift in Sources */,
3761116C2A278D0E0095EC5A /* String+.swift in Sources */,
37BDC9872C4FEA940075F68A /* SendFeedbackView.swift in Sources */,
4A07F8AC2B7B3E7F004185F2 /* SignupViewModel.swift in Sources */,
4AB7C91B2B7624CC00845733 /* ServiceAcceptAppData.swift in Sources */,
4AC707B42B73D2D400B1D791 /* UserNicknameViewModel.swift in Sources */,
Expand Down
36 changes: 18 additions & 18 deletions Smeem-iOS/Smeem-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
"version" : "1.2022062300.0"
"revision" : "df308b8b46607675f2b9ec8e569109008f9155ce",
"version" : "1.2022062300.1"
}
},
{
Expand Down Expand Up @@ -68,35 +68,35 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "7874c1b48cbffd086ce8a052c4be873a78613775",
"version" : "9.2.3"
"revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
"version" : "9.4.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "871d43135925cde39ef7421d8723ce47edfdcc39",
"version" : "7.11.1"
"revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
"version" : "7.13.3"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "2b7656d8ee892cd39db460b1a0d849de618405e6",
"version" : "1.50.1"
"revision" : "f1b366129d1125be7db83247e003fc333104b569",
"version" : "1.50.2"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
"version" : "3.1.1"
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
"version" : "3.5.0"
}
},
{
Expand All @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
"version" : "1.22.2"
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
"version" : "1.22.5"
}
},
{
Expand All @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
"version" : "2.2.0"
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
},
{
Expand All @@ -167,8 +167,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveX/RxSwift.git",
"state" : {
"revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
"version" : "6.6.0"
"revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
"version" : "6.7.1"
}
},
{
Expand All @@ -185,8 +185,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "0af9125c4eae12a4973fb66574c53a54962a9e1e",
"version" : "1.21.0"
"revision" : "d57a5aecf24a25b32ec4a74be2f5d0a995a47c4b",
"version" : "1.27.0"
}
}
],
Expand Down
1 change: 1 addition & 0 deletions Smeem-iOS/Smeem-iOS/Global/UIComponents/Alarm/AlarmCollectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ final class AlarmCollectionView: UICollectionView {
setCellRegister()
setViewRegister()
setLayerUI()
self.isScrollEnabled = false
}

required init?(coder: NSCoder) {
Expand Down
23 changes: 14 additions & 9 deletions Smeem-iOS/Smeem-iOS/Global/UIComponents/SmeemComponent/SmeemToastView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ final class SmeemToastView: UIView {
return imageView
}()

private let labelStackView: UIStackView = {
let stackView = UIStackView()
stackView.axis = .vertical
stackView.distribution = .fill
stackView.spacing = 3
stackView.alignment = .leading
return stackView
}()

private let headLabel: UILabel = {
let label = UILabel()
label.font = .c1
Expand Down Expand Up @@ -169,7 +178,8 @@ final class SmeemToastView: UIView {
}

private func setToastViewLayout() {
addSubviews(cautionImage, headLabel, bodyLabel)
addSubviews(cautionImage, labelStackView)
labelStackView.addArrangedSubviews(headLabel, bodyLabel)

switch type {
case .smeemToast:
Expand All @@ -184,14 +194,9 @@ final class SmeemToastView: UIView {
make.width.height.equalTo(22)
}

headLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(14)
labelStackView.snp.makeConstraints { make in
make.leading.equalTo(cautionImage.snp.trailing).offset(14)
}

bodyLabel.snp.makeConstraints { make in
make.top.equalTo(headLabel.snp.bottom).offset(3)
make.leading.equalTo(headLabel)
make.centerY.equalTo(cautionImage)
}
}

Expand All @@ -202,7 +207,7 @@ final class SmeemToastView: UIView {
if case .smeemToast = type {
make.height.equalTo(convertByHeightRatio(50))
} else {
make.height.equalTo(convertByHeightRatio(70))
make.height.equalTo(convertByWidthRatio(70))
}
}
}
Expand Down
80 changes: 57 additions & 23 deletions Smeem-iOS/Smeem-iOS/Presentation/Setting/VC/SettingViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,23 @@
import UIKit
import Combine

import SnapKit

final class SettingViewController: BaseViewController {

private let viewWillAppearSubject = PassthroughSubject<Void, Never>()
private let nicknameButtonTapped = PassthroughSubject<Void, Never>()
private let planButtonTapped = PassthroughSubject<Void, Never>()
private let alarmToggleTapped = PassthroughSubject<Void, Never>()
private let alarmButtnTapped = PassthroughSubject<Void, Never>()
private let errorSubject = PassthroughSubject<SmeemError, Never>()
private var cancelBag = Set<AnyCancellable>()
private let toastSubject = PassthroughSubject<Void, Never>()
private let viewModel = SettingViewModel(provider: SettingService())

private let summaryScrollerView: UIScrollView = {
let scrollerView = UIScrollView()
scrollerView.showsVerticalScrollIndicator = false
return scrollerView
}()

private let summaryScrollerView = UIScrollView()
private let contentView = UIView()

private let naviView = UIView()

private let backButton: UIButton = {
Expand All @@ -48,12 +47,14 @@ final class SettingViewController: BaseViewController {
return button
}()

private let planContainerView = PlanContainerView()
private let nicknameContainerView = NicknameContainerView()
private let planContainerView = PlanContainerView()
private let languageContainerView = LanguageContainerView()
private let alarmContainerView = AlarmContainerView()
private let alarmCollectionContainerView = UIView()
private let alarmCollectionView = AlarmCollectionView()
private let separationLine = SeparationLine(height: .thin)
private let sendFeedbackView = SendFeedbackView()

override func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -106,11 +107,24 @@ final class SettingViewController: BaseViewController {
}
.store(in: &cancelBag)

sendFeedbackView.directButtonTapped
.sink { _ in
guard let url = URL(string: "https://walla.my/survey/2SAyT8aWPKjqaL4cZ5vm") else { return }
UIApplication.shared.open(url, options: [:]) { success in
if success {
self.errorSubject.send(.clientError)
}
}

}
.store(in: &cancelBag)

let output = viewModel.transform(input: SettingViewModel.Input(viewWillAppearSubject: viewWillAppearSubject,
alarmToggleSubject: alarmToggleTapped,
nicknameButtonTapped: nicknameButtonTapped,
planButtonTapped: planButtonTapped,
alarmButtonTapped: alarmButtnTapped))
alarmButtonTapped: alarmButtnTapped,
errorSubject: errorSubject))
output.hasPlanResult
.receive(on: DispatchQueue.main)
.sink { [weak self] response in
Expand Down Expand Up @@ -215,25 +229,20 @@ final class SettingViewController: BaseViewController {
view.addSubviews(naviView, summaryScrollerView)
naviView.addSubviews(backButton, summaryLabel, moreButton)
summaryScrollerView.addSubview(contentView)
contentView.addSubviews(planContainerView, nicknameContainerView,
languageContainerView, alarmContainerView, alarmCollectionView)
contentView.addSubviews(nicknameContainerView,
planContainerView,
languageContainerView,
alarmContainerView,
alarmCollectionView,
separationLine,
sendFeedbackView)
alarmCollectionView.addSubview(alarmCollectionContainerView)

naviView.snp.makeConstraints {
$0.top.leading.trailing.equalTo(view.safeAreaLayoutGuide)
$0.height.equalTo(66)
}

summaryScrollerView.snp.makeConstraints {
$0.top.equalTo(naviView.snp.bottom)
$0.leading.trailing.bottom.equalTo(view.safeAreaLayoutGuide)
}

contentView.snp.makeConstraints {
$0.edges.equalTo(summaryScrollerView.contentLayoutGuide)
$0.width.equalTo(summaryScrollerView.frameLayoutGuide)
}

backButton.snp.makeConstraints {
$0.centerY.equalToSuperview()
$0.leading.equalToSuperview().inset(10)
Expand All @@ -250,8 +259,20 @@ final class SettingViewController: BaseViewController {
$0.height.width.equalTo(40)
}

// MARK: - summaryScrollerView

summaryScrollerView.snp.makeConstraints {
$0.top.equalTo(naviView.snp.bottom)
$0.leading.trailing.bottom.equalToSuperview()
}

contentView.snp.makeConstraints {
$0.edges.equalToSuperview()
$0.leading.centerX.equalToSuperview()
}

nicknameContainerView.snp.makeConstraints {
$0.top.equalTo(naviView.snp.bottom).offset(18)
$0.top.equalToSuperview().offset(18)
$0.leading.trailing.equalToSuperview().inset(18)
$0.height.equalTo(convertByHeightRatio(87))
}
Expand All @@ -277,13 +298,26 @@ final class SettingViewController: BaseViewController {
alarmCollectionView.snp.makeConstraints {
$0.top.equalTo(alarmContainerView.snp.bottom).offset(convertByHeightRatio(10))
$0.leading.trailing.equalToSuperview().inset(18)
$0.bottom.equalToSuperview().inset(convertByHeightRatio(80))
$0.height.equalTo(convertByHeightRatio(133))
}

alarmCollectionContainerView.snp.makeConstraints {
$0.edges.equalToSuperview()
$0.width.height.equalTo(alarmCollectionView)
}

separationLine.snp.remakeConstraints {
$0.top.equalTo(alarmCollectionView.snp.bottom).offset(28)
$0.height.equalTo(1)
$0.leading.trailing.equalTo(nicknameContainerView)
}

separationLine.backgroundColor = .gray100

sendFeedbackView.snp.makeConstraints {
$0.top.equalTo(separationLine.snp.bottom).offset(28)
$0.leading.trailing.equalTo(alarmContainerView)
$0.height.equalTo(convertByHeightRatio(88))
$0.bottom.equalToSuperview()
}
}
}
Loading
Loading