diff --git a/SodaLive/Sources/Live/LiveView.swift b/SodaLive/Sources/Live/LiveView.swift index a58a985..540d112 100644 --- a/SodaLive/Sources/Live/LiveView.swift +++ b/SodaLive/Sources/Live/LiveView.swift @@ -33,12 +33,6 @@ struct LiveView: View { .padding(.bottom, 40) } - BannerAdView(adUnitId: LIVE_BANNER_AD_UNIT_ID) - .frame( - width: screenSize().width, - height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height - ) - if viewModel.recommendChannelItems.count > 0 { SectionRecommendChannelView( items: viewModel.isFollowingList ? @@ -46,21 +40,25 @@ struct LiveView: View { viewModel.recommendChannelItems, isFollowingList: $viewModel.isFollowingList ) - .padding(.top, 40) } - if viewModel.liveNowItems.count > 0 { - SectionLiveNowView( - items: viewModel.liveNowItems, - onClickParticipant: { - viewModel.enterRoom(roomId: $0) - }, - onTapCreateLive: { - AppState.shared.setAppStep(step: .createLive(timeSettingMode: .NOW, onSuccess: onCreateSuccess)) - } + BannerAdView(adUnitId: LIVE_BANNER_AD_UNIT_ID) + .frame( + width: screenSize().width, + height: GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(screenSize().width).size.height ) .padding(.top, 40) - } + + SectionLiveNowView( + items: viewModel.liveNowItems, + onClickParticipant: { + viewModel.enterRoom(roomId: $0) + }, + onTapCreateLive: { + AppState.shared.setAppStep(step: .createLive(timeSettingMode: .NOW, onSuccess: onCreateSuccess)) + } + ) + .padding(.top, 40) if viewModel.eventBannerItems.count > 0 { SectionEventBannerView(items: viewModel.eventBannerItems) @@ -72,20 +70,18 @@ struct LiveView: View { .padding(.top, 40) } - if viewModel.liveReservationItems.count > 0 { - SectionLiveReservationView( - items: viewModel.liveReservationItems, - onClickCancel: { viewModel.getSummary() }, - onClickStart: { roomId in processStart(roomId: roomId) }, - onClickReservation: { roomId in - viewModel.reservationLiveRoom(roomId: roomId) - }, - onTapCreateLive: { - AppState.shared.setAppStep(step: .createLive(timeSettingMode: .RESERVATION, onSuccess: onCreateSuccess)) - } - ) - .padding(.top, 40) - } + SectionLiveReservationView( + items: viewModel.liveReservationItems, + onClickCancel: { viewModel.getSummary() }, + onClickStart: { roomId in processStart(roomId: roomId) }, + onClickReservation: { roomId in + viewModel.reservationLiveRoom(roomId: roomId) + }, + onTapCreateLive: { + AppState.shared.setAppStep(step: .createLive(timeSettingMode: .RESERVATION, onSuccess: onCreateSuccess)) + } + ) + .padding(.top, 40) } } .frame(width: geo.size.width, height: geo.size.height) diff --git a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift index 505949a..6238f0c 100644 --- a/SodaLive/Sources/Live/Now/SectionLiveNowView.swift +++ b/SodaLive/Sources/Live/Now/SectionLiveNowView.swift @@ -70,27 +70,12 @@ struct SectionLiveNowView: View { .resizable() .frame(width: 60, height: 60) - Text("🙀지금 참여가능한 라이브가 없습니다.\n직접 라이브를 만들어 보세요!") + Text("🙀지금 참여가능한 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요.") .font(.custom(Font.medium.rawValue, size: 10.7)) .foregroundColor(Color(hex: "bbbbbb")) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) - .padding(.top, 8) - - HStack(spacing: 0) { - Image("ic_plus_no_bg") - .resizable() - .frame(width: 33.3, height: 33.3, alignment: .center) - - Text("라이브 만들기") - .font(.custom(Font.bold.rawValue, size: 13.3)) - .foregroundColor(Color.white) - } - .frame(width: 200, height: 33.3, alignment: .center) - .background(Color(hex: "9970ff")) - .cornerRadius(4.7) - .padding(.top, 10.7) - .onTapGesture { onTapCreateLive() } + .padding(.vertical, 8) } .padding(.vertical, 16.7) .frame(width: screenSize().width - 26.7) diff --git a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift index e1ef5e2..e51df89 100644 --- a/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift +++ b/SodaLive/Sources/Live/Reservation/SectionLiveReservationView.swift @@ -93,27 +93,12 @@ struct SectionLiveReservationView: View { .resizable() .frame(width: 60, height: 60) - Text("지금 예약중인 라이브가 없습니다.\n직접 라이브를 만들어 보세요!") + Text("지금 예약중인 라이브가 없습니다.\n채널을 팔로잉 하고 라이브 알림을 받아 보세요.") .font(.custom(Font.medium.rawValue, size: 10.7)) .foregroundColor(Color(hex: "bbbbbb")) .fixedSize(horizontal: false, vertical: true) .multilineTextAlignment(.center) - .padding(.top, 8) - - HStack(spacing: 0) { - Image("ic_plus_no_bg") - .resizable() - .frame(width: 33.3, height: 33.3, alignment: .center) - - Text("라이브 만들기") - .font(.custom(Font.bold.rawValue, size: 13.3)) - .foregroundColor(Color.white) - } - .frame(width: 200, height: 33.3, alignment: .center) - .background(Color(hex: "9970ff")) - .cornerRadius(4.7) - .padding(.top, 10.7) - .onTapGesture { onTapCreateLive() } + .padding(.vertical, 8) } .padding(.vertical, 16.7) .frame(width: screenSize().width - 26.7)