[Feat] EmptyView 및 LoadingView 추가 & 세부레이아웃 수정 #116
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // | ||
| // VoiceNoticeView.swift | ||
| // RD-DSKit | ||
| // | ||
| // Created by 김수연 on 2023/01/08. | ||
| // Copyright © 2023 RecorDream-iOS. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| import SnapKit | ||
| import RxSwift | ||
| import RxCocoa | ||
|
|
||
| public final class VoiceNoticeView: UIView { | ||
|
|
||
| // MARK: - UI Components | ||
|
|
||
| private let micImage = UIImageView(image: RDDSKitAsset.Images.icnMic.image) | ||
|
|
||
| private let onlyVoiceExistLabel: UILabel = { | ||
| let label = UILabel() | ||
| label.text = "음성만 기록되어 있어요" | ||
| label.font = RDDSKitFontFamily.Pretendard.regular.font(size: 12) | ||
| label.textColor = RDDSKitAsset.Colors.white02.color | ||
| return label | ||
| }() | ||
|
|
||
| private enum Metric { | ||
| static let micSize = 24.f | ||
| static let contentSpacing = 4.f | ||
|
|
||
| static let voiceLabelTopBottom = 3.f | ||
| } | ||
|
|
||
| // MARK: - View Life Cycle | ||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| setUI() | ||
| setLayout() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| // MARK: - UI & Layouts | ||
|
|
||
| private func setUI() { | ||
| self.backgroundColor = .none | ||
| } | ||
|
|
||
| private func setLayout() { | ||
| self.addSubviews(micImage, onlyVoiceExistLabel) | ||
|
|
||
| micImage.snp.makeConstraints { | ||
| $0.top.leading.equalToSuperview() | ||
| $0.height.width.equalTo(Metric.micSize) | ||
| } | ||
|
|
||
| onlyVoiceExistLabel.snp.makeConstraints { | ||
| $0.leading.equalTo(micImage.snp.trailing).inset(Metric.contentSpacing) | ||
| $0.top.bottom.equalToSuperview().inset(Metric.voiceLabelTopBottom) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,8 @@ | |
| // Created by 김수연 on 2022/12/04. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| import Domain | ||
| import RD_Core | ||
|
|
||
|
|
@@ -28,6 +30,7 @@ public class DreamDetailViewModel: ViewModelType { | |
|
|
||
| public struct Output { | ||
| var fetchedDetailData = BehaviorRelay<DreamDetailEntity?>(value: nil) | ||
| var loadingStatus = BehaviorRelay<Bool>(value: true) | ||
|
Member
Author
There was a problem hiding this comment. @L-j-h-c 처음에 초기값을 지정해주지 않으니 상세뷰 띄울때 로딩뷰가 잘 안떠서요..! PublishRelay로 해줘도 잘 되셨나용?? 그러면.. 이 문제가 아니엇던 것일까요,,
Contributor
There was a problem hiding this comment. @Suyeon9911 아뇨~! 다시 보니까 이 방법이 좋은 것 같습니다~ publishRelay로 하면 viewController에서는 output이 transform된 이후에 구독하는거라 로딩이 안 뜨는 것 같네요! |
||
| } | ||
|
|
||
| // MARK: - Coordination | ||
|
|
@@ -44,11 +47,13 @@ extension DreamDetailViewModel { | |
| self.bindOutput(output: output, disposeBag: disposeBag) | ||
|
|
||
| input.viewDidLoad.subscribe(onNext: { _ in | ||
| output.loadingStatus.accept(true) | ||
| self.useCase.fetchDetailRecord(recordId: self.dreamId) | ||
| }).disposed(by: disposeBag) | ||
|
|
||
| input.isModifyDismissed.subscribe(onNext: { isDismissed in | ||
| if isDismissed { | ||
| output.loadingStatus.accept(true) | ||
| self.useCase.fetchDetailRecord(recordId: self.dreamId) | ||
| } | ||
| }).disposed(by: disposeBag) | ||
|
|
@@ -61,6 +66,7 @@ extension DreamDetailViewModel { | |
|
|
||
| detailDreamData.compactMap { $0 } | ||
| .subscribe(onNext: { entity in | ||
| output.loadingStatus.accept(false) | ||
| output.fetchedDetailData.accept(entity) | ||
| }).disposed(by: disposeBag) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
잘 쓸게욤 ㅎㅅㅎ