diff --git a/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryEmptyView.swift b/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryEmptyView.swift index f11e219..d03079e 100644 --- a/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryEmptyView.swift +++ b/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryEmptyView.swift @@ -54,7 +54,7 @@ final class ReportHistoryEmptyView: UIView { labelStackView.snp.makeConstraints { make in make.center.equalToSuperview() - make.height.equalTo(Layout.stackViewHeight) + make.height.equalTo(Layout.stackViewHeight).priority(.medium) make.width.equalTo(Layout.stackViewWidth) } diff --git a/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryTableViewCell.swift b/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryTableViewCell.swift index 1e93b2f..648efd9 100644 --- a/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryTableViewCell.swift +++ b/Projects/Presentation/Sources/Report/View/Component/ReportHistory/ReportHistoryTableViewCell.swift @@ -55,6 +55,7 @@ final class ReportHistoryTableViewCell: UITableViewCell { photoImageView.layer.cornerRadius = 9.25 photoImageView.layer.masksToBounds = true + titleLabel.numberOfLines = 2 titleLabel.textColor = BitnagilColor.gray10 titleLabel.font = BitnagilFont.init(style: .body2, weight: .semiBold).font titleLabel.textAlignment = .left @@ -93,9 +94,14 @@ final class ReportHistoryTableViewCell: UITableViewCell { } photoImageView.snp.makeConstraints { make in - make.verticalEdges + make.top + .equalToSuperview() + .inset(Layout.verticalSpacing) + + make.bottom .equalToSuperview() .inset(Layout.verticalSpacing) + .priority(.low) make.trailing .equalToSuperview() @@ -130,6 +136,7 @@ final class ReportHistoryTableViewCell: UITableViewCell { make.bottom .equalToSuperview() .offset(-Layout.verticalSpacing) + .priority(.medium) make.width .equalTo(Layout.categoryLabelWidth) diff --git a/Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift b/Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift index 80ed652..23f5d99 100644 --- a/Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift +++ b/Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift @@ -152,6 +152,7 @@ class ReportDetailViewController: BaseViewController { titleLabel.text = reportDetailContentType.title titleLabel.font = BitnagilFont(style: .body2, weight: .semiBold).font titleLabel.textColor = BitnagilColor.gray10 + titleLabel.numberOfLines = 2 backgroudView.layer.masksToBounds = true backgroudView.layer.cornerRadius = 12 diff --git a/Projects/Presentation/Sources/Report/View/ReportRegistrationViewController.swift b/Projects/Presentation/Sources/Report/View/ReportRegistrationViewController.swift index 6b2d0d2..e10b3b8 100644 --- a/Projects/Presentation/Sources/Report/View/ReportRegistrationViewController.swift +++ b/Projects/Presentation/Sources/Report/View/ReportRegistrationViewController.swift @@ -44,8 +44,8 @@ final class ReportRegistrationViewController: BaseViewController let reportRegistrationCompletePublisher: AnyPublisher let maxPhotoCount: Int + let maxContentLength: Int + let maxTitleLength: Int } private(set) var output: Output @@ -46,6 +48,8 @@ final class ReportRegistrationViewModel: ViewModel { private let reportRegistrationCompleteSubject = PassthroughSubject() private let exceptionSubject = PassthroughSubject() private let maxPhotoCount = 3 + private let maxContentLength = 150 + private let maxTitleLength = 50 private var location: LocationEntity? = nil private(set) var selectedReportType: ReportType? var selectedPhotoCount: Int { @@ -65,7 +69,9 @@ final class ReportRegistrationViewModel: ViewModel { isReportValid: reportVerificationSubject.eraseToAnyPublisher(), exceptionPublisher: exceptionSubject.eraseToAnyPublisher(), reportRegistrationCompletePublisher: reportRegistrationCompleteSubject.eraseToAnyPublisher(), - maxPhotoCount: maxPhotoCount) + maxPhotoCount: maxPhotoCount, + maxContentLength: maxContentLength, + maxTitleLength: maxTitleLength) } func action(input: Input) {