fix(main): 추천 홈 후속 검증을 보완한다
This commit is contained in:
@@ -87,7 +87,7 @@ private struct MainHomeActiveCreatorItemView: View {
|
||||
.clipShape(RoundedRectangle(cornerRadius: SodaSpacing.s4, style: .continuous))
|
||||
}
|
||||
|
||||
Text(item.relativeActivityAtText())
|
||||
Text(DateParser.relativeTimeText(fromUTC: item.activityAt, fallback: item.activityAt))
|
||||
.appFont(.body4)
|
||||
.foregroundColor(Color.gray500)
|
||||
.lineLimit(1)
|
||||
@@ -103,40 +103,6 @@ private struct MainHomeActiveCreatorItemView: View {
|
||||
}
|
||||
}
|
||||
|
||||
private extension HomeActiveCreatorItem {
|
||||
func relativeActivityAtText(now: Date = Date()) -> String {
|
||||
guard let activityDate = DateParser.parse(activityAt) else {
|
||||
return activityAt
|
||||
}
|
||||
|
||||
let interval = max(0, now.timeIntervalSince(activityDate))
|
||||
let calendar = Calendar.current
|
||||
let yearMonth = calendar.dateComponents([.year, .month], from: activityDate, to: now)
|
||||
|
||||
if let years = yearMonth.year, years >= 1 {
|
||||
return I18n.Time.yearsAgo(years)
|
||||
}
|
||||
|
||||
if let months = yearMonth.month, months >= 1 {
|
||||
return I18n.Time.monthsAgo(months)
|
||||
}
|
||||
|
||||
if interval < 60 {
|
||||
return I18n.Time.justNow
|
||||
}
|
||||
|
||||
if interval < 3600 {
|
||||
return I18n.Time.minutesAgo(max(1, Int(interval / 60)))
|
||||
}
|
||||
|
||||
if interval < 86_400 {
|
||||
return I18n.Time.hoursAgo(max(1, Int(interval / 3600)))
|
||||
}
|
||||
|
||||
return I18n.Time.daysAgo(max(1, Int(interval / 86_400)))
|
||||
}
|
||||
}
|
||||
|
||||
struct MainHomeActiveCreatorSection_Previews: PreviewProvider {
|
||||
private static let previewImageUrl = "https://picsum.photos/500/500"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ struct MainHomeAiCharacterSection: View {
|
||||
LazyHStack(alignment: .center, spacing: SodaSpacing.s4) {
|
||||
ForEach(items, id: \.self) { item in
|
||||
Button {
|
||||
onTapCharacter(item.creatorId)
|
||||
onTapCharacter(item.characterId)
|
||||
} label: {
|
||||
AiCharacterCard(
|
||||
name: item.name,
|
||||
|
||||
@@ -2,7 +2,7 @@ import SwiftUI
|
||||
|
||||
struct MainHomeBusinessInfoSection: View {
|
||||
var body: some View {
|
||||
BusinessInfoExpandableTextView(
|
||||
V2ExpandableTextView(
|
||||
text: I18n.Settings.companyInfo,
|
||||
lineLimit: 3,
|
||||
moreTitle: I18n.HomeRecommendation.more,
|
||||
@@ -15,57 +15,6 @@ struct MainHomeBusinessInfoSection: View {
|
||||
}
|
||||
}
|
||||
|
||||
private struct BusinessInfoExpandableTextView: View {
|
||||
let text: String
|
||||
let lineLimit: Int
|
||||
let moreTitle: String
|
||||
let collapseTitle: String
|
||||
let font: SodaTypography
|
||||
let foregroundColor: Color
|
||||
|
||||
@State private var isExpanded = false
|
||||
@State private var fullTextHeight: CGFloat = 0
|
||||
@State private var limitedTextHeight: CGFloat = 0
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
|
||||
Text(text)
|
||||
.appFont(font)
|
||||
.foregroundColor(foregroundColor)
|
||||
.lineLimit(isExpanded ? nil : lineLimit)
|
||||
.background(measuringText(lineLimit: nil, height: $fullTextHeight))
|
||||
.background(measuringText(lineLimit: lineLimit, height: $limitedTextHeight))
|
||||
|
||||
if fullTextHeight > limitedTextHeight + 1 {
|
||||
Button {
|
||||
isExpanded.toggle()
|
||||
} label: {
|
||||
Text(isExpanded ? collapseTitle : moreTitle)
|
||||
.appFont(.body5)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func measuringText(lineLimit: Int?, height: Binding<CGFloat>) -> some View {
|
||||
Text(text)
|
||||
.appFont(font)
|
||||
.lineLimit(lineLimit)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
.hidden()
|
||||
.background(
|
||||
GeometryReader { proxy in
|
||||
Color.clear
|
||||
.onAppear { height.wrappedValue = proxy.size.height }
|
||||
.onChange(of: proxy.size.height) { newHeight in height.wrappedValue = newHeight }
|
||||
.onChange(of: text) { _ in height.wrappedValue = proxy.size.height }
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
struct MainHomeBusinessInfoSection_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
MainHomeBusinessInfoSection()
|
||||
|
||||
@@ -48,6 +48,7 @@ final class MainHomeRecommendationViewModel: ObservableObject {
|
||||
self.isShowPopup = true
|
||||
}
|
||||
} catch {
|
||||
ERROR_LOG(error.localizedDescription)
|
||||
self.errorMessage = I18n.Common.commonError
|
||||
self.isShowPopup = true
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ struct HomeRecommendationResponse: Decodable {
|
||||
let banners: [RecommendationBannerResponse]
|
||||
let recentlyActiveCreators: [HomeActiveCreatorItem]
|
||||
let recentDebutCreators: [HomeCreatorItem]
|
||||
let firstAudioContents: [HomeFirstAudioContentItem]
|
||||
let aiCharacters: [HomeAiCharacterItem]
|
||||
let genreCreators: [HomeGenreCreatorGroupItem]
|
||||
let cheerCreators: [HomeCreatorItem]
|
||||
@@ -67,17 +66,6 @@ struct HomeCreatorItem: Decodable, Hashable {
|
||||
let creatorProfileImage: String
|
||||
}
|
||||
|
||||
struct HomeFirstAudioContentItem: Decodable, Hashable {
|
||||
let contentId: Int
|
||||
let creatorId: Int
|
||||
let creatorNickname: String
|
||||
let creatorProfileImage: String
|
||||
let title: String
|
||||
let price: Int
|
||||
let coverImage: String?
|
||||
let isPointAvailable: Bool
|
||||
}
|
||||
|
||||
struct HomeAiCharacterItem: Decodable, Hashable {
|
||||
let characterId: Int
|
||||
let creatorId: Int
|
||||
|
||||
Reference in New Issue
Block a user