klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(refresh): Lottie 새로고침 표시를 적용한다

Browse Source
This commit is contained in:
Yu Sung
2026-08-26 01:21:26 +09:00
parent fc0f7e2b50
commit e46198f87a
14 changed files with 1046 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SodaLive/Sources/V2/Main/Chat/MainChatView.swift
View File

@@ -59,7 +59,9 @@ struct MainChatView: View {
} else if viewModel.shouldShowEmptyState {
emptyContent
} else {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
LazyVStack(spacing: 0) {
ForEach(viewModel.rooms) { room in
MainChatRoomListItem(room: room) { roomId, chatType in
@@ -79,39 +81,34 @@ struct MainChatView: View {
}
.padding(.top, 0)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(.circular)
.tint(Color.soda400)
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
Text(I18n.MainChat.emptyStateMessage)
.appFont(size: 16, weight: .medium)
.foregroundColor(Color.gray500)
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}

21
SodaLive/Sources/V2/Main/Content/All/MainContentAllView.swift
View File

@@ -74,7 +74,9 @@ struct MainContentAllView: View {
} else if viewModel.shouldShowEmptyState {
emptyContent
} else {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
gridContent
.padding(.horizontal, SodaSpacing.s14)
.padding(.top, SodaSpacing.s8)
@@ -86,36 +88,31 @@ struct MainContentAllView: View {
.padding(.vertical, SodaSpacing.s20)
}
}
.refreshable {
await viewModel.refresh()
}
}
}
}
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
MainContentAudioEmptyStateView(message: I18n.MainContentAll.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}

21
SodaLive/Sources/V2/Main/Content/Ranking/MainContentRankingView.swift
View File

@@ -40,20 +40,21 @@ struct MainContentRankingView: View {
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var rankingContent: some View {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
if let topItem {
MainContentAudioRankingTopCard(
@@ -104,20 +105,16 @@ struct MainContentRankingView: View {
.padding(.horizontal, SodaSpacing.s8)
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
MainContentAudioRankingEmptyStateView(message: viewModel.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}

21
SodaLive/Sources/V2/Main/Content/Recommendation/MainContentRecommendationView.swift
View File

@@ -22,7 +22,9 @@ struct MainContentRecommendationView: View {
} else if viewModel.shouldShowEmptyState {
emptyContent
} else {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
VStack(alignment: .leading, spacing: SodaSpacing.s24) {
if let recommendations = viewModel.recommendations {
MainContentAudioBannerSection(
@@ -80,9 +82,6 @@ struct MainContentRecommendationView: View {
}
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
}
.onAppear {
@@ -99,27 +98,25 @@ struct MainContentRecommendationView: View {
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
MainContentAudioEmptyStateView(message: viewModel.emptyStateMessage)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
}

21
SodaLive/Sources/V2/Main/Home/Following/MainHomeFollowingView.swift
View File

@@ -56,7 +56,9 @@ struct MainHomeFollowingView: View {
} else if !viewModel.message.isEmpty {
emptyContent(message: viewModel.message)
} else if let response = viewModel.response {
ScrollView(.vertical, showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
VStack(spacing: 0) {
if !response.followingCreators.isEmpty {
MainHomeFollowingCreatorSection(
@@ -104,9 +106,6 @@ struct MainHomeFollowingView: View {
.padding(.bottom, SodaSpacing.s20)
}
.background(Color.black)
.refreshable {
await viewModel.refresh()
}
} else {
emptyContent(message: I18n.HomeFollowing.emptyStateMessage)
}
@@ -114,31 +113,29 @@ struct MainHomeFollowingView: View {
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.tint(.white)
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.background(Color.black)
.refreshable {
await viewModel.refresh()
}
}
}
private func emptyContent(message: String, loginAction: (() -> Void)? = nil) -> some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
MainHomeFollowingEmptyStateView(
message: message,
loginAction: loginAction
)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
}

21
SodaLive/Sources/V2/Main/Home/Ranking/MainHomeRankingView.swift
View File

@@ -31,20 +31,21 @@ struct MainHomeRankingView: View {
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
private var rankingContent: some View {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
ForEach(firstRankItems) { item in
MainHomeRankingCard(
@@ -96,20 +97,16 @@ struct MainHomeRankingView: View {
.padding(.horizontal, SodaSpacing.s8)
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
private var emptyContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
MainHomeRankingEmptyStateView()
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}

14
SodaLive/Sources/V2/Main/Home/Recommendation/MainHomeRecommendationView.swift
View File

@@ -21,7 +21,9 @@ struct MainHomeRecommendationView: View {
if viewModel.isLoading && viewModel.recommendations == nil && viewModel.errorMessage.isEmpty {
loadingContent
} else {
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
VStack(alignment: .leading, spacing: SodaSpacing.s24) {
MainHomeLiveSection(
items: viewModel.recommendations?.lives ?? [],
@@ -82,9 +84,6 @@ struct MainHomeRecommendationView: View {
}
.padding(.vertical, SodaSpacing.s20)
}
.refreshable {
await viewModel.refresh()
}
}
}
.onAppear {
@@ -119,15 +118,14 @@ struct MainHomeRecommendationView: View {
private var loadingContent: some View {
GeometryReader { geometry in
ScrollView(showsIndicators: false) {
LottieRefreshableScrollView(action: {
await viewModel.refresh()
}) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .white))
.frame(maxWidth: .infinity)
.frame(minHeight: geometry.size.height)
}
.refreshable {
await viewModel.refresh()
}
}
}
}