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

캔 아이콘 변경

Browse Source
This commit is contained in:
Yu Sung
2023-08-20 23:14:00 +09:00
parent 6bc5356ac1
commit 792e029f0d
8 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
SodaLive/Resources/Assets.xcassets/ic_can.imageset/ic_can.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
SodaLive/Resources/Assets.xcassets/ic_no_item.imageset/ic_no_item.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

2
SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift
View File

@@ -70,6 +70,8 @@ struct LiveRoomPasswordDialog: View {
.foregroundColor(Color(hex: "ffffff")) .foregroundColor(Color(hex: "ffffff"))
Image("ic_can") Image("ic_can")
.resizable()
.frame(width: 20, height: 20)
Text("으로 입장") Text("으로 입장")
.font(.custom(Font.bold.rawValue, size: 15.3)) .font(.custom(Font.bold.rawValue, size: 15.3))

2
SodaLive/Sources/Live/Room/Chat/LiveRoomDonationChatItemView.swift
View File

@@ -23,6 +23,8 @@ struct LiveRoomDonationChatItemView: View {
.cornerRadius(23.3) .cornerRadius(23.3)
Image("ic_can") Image("ic_can")
.resizable()
.frame(width: 20, height: 20)
} }
VStack(alignment: .leading, spacing: 6.7) { VStack(alignment: .leading, spacing: 6.7) {

7
SodaLive/Sources/Live/Room/LiveRoomTopCreatorView.swift
View File

@@ -11,6 +11,7 @@ import Kingfisher
struct LiveRoomTopCreatorView: View { struct LiveRoomTopCreatorView: View {
let creatorId: Int
var nickname: String var nickname: String
var profileImageUrl: String var profileImageUrl: String
var isFollowing: Bool var isFollowing: Bool
@@ -34,8 +35,10 @@ struct LiveRoomTopCreatorView: View {
Spacer() Spacer()
Image(isFollowing ? "btn_following" : "btn_follow") if creatorId != UserDefaults.int(forKey: .userId) {
.onTapGesture { onClickFollow(isFollowing) } Image(isFollowing ? "btn_following" : "btn_follow")
.onTapGesture { onClickFollow(isFollowing) }
}
} }
} }
} }

15
SodaLive/Sources/Live/Room/LiveRoomView.swift
View File

@@ -115,6 +115,7 @@ struct LiveRoomView: View {
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
LiveRoomTopCreatorView( LiveRoomTopCreatorView(
creatorId: liveRoomInfo.creatorId,
nickname: liveRoomInfo.creatorNickname, nickname: liveRoomInfo.creatorNickname,
profileImageUrl: liveRoomInfo.creatorProfileUrl, profileImageUrl: liveRoomInfo.creatorProfileUrl,
isFollowing: liveRoomInfo.isFollowing, isFollowing: liveRoomInfo.isFollowing,
@@ -125,9 +126,9 @@ struct LiveRoomView: View {
}, },
onClickFollow: { onClickFollow: {
if $0 { if $0 {
viewModel.unRegisterNotification() viewModel.creatorUnFollow()
} else { } else {
viewModel.registerNotification() viewModel.creatorFollow()
} }
} }
) )
@@ -503,8 +504,8 @@ struct LiveRoomView: View {
onClickRequestSpeaker: { onClickRequestSpeaker: {
viewModel.requestSpeaker() viewModel.requestSpeaker()
}, },
registerNotification: { viewModel.registerNotification() }, registerNotification: { viewModel.creatorFollow() },
unRegisterNotification: { viewModel.unRegisterNotification() }, unRegisterNotification: { viewModel.creatorUnFollow() },
onClickProfile: { onClickProfile: {
if $0 != UserDefaults.int(forKey: .userId) { if $0 != UserDefaults.int(forKey: .userId) {
viewModel.getUserProfile(userId: $0) viewModel.getUserProfile(userId: $0)
@@ -526,8 +527,8 @@ struct LiveRoomView: View {
viewModel.setManager(userId: $0) viewModel.setManager(userId: $0)
}, },
onClickReleaseManager: { viewModel.changeListener(peerId: $0, isFromManager: true) }, onClickReleaseManager: { viewModel.changeListener(peerId: $0, isFromManager: true) },
onClickFollow: { viewModel.registerNotification(creatorId: $0, isGetUserProfile: true) }, onClickFollow: { viewModel.creatorFollow(creatorId: $0, isGetUserProfile: true) },
onClickUnFollow: { viewModel.unRegisterNotification(creatorId: $0, isGetUserProfile: true) }, onClickUnFollow: { viewModel.creatorUnFollow(creatorId: $0, isGetUserProfile: true) },
onClickInviteSpeaker: { inviteSpeaker(peerId: $0) }, onClickInviteSpeaker: { inviteSpeaker(peerId: $0) },
onClickChangeListener: { onClickChangeListener: {
viewModel.changeListener(peerId: $0) viewModel.changeListener(peerId: $0)
@@ -722,7 +723,7 @@ struct LiveRoomView: View {
Spacer() Spacer()
HStack(spacing: 4.7) { HStack(spacing: 4.7) {
Image("ic_donation_status") Image("ic_can")
.resizable() .resizable()
.frame(width: 16, height: 16) .frame(width: 16, height: 16)

4
SodaLive/Sources/Live/Room/LiveRoomViewModel.swift
View File

@@ -751,7 +751,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
.store(in: &subscription) .store(in: &subscription)
} }
func registerNotification(creatorId: Int? = nil, isGetUserProfile: Bool = false) { func creatorFollow(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
var userId = 0 var userId = 0
if let creatorId = creatorId { if let creatorId = creatorId {
@@ -803,7 +803,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject {
} }
} }
func unRegisterNotification(creatorId: Int? = nil, isGetUserProfile: Bool = false) { func creatorUnFollow(creatorId: Int? = nil, isGetUserProfile: Bool = false) {
var userId = 0 var userId = 0
if let creatorId = creatorId { if let creatorId = creatorId {

2
SodaLive/Sources/MyPage/CanCardView.swift
View File

@@ -20,6 +20,8 @@ struct CanCardView: View {
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
Image("ic_can") Image("ic_can")
.resizable()
.frame(width: 20, height: 20)
Image("ic_forward") Image("ic_forward")
.resizable() .resizable()