diff --git a/SodaLive/Resources/Assets.xcassets/btn_follow.imageset/btn_follow.png b/SodaLive/Resources/Assets.xcassets/btn_follow.imageset/btn_follow.png index df22156..67261a5 100644 Binary files a/SodaLive/Resources/Assets.xcassets/btn_follow.imageset/btn_follow.png and b/SodaLive/Resources/Assets.xcassets/btn_follow.imageset/btn_follow.png differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_notification.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/Contents.json similarity index 86% rename from SodaLive/Resources/Assets.xcassets/btn_notification.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/Contents.json index d957bae..d1570cb 100644 --- a/SodaLive/Resources/Assets.xcassets/btn_notification.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "btn_notification.png", + "filename" : "btn_follow_big.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/btn_follow_big.png b/SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/btn_follow_big.png new file mode 100644 index 0000000..da6562c Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/btn_follow_big.imageset/btn_follow_big.png differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_following.imageset/btn_following.png b/SodaLive/Resources/Assets.xcassets/btn_following.imageset/btn_following.png index e9507dd..0bdb2d5 100644 Binary files a/SodaLive/Resources/Assets.xcassets/btn_following.imageset/btn_following.png and b/SodaLive/Resources/Assets.xcassets/btn_following.imageset/btn_following.png differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/Contents.json similarity index 83% rename from SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/Contents.json index 375f570..aef4704 100644 --- a/SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "btn_notification_selected.png", + "filename" : "btn_following_big.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/btn_following_big.png b/SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/btn_following_big.png new file mode 100644 index 0000000..e2536c9 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/btn_following_big.imageset/btn_following_big.png differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_notification.imageset/btn_notification.png b/SodaLive/Resources/Assets.xcassets/btn_notification.imageset/btn_notification.png deleted file mode 100644 index 4508191..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/btn_notification.imageset/btn_notification.png and /dev/null differ diff --git a/SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/btn_notification_selected.png b/SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/btn_notification_selected.png deleted file mode 100644 index 6f17a44..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/btn_notification_selected.imageset/btn_notification_selected.png and /dev/null differ diff --git a/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift b/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift index f715db6..1b45d4b 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailCreatorProfileView.swift @@ -29,7 +29,7 @@ struct ContentDetailCreatorProfileView: View { Spacer() if creator.creatorId != UserDefaults.int(forKey: .userId) { - Image(creator.isFollowing ? "btn_notification_selected" : "btn_notification") + Image(creator.isFollowing ? "btn_following_big" : "btn_follow_big") .onTapGesture { if creator.isFollowing { onClickUnFollow(creator.creatorId) diff --git a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift index 118e011..9c47a30 100644 --- a/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift +++ b/SodaLive/Sources/Explorer/Profile/FollowerList/FollowerListItemView.swift @@ -30,7 +30,7 @@ struct FollowerListItemView: View { Spacer() if let isFollow = item.isFollow { - Image(isFollow ? "btn_notification_selected" : "btn_notification") + Image(isFollow ? "btn_following_big" : "btn_follow_big") .onTapGesture { isFollow ? creatorUnFollow(item.userId) : diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileCreatorView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileCreatorView.swift index d9842b5..2303efd 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileCreatorView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileCreatorView.swift @@ -57,7 +57,7 @@ struct UserProfileCreatorView: View { } } else { VStack(alignment: .leading, spacing: 9.3) { - Image(creator.isNotification ? "btn_notification_selected" : "btn_notification") + Image(creator.isNotification ? "btn_following_big" : "btn_follow_big") .resizable() .frame(width: 83.3, height: 26.7) .onTapGesture { diff --git a/SodaLive/Sources/Follow/FollowCreatorItemView.swift b/SodaLive/Sources/Follow/FollowCreatorItemView.swift index 2339e64..0277192 100644 --- a/SodaLive/Sources/Follow/FollowCreatorItemView.swift +++ b/SodaLive/Sources/Follow/FollowCreatorItemView.swift @@ -31,7 +31,7 @@ struct FollowCreatorItemView: View { Spacer() - Image(isFollow ? "btn_notification_selected" : "btn_notification") + Image(isFollow ? "btn_following_big" : "btn_follow_big") .onTapGesture { if isFollow { onClickUnFollow(creator.creatorId) diff --git a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift index 370f32f..a8556ec 100644 --- a/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift +++ b/SodaLive/Sources/Live/Room/V2/Component/View/LiveRoomInfoCreatorView.swift @@ -63,18 +63,17 @@ struct LiveRoomInfoCreatorView: View { .lineLimit(1) } - Text(creatorNickname) - .font(.custom(Font.medium.rawValue, size: 12)) - .foregroundColor(.gray77) + HStack(spacing: 5.3) { + Text(creatorNickname) + .font(.custom(Font.medium.rawValue, size: 12)) + .foregroundColor(.gray77) + + if isShowFollowingButton { + Image(isFollowing ? "btn_following" : "btn_follow") + .onTapGesture { onClickFollow() } + } + } } - - if isShowFollowingButton { - Image(isFollowing ? "btn_select_checked" : "btn_plus_round") - .resizable() - .frame(width: 20, height: 20) - .onTapGesture { onClickFollow() } - } - } .padding(.vertical, 8) .padding(.horizontal, 5.3)